X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57355de351da0b7cc200eb9eedbbc115adb6df3b..2ab514e090cb4f0dc14faa061820d9d154b37647:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 22b9a667..3d8def57 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -115,11 +115,19 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	m_state = stIdle;
 	eDebug("SERVICEMP3 construct!");
 	
-	
 		/* FIXME: currently, decodebin isn't possible for 
 		   video streams. in that case, make a manual pipeline. */
 
-	int is_video = !!strstr(filename, "mpg"); /* fixme */
+	const char *ext = strrchr(filename, '.');
+	if (!ext)
+		ext = filename;
+
+	int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin"));
+	int is_mpeg_ts = !strcasecmp(ext, ".ts");
+	int is_video = is_mpeg_ps || is_mpeg_ts;
+	int is_streaming = !strncmp(filename, "http://", 7);
+	
+	eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming);
 	
 	int use_decodebin = !is_video;
 	
@@ -129,10 +137,21 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	if (!m_gst_pipeline)
 		eWarning("failed to create pipeline");
 
-	source = gst_element_factory_make ("filesrc", "file-source");
+	if (!is_streaming)
+		source = gst_element_factory_make ("filesrc", "file-source");
+	else
+	{
+		source = gst_element_factory_make ("neonhttpsrc", "http-source");
+		if (source)
+			g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
+	}
+
 	if (!source)
-		eWarning("failed to create filesrc");
-	
+		eWarning("failed to create %s", is_streaming ? "neonhttpsrc" : "filesrc");
+	else
+				/* configure source */
+		g_object_set (G_OBJECT (source), "location", filename, NULL);
+
 	if (use_decodebin)
 	{
 			/* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */
@@ -144,19 +163,20 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		conv = gst_element_factory_make ("audioconvert", "converter");
 		if (!conv)
 			eWarning("failed to create audioconvert");
-	
+
 		flt = gst_element_factory_make ("capsfilter", "flt");
 		if (!flt)
 			eWarning("failed to create capsfilter");
-	
-			/* workaround for [3des]' driver bugs: */
+
+			/* for some reasons, we need to set the sample format to depth/width=16, because auto negotiation doesn't work. */
+			/* endianness, however, is not required to be set anymore. */
 		if (flt)
 		{
-			GstCaps *caps = gst_caps_new_simple("audio/x-raw-int", "endianness", G_TYPE_INT, 4321, (char*)0);
+			GstCaps *caps = gst_caps_new_simple("audio/x-raw-int", /* "endianness", G_TYPE_INT, 4321, */ "depth", G_TYPE_INT, 16, "width", G_TYPE_INT, 16, "channels", G_TYPE_INT, 2, (char*)0);
 			g_object_set (G_OBJECT (flt), "caps", caps, (char*)0);
 			gst_caps_unref(caps);
 		}
-	
+
 		sink = gst_element_factory_make ("alsasink", "alsa-output");
 		if (!sink)
 			eWarning("failed to create osssink");
@@ -174,20 +194,32 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		video = gst_element_factory_make("dvbvideosink", "video");
 		queue_video = gst_element_factory_make("queue", "queue_video");
 		
-		mpegdemux = gst_element_factory_make("mpegdemux", "mpegdemux");
+		if (is_mpeg_ps)
+			mpegdemux = gst_element_factory_make("flupsdemux", "mpegdemux");
+		else
+			mpegdemux = gst_element_factory_make("flutsdemux", "mpegdemux");
+			
+		if (!mpegdemux)
+		{
+			eDebug("fluendo mpegdemux not available, falling back to mpegdemux\n");
+			mpegdemux = gst_element_factory_make("mpegdemux", "mpegdemux");
+		}
 		
 		eDebug("audio: %p, queue_audio %p, video %p, queue_video %p, mpegdemux %p", audio, queue_audio, video, queue_video, mpegdemux);
 		if (audio && queue_audio && video && queue_video && mpegdemux)
+		{
+			g_object_set (G_OBJECT (queue_audio), "max-size-buffers", 0, NULL);
+			g_object_set (G_OBJECT (queue_audio), "max-size-time", (guint64)0, NULL);
+			g_object_set (G_OBJECT (queue_video), "max-size-buffers", 0, NULL);
+			g_object_set (G_OBJECT (queue_video), "max-size-time", (guint64)0, NULL);
 			all_ok = 1;
+		}
 	}
 	
 	if (m_gst_pipeline && all_ok)
 	{
 		gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this);
 
-				/* configure source */
-		g_object_set (G_OBJECT (source), "location", filename, NULL);
-		
 		if (use_decodebin)
 		{
 			g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK(gstCBnewPad), this);
@@ -209,7 +241,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 			gst_bin_add (GST_BIN(m_gst_pipeline), m_gst_audio);
 		} else
 		{
-			gst_bin_add_many(GST_BIN(m_gst_pipeline), source, mpegdemux, audio, queue_audio, video, queue_video, mpegdemux, NULL);
+			gst_bin_add_many(GST_BIN(m_gst_pipeline), source, mpegdemux, audio, queue_audio, video, queue_video, NULL);
 			gst_element_link(source, mpegdemux);
 			gst_element_link(queue_audio, audio);
 			gst_element_link(queue_video, video);
@@ -508,10 +540,12 @@ std::string eServiceMP3::getInfoString(int w)
 
 void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 {
-	gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
-	eDebug("gst_message: %s", string);
-	g_free(string);
-	
+	if (msg)
+	{
+		gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
+		eDebug("gst_message: %s", string);
+		g_free(string);
+	}
 	
 	switch (GST_MESSAGE_TYPE (msg))
 	{
@@ -542,6 +576,8 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			m_stream_tags = result;
 		}
 		gst_tag_list_free(tags);
+		
+		m_event((iPlayableService*)this, evUpdatedInfo);
 		break;
 	}
 	default:
@@ -564,9 +600,9 @@ void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer use
 	gchar *name;
 	name = gst_pad_get_name (pad);
 	g_print ("A new pad %s was created\n", name);
-	if (!strcmp(name, "audio_00"))
+	if (!strncmp(name, "audio_", 6)) // mpegdemux uses video_nn with n=0,1,.., flupsdemux uses stream id
 		gst_pad_link(pad, gst_element_get_pad (_this->m_gst_audioqueue, "sink"));
-	if (!strcmp(name, "video_00"))
+	if (!strncmp(name, "video_", 6))
 		gst_pad_link(pad, gst_element_get_pad (_this->m_gst_videoqueue, "sink"));
 	g_free (name);