Merge lp:~d.filoni/media-hub/improve_content_type_recognition into lp:media-hub

[Devid Antonio Filoni]

file_info_from_uri (gstreamer/playbin.cpp) cannot recognize content type of remote files. When the content type is not recognized "audio/video/" is returned as content type, however, as is_video_file function searches for a content type starting with "video/", a video is never recognized and only the audio is played as described in bug #1446260 (is_video_file always returns false and is_audio_file returns true so MEDIA_FILE_TYPE_AUDIO is set as file_type)
Proposed branch calls g_content_type_guess on filename in order to try to find content type parsing file extension only when a content type was not found by file_info_from_uri. This branch is not a real fix for bug #1446260, the real solution would be to parse content type from remote files, however it helps to recognize many video files (like the one in bug description).
In order to avoid regressions, g_content_type_guess output is considered valid only if a "video/" content type is recognized, otherwise it will fails to "audio/video/".

What I tested on mako:
- local files (video)
- bug #1446260 : mediaplayer-app http://wbads.vo.llnwd.net/o25/u/telepixtv/videos/ellen/20150320/594/0_fu4qgsy7_0_obx408yq_2.mp4 --desktop_file_hint=/usr/share/applications/mediaplayer-app.desktop
- uradio
Everything works fine.

Unmerged revisions

212. By Devid Antonio Filoni on 2016-11-08

Improve gstreamer playbin get_file_content_type using g_content_type_guess as fallback when no content type is found by file_info_from_uri

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2016-07-11 01:21:38 +0000
+++ src/core/media/gstreamer/playbin.cpp	2016-11-08 17:07:28 +0000
@@ -786,7 +786,25 @@
     const std::string content_type {file_info_from_uri(encoded_uri)};
     if (content_type.empty())
     {
-        MH_WARNING("Failed to get actual track content type");
+        gboolean is_certain = FALSE;
+        std::string guessed_content_type(g_content_type_guess(uri.c_str(), NULL, 0, &is_certain));
+        if (guessed_content_type.find("video/") != 0)
+        {
+            std::string::size_type question_mark_pos = uri.find('?');
+            if (question_mark_pos != std::string::npos)
+            {
+                is_certain = FALSE;
+                guessed_content_type = g_content_type_guess(uri.substr(0, question_mark_pos).c_str(), NULL, 0, &is_certain);
+            }
+        }
+
+        if (guessed_content_type.find("video/") == 0)
+        {
+            MH_INFO("Guessed content type: %s", guessed_content_type);
+            return guessed_content_type;
+        }
+
+        MH_WARNING("Failed to get actual track content type, falling back to audio");
         return std::string("audio/video/");
     }