only display missing codec warning when necessary -> missing video codecs at any...

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 0affafe..be55d0c 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -228,6 +228,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
        m_buffer_size = 1*1024*1024;
        m_prev_decoder_time = -1;
        m_decoder_time_valid_state = 0;
        m_buffer_size = 1*1024*1024;
        m_prev_decoder_time = -1;
        m_decoder_time_valid_state = 0;

+       m_errorInfo.missing_codec = "";

 
        CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB);
        CONNECT(m_subtitle_sync_timer->timeout, eServiceMP3::pushSubtitles);
 
        CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB);
        CONNECT(m_subtitle_sync_timer->timeout, eServiceMP3::pushSubtitles);


@@ -327,7 +328,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 
        m_gst_playbin = gst_element_factory_make("playbin2", "playbin");
        if (!m_gst_playbin)
 
        m_gst_playbin = gst_element_factory_make("playbin2", "playbin");
        if (!m_gst_playbin)

-               m_error_message = "failed to create GStreamer pipeline!\n";
+               m_errorInfo.error_message = "failed to create GStreamer pipeline!\n";

 
        g_object_set (G_OBJECT (m_gst_playbin), "uri", uri, NULL);
 
 
        g_object_set (G_OBJECT (m_gst_playbin), "uri", uri, NULL);
 


@@ -371,7 +372,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
                if (m_gst_playbin)
                        gst_object_unref(GST_OBJECT(m_gst_playbin));
 
                if (m_gst_playbin)
                        gst_object_unref(GST_OBJECT(m_gst_playbin));
 

-               eDebug("eServiceMP3::sorry, can't play: %s",m_error_message.c_str());
+               eDebug("eServiceMP3::sorry, can't play: %s",m_errorInfo.error_message.c_str());

                m_gst_playbin = 0;
        }
 
                m_gst_playbin = 0;
        }
 


@@ -935,7 +936,7 @@ std::string eServiceMP3::getInfoString(int w)
                tag = "channel-mode";
                break;
        case sUser+12:
                tag = "channel-mode";
                break;
        case sUser+12:

-               return m_error_message;
+               return m_errorInfo.error_message;

        default:
                return "";
        }
        default:
                return "";
        }


@@ -1165,18 +1166,18 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                return;
        gchar *sourceName;
        GstObject *source;
                return;
        gchar *sourceName;
        GstObject *source;

-

        source = GST_MESSAGE_SRC(msg);
        source = GST_MESSAGE_SRC(msg);

+       if (!GST_IS_OBJECT(source))
+               return;

        sourceName = gst_object_get_name(source);
 #if 0
        sourceName = gst_object_get_name(source);
 #if 0

+       gchar *string;

        if (gst_message_get_structure(msg))
        if (gst_message_get_structure(msg))

-       {
-               gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
-               eDebug("eServiceMP3::gst_message from %s: %s", sourceName, string);
-               g_free(string);
-       }
+               string = gst_structure_to_string(gst_message_get_structure(msg));

        else
        else

-               eDebug("eServiceMP3::gst_message from %s: %s (without structure)", sourceName, GST_MESSAGE_TYPE_NAME(msg));
+               string = g_strdup(GST_MESSAGE_TYPE_NAME(msg));
+       eDebug("eTsRemoteSource::gst_message from %s: %s", sourceName, string);
+       g_free(string);

 #endif
        switch (GST_MESSAGE_TYPE (msg))
        {
 #endif
        switch (GST_MESSAGE_TYPE (msg))
        {


@@ -1377,44 +1378,58 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                                g_free (g_lang);
                        }
                        m_event((iPlayableService*)this, evUpdatedEventInfo);
                                g_free (g_lang);
                        }
                        m_event((iPlayableService*)this, evUpdatedEventInfo);

+
+                       if ( m_errorInfo.missing_codec != "" )
+                       {
+                               if ( m_errorInfo.missing_codec.find("video/") == 0 || ( m_errorInfo.missing_codec.find("audio/") == 0 && getNumberOfTracks() == 0 ) )
+                                       m_event((iPlayableService*)this, evUser+12);
+                       }

                        break;
                }
                case GST_MESSAGE_ELEMENT:
                {
                        break;
                }
                case GST_MESSAGE_ELEMENT:
                {

-                       if ( gst_is_missing_plugin_message(msg) )
-                       {
-                               gchar *description = gst_missing_plugin_message_get_description(msg);
-                               if ( description )
-                               {
-                                       m_error_message = "GStreamer plugin " + (std::string)description + " not available!\n";
-                                       g_free(description);
-                                       m_event((iPlayableService*)this, evUser+12);
-                               }
-                       }
-                       else if (const GstStructure *msgstruct = gst_message_get_structure(msg))
+                       if (const GstStructure *msgstruct = gst_message_get_structure(msg))

                        {
                        {

-                               const gchar *eventname = gst_structure_get_name(msgstruct);
-                               if ( eventname )
+                               if ( gst_is_missing_plugin_message(msg) )

                                {
                                {

-                                       if (!strcmp(eventname, "eventSizeChanged") || !strcmp(eventname, "eventSizeAvail"))
+                                       GstCaps *caps;
+                                       gst_structure_get (msgstruct, "detail", GST_TYPE_CAPS, &caps, NULL); 
+                                       std::string codec = (const char*) gst_caps_to_string(caps);
+                                       gchar *description = gst_missing_plugin_message_get_description(msg);
+                                       if ( description )

                                        {
                                        {

-                                               gst_structure_get_int (msgstruct, "aspect_ratio", &m_aspect);
-                                               gst_structure_get_int (msgstruct, "width", &m_width);
-                                               gst_structure_get_int (msgstruct, "height", &m_height);
-                                               if (strstr(eventname, "Changed"))
-                                                       m_event((iPlayableService*)this, evVideoSizeChanged);
+                                               eDebug("eServiceMP3::m_errorInfo.missing_codec = %s", codec.c_str());
+                                               m_errorInfo.error_message = "GStreamer plugin " + (std::string)description + " not available!\n";
+                                               m_errorInfo.missing_codec = codec.substr(0,(codec.find_first_of(',')));
+                                               g_free(description);

                                        }
                                        }

-                                       else if (!strcmp(eventname, "eventFrameRateChanged") || !strcmp(eventname, "eventFrameRateAvail"))
-                                       {
-                                               gst_structure_get_int (msgstruct, "frame_rate", &m_framerate);
-                                               if (strstr(eventname, "Changed"))
-                                                       m_event((iPlayableService*)this, evVideoFramerateChanged);
-                                       }
-                                       else if (!strcmp(eventname, "eventProgressiveChanged") || !strcmp(eventname, "eventProgressiveAvail"))
+                                       gst_caps_unref(caps);
+                               }
+                               else
+                               {
+                                       const gchar *eventname = gst_structure_get_name(msgstruct);
+                                       if ( eventname )

                                        {
                                        {

-                                               gst_structure_get_int (msgstruct, "progressive", &m_progressive);
-                                               if (strstr(eventname, "Changed"))
-                                                       m_event((iPlayableService*)this, evVideoProgressiveChanged);
+                                               if (!strcmp(eventname, "eventSizeChanged") || !strcmp(eventname, "eventSizeAvail"))
+                                               {
+                                                       gst_structure_get_int (msgstruct, "aspect_ratio", &m_aspect);
+                                                       gst_structure_get_int (msgstruct, "width", &m_width);
+                                                       gst_structure_get_int (msgstruct, "height", &m_height);
+                                                       if (strstr(eventname, "Changed"))
+                                                               m_event((iPlayableService*)this, evVideoSizeChanged);
+                                               }
+                                               else if (!strcmp(eventname, "eventFrameRateChanged") || !strcmp(eventname, "eventFrameRateAvail"))
+                                               {
+                                                       gst_structure_get_int (msgstruct, "frame_rate", &m_framerate);
+                                                       if (strstr(eventname, "Changed"))
+                                                               m_event((iPlayableService*)this, evVideoFramerateChanged);
+                                               }
+                                               else if (!strcmp(eventname, "eventProgressiveChanged") || !strcmp(eventname, "eventProgressiveAvail"))
+                                               {
+                                                       gst_structure_get_int (msgstruct, "progressive", &m_progressive);
+                                                       if (strstr(eventname, "Changed"))
+                                                               m_event((iPlayableService*)this, evVideoProgressiveChanged);
+                                               }

                                        }
                                }
                        }
                                        }
                                }
                        }

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index a92a4cf..f3cc6dd 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -173,6 +173,12 @@ public:
                {
                }
        };
                {
                }
        };

+       struct errorInfo
+       {
+               std::string error_message;
+               std::string missing_codec;
+       };
+

 private:
        static int pcm_delay;
        static int ac3_delay;
 private:
        static int pcm_delay;
        static int ac3_delay;


@@ -189,6 +195,7 @@ private:
        eServiceReference m_ref;
        int m_buffer_size;
        bufferInfo m_bufferInfo;
        eServiceReference m_ref;
        int m_buffer_size;
        bufferInfo m_bufferInfo;

+       errorInfo m_errorInfo;

        eServiceMP3(eServiceReference ref);
        Signal2<void,iPlayableService*,int> m_event;
        enum
        eServiceMP3(eServiceReference ref);
        Signal2<void,iPlayableService*,int> m_event;
        enum


@@ -220,7 +227,6 @@ private:
         };
 
         eFixedMessagePump<Message> m_pump;
         };
 
         eFixedMessagePump<Message> m_pump;

-        std::string m_error_message;

 
         audiotype_t gstCheckAudioPad(GstStructure* structure);
         void gstBusCall(GstBus *bus, GstMessage *msg);
 
         audiotype_t gstCheckAudioPad(GstStructure* structure);
         void gstBusCall(GstBus *bus, GstMessage *msg);