X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f3cc59418747658a3d8c6f3b75052567e32389d7..fea429e03ad502d4667041a245d3b492c49d55d7:/lib/service/servicemp3.cpp diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index f74cc8d0..c004d038 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -28,6 +28,8 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("vob"); extensions.push_back("wav"); extensions.push_back("wave"); + extensions.push_back("mkv"); + extensions.push_back("avi"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } @@ -133,11 +135,13 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp 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_matroska = !strcasecmp(ext, ".mkv"); + int is_avi = !strcasecmp(ext, ".avi"); int is_mp3 = !strcasecmp(ext, ".mp3"); /* force mp3 instead of decodebin */ - int is_video = is_mpeg_ps || is_mpeg_ts; + int is_video = is_mpeg_ps || is_mpeg_ts || is_matroska || is_avi; int is_streaming = !strncmp(filename, "http://", 7); - eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3); + eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d, is_matroska: %d, is_avi: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi); int is_audio = !is_video; @@ -215,9 +219,13 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp if (is_mpeg_ps) mpegdemux = gst_element_factory_make("flupsdemux", "mpegdemux"); - else + else if (is_mpeg_ts) mpegdemux = gst_element_factory_make("flutsdemux", "mpegdemux"); - + else if (is_matroska) + mpegdemux = gst_element_factory_make("matroskademux", "mpegdemux"); + else if (is_avi) + mpegdemux = gst_element_factory_make("avidemux", "mpegdemux"); + if (!mpegdemux) { eDebug("fluendo mpegdemux not available, falling back to mpegdemux\n"); @@ -227,9 +235,11 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp 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-bytes", 256*1024, NULL); 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-bytes", 2*1024*1024, NULL); g_object_set (G_OBJECT (queue_video), "max-size-time", (guint64)0, NULL); all_ok = 1; } @@ -241,16 +251,19 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp if (is_audio) { + queue_audio = gst_element_factory_make("queue", "queue_audio"); + if (!is_mp3) { /* decodebin has dynamic pads. When they get created, we connect them to the audio bin */ g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK(gstCBnewPad), this); g_signal_connect (decoder, "unknown-type", G_CALLBACK(gstCBunknownType), this); + g_object_set (G_OBJECT (sink), "preroll-queue-len", 80, NULL); } /* gst_bin will take the 'floating references' */ gst_bin_add_many (GST_BIN (m_gst_pipeline), - source, decoder, NULL); + source, queue_audio, decoder, NULL); if (filter) { @@ -261,12 +274,12 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp g_signal_connect (filter, "pad-added", G_CALLBACK(gstCBfilterPadAdded), this); } else /* in decodebin's case we can just connect the source with the decodebin, and decodebin will take care about id3demux (or whatever is required) */ - gst_element_link(source, decoder); + gst_element_link_many(source, queue_audio, decoder, NULL); /* create audio bin with the audioconverter, the capsfilter and the audiosink */ m_gst_audio = gst_bin_new ("audiobin"); - GstPad *audiopad = gst_element_get_pad (conv, "sink"); + GstPad *audiopad = gst_element_get_static_pad (conv, "sink"); gst_bin_add_many(GST_BIN(m_gst_audio), conv, flt, sink, (char*)0); gst_element_link_many(conv, flt, sink, (char*)0); gst_element_add_pad(m_gst_audio, gst_ghost_pad_new ("sink", audiopad)); @@ -276,7 +289,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp /* in mad's case, we can directly connect the decoder to the audiobin. otherwise, we do this in gstCBnewPad */ if (is_mp3) gst_element_link(decoder, m_gst_audio); - } else + } else /* is_video */ { gst_bin_add_many(GST_BIN(m_gst_pipeline), source, mpegdemux, audio, queue_audio, video, queue_video, NULL); gst_element_link(source, mpegdemux); @@ -513,6 +526,8 @@ RESULT eServiceMP3::getName(std::string &name) int eServiceMP3::getInfo(int w) { + gchar *tag = 0; + switch (w) { case sTitle: @@ -522,10 +537,25 @@ int eServiceMP3::getInfo(int w) case sTracknumber: case sGenre: return resIsString; - + case sCurrentTitle: + tag = GST_TAG_TRACK_NUMBER; + break; + case sTotalTitles: + tag = GST_TAG_TRACK_COUNT; + break; default: return resNA; } + + if (!m_stream_tags || !tag) + return 0; + + guint value; + if (gst_tag_list_get_uint(m_stream_tags, tag, &value)) + return (int) value; + + return 0; + } std::string eServiceMP3::getInfoString(int w) @@ -582,9 +612,14 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) { if (msg) { - gchar *string = gst_structure_to_string(gst_message_get_structure(msg)); - eDebug("gst_message: %s", string); - g_free(string); + if (gst_message_get_structure(msg)) + { + gchar *string = gst_structure_to_string(gst_message_get_structure(msg)); + eDebug("gst_message: %s", string); + g_free(string); + } + else + eDebug("gst_message: %s (without structure)", GST_MESSAGE_TYPE_NAME(msg)); } switch (GST_MESSAGE_TYPE (msg)) @@ -636,22 +671,22 @@ GstBusSyncReply eServiceMP3::gstBusSyncHandler(GstBus *bus, GstMessage *message, void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer user_data) { eServiceMP3 *_this = (eServiceMP3*)user_data; - gchar *name; name = gst_pad_get_name (pad); g_print ("A new pad %s was created\n", name); - 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 (!strncmp(name, "video_", 6)) - gst_pad_link(pad, gst_element_get_pad (_this->m_gst_videoqueue, "sink")); + GstPad *sinkpad; + + if (g_strrstr(name,"audio")) // mpegdemux uses video_nn with n=0,1,.., flupsdemux uses stream id + gst_pad_link(pad, gst_element_get_static_pad (_this->m_gst_audioqueue, "sink")); + if (g_strrstr(name,"video")) + gst_pad_link(pad, gst_element_get_static_pad (_this->m_gst_videoqueue, "sink")); g_free (name); - } void eServiceMP3::gstCBfilterPadAdded(GstElement *filter, GstPad *pad, gpointer user_data) { eServiceMP3 *_this = (eServiceMP3*)user_data; - gst_pad_link(pad, gst_element_get_pad (_this->m_decoder, "sink")); + gst_pad_link(pad, gst_element_get_static_pad (_this->m_decoder, "sink")); } void eServiceMP3::gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer user_data) @@ -662,8 +697,8 @@ void eServiceMP3::gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, GstPad *audiopad; /* only link once */ - audiopad = gst_element_get_pad (_this->m_gst_audio, "sink"); - if (GST_PAD_IS_LINKED (audiopad)) { + audiopad = gst_element_get_static_pad (_this->m_gst_audio, "sink"); + if ( !audiopad || GST_PAD_IS_LINKED (audiopad)) { eDebug("audio already linked!"); g_object_unref (audiopad); return;