X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.cpp;h=bb75a063f13911f5c29d215b646cd97baa512730;hp=937032aa64342a9d9b46549f3a55f05b09e341e9;hb=3d5f795eba816f4ef9e487cefe6e12f1b5c589c4;hpb=f06b7a792a3250dfbe210ac6d55223146244832f

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
old mode 100644
new mode 100755
index 937032a..bb75a06
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -47,6 +47,10 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("mp4");
 		extensions.push_back("mov");
 		extensions.push_back("m4a");
+		extensions.push_back("flv");
+		extensions.push_back("3gp");
+		extensions.push_back("3g2");
+		extensions.push_back("dts");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
 
@@ -229,6 +233,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 	m_prev_decoder_time = -1;
 	m_decoder_time_valid_state = 0;
 	m_errorInfo.missing_codec = "";
+	//vuplus
+	m_is_hls_stream = 0;
 
 	CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB);
 	CONNECT(m_subtitle_sync_timer->timeout, eServiceMP3::pushSubtitles);
@@ -324,7 +330,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 
 		uri = g_filename_to_uri(filename, NULL, NULL);
 
-	eDebug("eServiceMP3::playbin2 uri=%s", uri);
+	//eDebug("eServiceMP3::playbin2 uri=%s", uri);
+	eDebug("eServiceMP3::playbin2");
 
 	m_gst_playbin = gst_element_factory_make("playbin2", "playbin");
 	if (!m_gst_playbin)
@@ -447,7 +454,8 @@ RESULT eServiceMP3::stop()
 	
 	//GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(m_gst_playbin),GST_DEBUG_GRAPH_SHOW_ALL,"e2-playbin");
 
-	eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
+	//eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
+	eDebug("eServiceMP3::stop service..");
 	gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
 	m_state = stStopped;
 
@@ -1187,7 +1195,15 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 		case GST_MESSAGE_STATE_CHANGED:
 		{
 			if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin))
+			{
+				//vuplus
+				if(!strncmp(sourceName, "hls", 3))
+				{
+					//eDebug("HLS Protocol detected : source [%s]", sourceName);
+					m_is_hls_stream = 1;
+				}
 				break;
+			}
 
 			GstState old_state, new_state;
 			gst_message_parse_state_changed(msg, &old_state, &new_state, NULL);
@@ -1241,7 +1257,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			GError *err;
 			gst_message_parse_error (msg, &err, &debug);
 			g_free (debug);
-			eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
+			eWarning("Gstreamer error: %s (domain:%i, code:%i) from %s", err->message, err->domain, err->code, sourceName );
 			if ( err->domain == GST_STREAM_ERROR )
 			{
 				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
@@ -1252,6 +1268,11 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 						m_event((iPlayableService*)this, evUser+10);
 				}
 			}
+			else //if( err->domain == 1232 )
+			{
+				if ( err->code == 5 )
+        	                        m_event((iPlayableService*)this, evUser+20);
+			}
 			g_error_free(err);
 			break;
 		}
@@ -1392,18 +1413,21 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			{
 				if ( gst_is_missing_plugin_message(msg) )
 				{
-					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 )
+					GstCaps *caps= NULL;
+					gboolean ret = gst_structure_get (msgstruct, "detail", GST_TYPE_CAPS, &caps, NULL);
+					if (ret)
 					{
-						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);
+						std::string codec = (const char*) gst_caps_to_string(caps);
+						gchar *description = gst_missing_plugin_message_get_description(msg);
+						if ( description )
+						{
+							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);
+						}
+						gst_caps_unref(caps);
 					}
-					gst_caps_unref(caps);
 				}
 				else
 				{
@@ -1466,7 +1490,13 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 						g_object_set (G_OBJECT (owner), "timeout", HTTP_TIMEOUT, NULL);
 						eDebug("eServiceMP3::GST_STREAM_STATUS_TYPE_CREATE -> setting timeout on %s to %is", name, HTTP_TIMEOUT);
 					}
-					
+					//vuplus
+					else if (m_is_hls_stream && !strncmp(name, "queue", 5))
+					{
+						m_streamingsrc_timeout->stop();
+						m_is_hls_stream = 0;
+						//eDebug("Stoped response timeout!! : HLS");
+					}
 				}
 				if ( GST_IS_PAD(source) )
 					gst_object_unref(owner);