Merge lp:~robru/media-hub/get-selected-streams into lp:media-hub/stable

[Robert Bruce Park]

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-28 13:51:58 +0000
+++ debian/changelog	2015-09-04 18:47:31 +0000
@@ -1,15 +1,16 @@
+media-hub (3.1.0+15.04.20150901-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Gather information about missing codecs and selected streams from gstreamer
+    so we have more information on whether we should play the video or not.
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Mon, 10 Aug 2015 15:04:18 +0200
+
 media-hub (3.1.0+15.04.20150828-0ubuntu1) vivid; urgency=medium
 
   * New rebuild forced.
 
  -- CI Train Bot <[e-mail]>  Fri, 28 Aug 2015 13:51:58 +0000
 
-media-hub (3.1.0+15.04.20150819-0ubuntu1) vivid; urgency=medium
-
-  * 
-
- -- CI Train Bot <[e-mail]>  Wed, 19 Aug 2015 07:39:04 +0000
-
 media-hub (3.1.0+15.04.20150818-0ubuntu1) vivid; urgency=medium
 
   * Add HTTPS to the list of supported URL schemes (courtesy Justin McPherson)
 
=== modified file 'debian/control'
--- debian/control	2015-03-12 11:38:32 +0000
+++ debian/control	2015-09-04 18:47:31 +0000
@@ -25,6 +25,7 @@
                libprocess-cpp-dev,
                libproperties-cpp-dev,
                libgstreamer1.0-dev,
+               libgstreamer-plugins-base1.0-dev,
                pkg-config,
                libpulse-dev,
                qtbase5-dev,
 
=== modified file 'src/core/media/CMakeLists.txt'
--- src/core/media/CMakeLists.txt	2015-07-02 12:30:09 +0000
+++ src/core/media/CMakeLists.txt	2015-09-04 18:47:31 +0000
@@ -1,4 +1,5 @@
 pkg_check_modules(PC_GSTREAMER_1_0 REQUIRED gstreamer-1.0)
+pkg_check_modules(PC_GSTREAMER_PBUTILS_1_0 REQUIRED gstreamer-pbutils-1.0)
 pkg_check_modules(PC_PULSE_AUDIO REQUIRED libpulse)
 include_directories(${PC_GSTREAMER_1_0_INCLUDE_DIRS} ${HYBRIS_MEDIA_CFLAGS} ${PC_PULSE_AUDIO_INCLUDE_DIRS})
 
@@ -126,6 +127,7 @@
   ${DBUS_CPP_LDFLAGS}
   ${GLog_LIBRARY}
   ${PC_GSTREAMER_1_0_LIBRARIES}
+  ${PC_GSTREAMER_PBUTILS_1_0_LIBRARIES}
   ${PROCESS_CPP_LDFLAGS}
   ${GIO_LIBRARIES}
   ${HYBRIS_MEDIA_LIBRARIES}
 
=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2015-08-11 15:25:50 +0000
+++ src/core/media/gstreamer/engine.cpp	2015-09-04 18:47:31 +0000
@@ -67,8 +67,22 @@
     {
         if (p.second == "playbin")
         {
-            std::cout << "State changed on playbin: " << p.first.new_state << std::endl;
-            playback_status_changed(gst_state_to_player_status(p.first));
+            std::cout << "State changed on playbin: "
+                      << gst_element_state_get_name(p.first.new_state) << std::endl;
+            const auto status = gst_state_to_player_status(p.first);
+            /*
+             * When state moves to "paused" the pipeline is already set. We check that we
+             * have streams to play.
+             */
+            if (status == media::Player::PlaybackStatus::paused &&
+                    !playbin.can_play_streams()) {
+                std::cerr << "** Cannot play: some codecs are missing" << std::endl;
+                playbin.reset();
+                const media::Player::Error e = media::Player::Error::format_error;
+                error(e);
+            } else {
+                playback_status_changed(status);
+            }
         }
     }
 
@@ -149,7 +163,8 @@
                 break;
             case GST_STREAM_ERROR_CODEC_NOT_FOUND:
                 std::cerr << "** Encountered a GST_STREAM_ERROR_CODEC_NOT_FOUND" << std::endl;
-                ret_error = media::Player::Error::format_error;
+                // Missing codecs are handled later, when state switches to "paused"
+                ret_error = media::Player::Error::no_error;
                 break;
             case GST_STREAM_ERROR_DECODE:
                 std::cerr << "** Encountered a GST_STREAM_ERROR_DECODE" << std::endl;
@@ -163,8 +178,10 @@
             }
         }
 
-        std::cout << "Resetting playbin pipeline after unrecoverable error" << std::endl;
-        playbin.reset();
+        if (ret_error != media::Player::Error::no_error) {
+            std::cerr << "Resetting playbin pipeline after unrecoverable error" << std::endl;
+            playbin.reset();
+        }
         return ret_error;
     }
 
 
=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-06-12 18:14:05 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-09-04 18:47:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -20,6 +20,8 @@
 
 #include <core/media/gstreamer/engine.h>
 
+#include <gst/pbutils/missing-plugins.h>
+
 #if defined(MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER)
 #include <hybris/media/surface_texture_client_hybris.h>
 #include <hybris/media/media_codec_layer.h>
@@ -105,7 +107,11 @@
         core::ubuntu::media::video::Width{0}},
       player_lifetime(media::Player::Lifetime::normal),
       about_to_finish_handler_id(0),
-      source_setup_handler_id(0)
+      source_setup_handler_id(0),
+      is_missing_audio_codec(false),
+      is_missing_video_codec(false),
+      audio_stream_id(-1),
+      video_stream_id(-1)
 {
     if (!pipeline)
         throw std::runtime_error("Could not create pipeline for playbin.");
@@ -170,6 +176,44 @@
         std::cout << "Failed to reset the pipeline state. Client reconnect may not function properly." << std::endl;
     }
     file_type = MEDIA_FILE_TYPE_NONE;
+    is_missing_audio_codec = false;
+    is_missing_video_codec = false;
+    audio_stream_id = -1;
+    video_stream_id = -1;
+}
+
+void gstreamer::Playbin::process_message_element(GstMessage *message)
+{
+    if (!gst_is_missing_plugin_message(message))
+      return;
+
+    gchar *desc = gst_missing_plugin_message_get_description(message);
+    std::cerr << "Missing plugin: " << desc << std::endl;
+    g_free(desc);
+
+    const GstStructure *msg_data = gst_message_get_structure(message);
+    if (g_strcmp0("decoder", gst_structure_get_string(msg_data, "type")) != 0)
+        return;
+
+    GstCaps *caps;
+    if (!gst_structure_get(msg_data, "detail", GST_TYPE_CAPS, &caps, NULL)) {
+        std::cerr << __PRETTY_FUNCTION__ << ": No detail" << std::endl;
+        return;
+    }
+
+    GstStructure *caps_data = gst_caps_get_structure(caps, 0);
+    if (!caps_data) {
+        std::cerr << __PRETTY_FUNCTION__ << ": No caps data" << std::endl;
+        return;
+    }
+
+    const gchar *mime = gst_structure_get_name(caps_data);
+    if (strstr(mime, "audio"))
+        is_missing_audio_codec = true;
+    else if (strstr(mime, "video"))
+        is_missing_video_codec = true;
+
+    std::cerr << "Missing decoder for " << mime << std::endl;
 }
 
 void gstreamer::Playbin::on_new_message_async(const Bus::Message& message)
@@ -186,8 +230,15 @@
         signals.on_info(message.detail.error_warning_info);
         break;
     case GST_MESSAGE_STATE_CHANGED:
+        if (message.source == "playbin") {
+            g_object_get(G_OBJECT(pipeline), "current-audio", &audio_stream_id, NULL);
+            g_object_get(G_OBJECT(pipeline), "current-video", &video_stream_id, NULL);
+        }
         signals.on_state_changed(std::make_pair(message.detail.state_changed, message.source));
         break;
+    case GST_MESSAGE_ELEMENT:
+        process_message_element(message.message);
+        break;
     case GST_MESSAGE_TAG:
         {
             gchar *orientation;
@@ -591,3 +642,22 @@
 {
     return file_type;
 }
+
+bool gstreamer::Playbin::can_play_streams() const
+{
+    /*
+     * We do not consider that we can play the video when
+     * 1. No audio stream selected due to missing decoder
+     * 2. No video stream selected due to missing decoder
+     * 3. No stream selected at all
+     * Note that if there are several, say, audio streams, we will play the file
+     * provided that we can decode just one of them, even if there are missing
+     * audio codecs. We will also play files with only one type of stream.
+     */
+    if ((is_missing_audio_codec && audio_stream_id == -1) ||
+            (is_missing_video_codec && video_stream_id == -1) ||
+            (audio_stream_id == -1 && video_stream_id == -1))
+        return false;
+    else
+        return true;
+}
 
=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2015-06-12 18:14:05 +0000
+++ src/core/media/gstreamer/playbin.h	2015-09-04 18:47:31 +0000
@@ -72,6 +72,7 @@
 
     void on_new_message(const Bus::Message& message);
     void on_new_message_async(const Bus::Message& message);
+    void process_message_element(GstMessage *message);
 
     gstreamer::Bus& message_bus();
 
@@ -110,6 +111,8 @@
 
     MediaFileType media_file_type() const;
 
+    bool can_play_streams() const;
+
     GstElement* pipeline;
     gstreamer::Bus bus;
     MediaFileType file_type;
@@ -137,6 +140,10 @@
         core::Signal<core::ubuntu::media::video::Dimensions> on_video_dimensions_changed;
         core::Signal<void> client_disconnected;
     } signals;
+    bool is_missing_audio_codec;
+    bool is_missing_video_codec;
+    gint audio_stream_id;
+    gint video_stream_id;
 };
 }