X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2aa2925cf52add4b737c17a7e75c88a4fcc7057c..dc46dad972d745f6e06ecb3324c037aeee479360:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 7a8fcbd7..b1764eb4 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -40,6 +40,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("dat");
 		extensions.push_back("flac");
 		extensions.push_back("mp4");
+		extensions.push_back("mov");
 		extensions.push_back("m4a");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
@@ -223,7 +224,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 )
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;
@@ -284,9 +285,14 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		int ret = read(fd, tmp, 128*1024);
 		close(fd);
 		if ( ret == -1 ) // this is a "REAL" VCD
+		{
 			source = gst_element_factory_make ("vcdsrc", "vcd-source");
 			if (source)
+			{
 				g_object_set (G_OBJECT (source), "device", "/dev/cdroms/cdrom0", NULL);
+				eDebug("servicemp3: this is a 'REAL' video cd... we use vcdsrc !");
+			}
+		}
 	}
 	if ( !source && !sourceinfo.is_streaming )
 	{
@@ -316,11 +322,11 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		switch (sourceinfo.containertype)
 		{
 			case ctMPEGTS:
-				demux_type = "flutsdemux";
+				demux_type = "mpegtsdemux";
 				break;
 			case ctMPEGPS:
 			case ctVCD:
-				demux_type = "flupsdemux";
+				demux_type = "mpegpsdemux";
 				break;
 			case ctMKV:
 				demux_type = "matroskademux";
@@ -491,7 +497,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 
 			if ( sourceinfo.containertype == ctVCD && gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"file-source") )
 			{
-				eDebug("this is a fake video cd... we use filesrc ! cdxaparse !");
+				eDebug("servicemp3: this is a fake video cd... we use filesrc ! cdxaparse !");
 				GstElement *cdxaparse = gst_element_factory_make("cdxaparse", "cdxaparse");
 				gst_bin_add(GST_BIN(m_gst_pipeline), cdxaparse);
 				gst_element_link(source, cdxaparse);
@@ -776,13 +782,13 @@ RESULT eServiceMP3::getPlayPosition(pts_t &pts)
 		return -1;
 	if (m_state != stRunning)
 		return -1;
-	
+
 	GstFormat fmt = GST_FORMAT_TIME;
 	gint64 len;
 	
 	if (!gst_element_query_position(m_gst_pipeline, &fmt, &len))
 		return -1;
-	
+
 		/* len is in nanoseconds. we have 90 000 pts per second. */
 	pts = len / 11111;
 	return 0;
@@ -833,6 +839,7 @@ int eServiceMP3::getInfo(int w)
 	case sGenre:
 	case sVideoType:
 	case sTimeCreate:
+	case sUser+10:
 	case sUser+12:
 		return resIsString;
 	case sCurrentTitle:
@@ -881,6 +888,9 @@ std::string eServiceMP3::getInfoString(int w)
 	case sGenre:
 		tag = GST_TAG_GENRE;
 		break;
+	case sUser+10:
+		tag = GST_TAG_AUDIO_CODEC;
+		break;
 	case sVideoType:
 		tag = GST_TAG_VIDEO_CODEC;
 		break;
@@ -1020,7 +1030,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 
 	source = GST_MESSAGE_SRC(msg);
 	sourceName = gst_object_get_name(source);
-#if 0
+#if 1
 	if (gst_message_get_structure(msg))
 	{
 		gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
@@ -1042,11 +1052,26 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 	
 			gst_message_parse_error (msg, &err, &debug);
 			g_free (debug);
-			eWarning("Gstreamer error: %s (%i)", err->message, err->code );
-			if ( err->domain == GST_STREAM_ERROR && err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
+			eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
+			if ( err->domain == GST_STREAM_ERROR )
 			{
-				if ( g_strrstr(sourceName, "videosink") )
-					m_event((iPlayableService*)this, evUser+11);
+				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
+				{
+					if ( g_strrstr(sourceName, "videosink") )
+						m_event((iPlayableService*)this, evUser+11);
+					else if ( g_strrstr(sourceName, "audiosink") )
+						m_event((iPlayableService*)this, evUser+10);
+				}
+				else if ( err->code == GST_STREAM_ERROR_FAILED && g_strrstr(sourceName, "file-source") )
+				{
+					eWarning("error in tag parsing, linking mp3parse directly to file-sink, bypassing id3demux...");
+					GstElement *source = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"file-source");
+					GstElement *parser = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"audiosink");
+					gst_element_set_state(m_gst_pipeline, GST_STATE_NULL);
+					gst_element_unlink(source, gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"id3demux"));
+					gst_element_link(source, parser);
+					gst_element_set_state (m_gst_pipeline, GST_STATE_PLAYING);
+				}
 			}
 			g_error_free(err);
 			break;
@@ -1424,14 +1449,17 @@ eAutoInitPtr<eServiceFactoryMP3> init_eServiceFactoryMP3(eAutoInitNumbers::servi
 void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data)
 {
 	gint64 duration_ns = GST_BUFFER_DURATION(buffer);
-	const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
-	eDebug("gstCBsubtitleAvail: %s",text);
+	size_t len = GST_BUFFER_SIZE(buffer);
+	unsigned char tmp[len+1];
+	memcpy(tmp, GST_BUFFER_DATA(buffer), len);
+	tmp[len] = 0;
+	eDebug("gstCBsubtitleAvail: %s", tmp);
 	eServiceMP3 *_this = (eServiceMP3*)user_data;
 	if ( _this->m_subtitle_widget )
 	{
 		ePangoSubtitlePage page;
 		gRGB rgbcol(0xD0,0xD0,0xD0);
-		page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)text));
+		page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)tmp));
 		page.m_timeout = duration_ns / 1000000;
 		(_this->m_subtitle_widget)->setPage(page);
 	}