X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b5d81255af4c93441b5b86386dde544e2fa15e05..007c9240c1be4f000d98b0193c65440b9e1fb0e5:/lib/service/servicemp3.cpp diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 22128aa2..7f89b927 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -20,7 +20,18 @@ eServiceFactoryMP3::eServiceFactoryMP3() eServiceCenter::getPrivInstance(sc); if (sc) - sc->addServiceFactory(eServiceFactoryMP3::id, this); + { + std::list extensions; + extensions.push_back("mp3"); + extensions.push_back("ogg"); + extensions.push_back("mpg"); + 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); + } m_service_info = new eStaticServiceMP3Info(); } @@ -108,7 +119,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll); GstElement *source = 0; - GstElement *decoder = 0, *conv = 0, *flt = 0, *sink = 0; /* for audio */ + GstElement *filter = 0, *decoder = 0, *conv = 0, *flt = 0, *sink = 0; /* for audio */ GstElement *audio = 0, *queue_audio = 0, *video = 0, *queue_video = 0, *mpegdemux = 0; @@ -124,12 +135,15 @@ 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_video = is_mpeg_ps || is_mpeg_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 || 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", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming); + 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 use_decodebin = !is_video; + int is_audio = !is_video; int all_ok = 0; @@ -142,7 +156,8 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp else { source = gst_element_factory_make ("neonhttpsrc", "http-source"); - g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL); + if (source) + g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL); } if (!source) @@ -151,14 +166,23 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp /* configure source */ g_object_set (G_OBJECT (source), "location", filename, NULL); - if (use_decodebin) + if (is_audio) { /* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */ - - decoder = gst_element_factory_make ("decodebin", "decoder"); + const char *decodertype = is_mp3 ? "mad" : "decodebin"; + + decoder = gst_element_factory_make (decodertype, "decoder"); if (!decoder) - eWarning("failed to create decodebin decoder"); - + eWarning("failed to create %s decoder", decodertype); + + /* mp3 decoding needs id3demux to extract ID3 data. 'decodebin' would do that internally. */ + if (is_mp3) + { + filter = gst_element_factory_make ("id3demux", "filter"); + if (!filter) + eWarning("failed to create id3demux"); + } + conv = gst_element_factory_make ("audioconvert", "converter"); if (!conv) eWarning("failed to create audioconvert"); @@ -179,7 +203,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp sink = gst_element_factory_make ("alsasink", "alsa-output"); if (!sink) eWarning("failed to create osssink"); - + if (source && decoder && conv && sink) all_ok = 1; } else /* is_video */ @@ -195,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"); @@ -206,32 +234,58 @@ 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; + } } if (m_gst_pipeline && all_ok) { gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this); - if (use_decodebin) + if (is_audio) { - g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK(gstCBnewPad), this); - g_signal_connect (decoder, "unknown-type", G_CALLBACK(gstCBunknownType), this); + 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); + } /* gst_bin will take the 'floating references' */ gst_bin_add_many (GST_BIN (m_gst_pipeline), source, decoder, NULL); - gst_element_link(source, decoder); - /* create audio bin */ + if (filter) + { + /* id3demux also has dynamic pads, which need to be connected to the decoder (this is done in the 'gstCBfilterPadAdded' CB) */ + gst_bin_add(GST_BIN(m_gst_pipeline), filter); + gst_element_link(source, filter); + m_decoder = decoder; + 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); + + /* 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)); gst_object_unref(audiopad); gst_bin_add (GST_BIN(m_gst_pipeline), m_gst_audio); + + /* 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 { gst_bin_add_many(GST_BIN(m_gst_pipeline), source, mpegdemux, audio, queue_audio, video, queue_video, NULL); @@ -460,7 +514,10 @@ RESULT eServiceMP3::info(ePtr&i) RESULT eServiceMP3::getName(std::string &name) { - name = "MP3 File: " + m_filename; + name = m_filename; + size_t n = name.rfind('/'); + if (n != std::string::npos) + name = name.substr(n + 1); return 0; } @@ -569,6 +626,8 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) m_stream_tags = result; } gst_tag_list_free(tags); + + m_event((iPlayableService*)this, evUpdatedInfo); break; } default: @@ -587,27 +646,33 @@ 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_static_pad (_this->m_decoder, "sink")); +} + void eServiceMP3::gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer user_data) { eServiceMP3 *_this = (eServiceMP3*)user_data; GstCaps *caps; GstStructure *str; GstPad *audiopad; - + /* only link once */ - audiopad = gst_element_get_pad (_this->m_gst_audio, "sink"); + audiopad = gst_element_get_request_pad (_this->m_gst_audio, "sink"); if (GST_PAD_IS_LINKED (audiopad)) { eDebug("audio already linked!"); g_object_unref (audiopad); @@ -633,7 +698,7 @@ void eServiceMP3::gstCBunknownType(GstElement *decodebin, GstPad *pad, GstCaps * { eServiceMP3 *_this = (eServiceMP3*)user_data; GstStructure *str; - + /* check media type */ caps = gst_pad_get_caps (pad); str = gst_caps_get_structure (caps, 0);