X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c2065c013a7cd519374f5179ea71a3416cea9a3f..f769a73f621f88d4b4e64be8fae3f79ca3ef6c1b:/lib/service/servicemp3.cpp diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index d94ced43..6578ff89 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -12,6 +12,9 @@ #include #include #include +#include +/* for subtitles */ +#include // eServiceFactoryMP3 @@ -169,7 +172,10 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp { m_stream_tags = 0; m_audioStreams.clear(); + m_subtitleStreams.clear(); m_currentAudioStream = 0; + m_currentSubtitleStream = 0; + m_subtitle_widget = 0; m_currentTrickRatio = 0; CONNECT(m_seekTimeout.timeout, eServiceMP3::seekTimeoutCB); CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll); @@ -189,7 +195,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp if (!ext) ext = filename; - int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin")); + int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin") && strcasecmp(ext, ".dat")); int is_mpeg_ts = !strcasecmp(ext, ".ts"); int is_matroska = !strcasecmp(ext, ".mkv"); int is_avi = !strcasecmp(ext, ".avi"); @@ -201,7 +207,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp 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, is_AudioCD: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi, is_AudioCD); int is_audio = !is_video; - + int all_ok = 0; m_gst_pipeline = gst_pipeline_new ("mediaplayer"); @@ -370,6 +376,35 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp m_audioStreams.push_back(audioStreamElem); } else /* is_video */ { + char srt_filename[strlen(filename)+1]; + strncpy(srt_filename,filename,strlen(filename)-3); + srt_filename[strlen(filename)-3]='\0'; + strcat(srt_filename, "srt"); + struct stat buffer; + if (stat(srt_filename, &buffer) == 0) + { + eDebug("subtitle file found: %s",srt_filename); + GstElement *subsource; + subsource = gst_element_factory_make ("filesrc", "srt_source"); + g_object_set (G_OBJECT (subsource), "location", filename, NULL); + GstElement *parser = gst_element_factory_make("subparse", "srt_parse"); + eDebug ("subparse = %p", parser); + GstElement *sink = gst_element_factory_make("fakesink", "srt_sink"); + eDebug ("fakesink = %p", sink); + g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL); + gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, parser, sink, NULL); + gboolean res = gst_element_link(subsource, parser); + eDebug ("parser link = %d", res); + res = gst_element_link(parser, sink); + eDebug ("sink link = %d", res); + g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this); + subtitleStream subs; + subs.element = sink; + m_subtitleStreams.push_back(subs); + } + else + eDebug("subtitle file not found: %s",srt_filename); + gst_bin_add_many(GST_BIN(m_gst_pipeline), source, videodemux, audio, queue_audio, video, queue_video, NULL); switch_audio = gst_element_factory_make ("input-selector", "switch_audio"); if (switch_audio) @@ -418,6 +453,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp eServiceMP3::~eServiceMP3() { + delete m_subtitle_widget; if (m_state == stRunning) stop(); @@ -732,6 +768,12 @@ RESULT eServiceMP3::audioTracks(ePtr &ptr) return 0; } +RESULT eServiceMP3::subtitle(ePtr &ptr) +{ + ptr = this; + return 0; +} + int eServiceMP3::getNumberOfTracks() { return m_audioStreams.size(); @@ -764,7 +806,7 @@ int eServiceMP3::selectAudioStream(int i) return -1; } g_object_get (G_OBJECT (selector), "n-pads", &nb_sources, NULL); - if ( i >= m_audioStreams.size() || i >= nb_sources || m_currentAudioStream >= m_audioStreams.size() ) + if ( (unsigned int)i >= m_audioStreams.size() || i >= nb_sources || (unsigned int)m_currentAudioStream >= m_audioStreams.size() ) return -2; char sinkpad[8]; sprintf(sinkpad, "sink%d", i); @@ -823,7 +865,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) GstObject *source; source = GST_MESSAGE_SRC(msg); - sourceName = gst_object_get_name(source); + sourceName = gst_object_get_name(source); if (gst_message_get_structure(msg)) { @@ -872,16 +914,22 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) if (gst_tag_list_get_string(tags, GST_TAG_AUDIO_CODEC, &g_audiocodec) && m_audioStreams.size()) { std::vector::iterator IterAudioStream = m_audioStreams.begin(); - while ( IterAudioStream->language_code.length() && IterAudioStream != m_audioStreams.end()) - IterAudioStream++; + while ( IterAudioStream != m_audioStreams.end() && (!IterAudioStream->language_code.empty() || IterAudioStream->type != audioStream::atUnknown)) + ++IterAudioStream; if ( g_strrstr(g_audiocodec, "MPEG-1 layer 2") ) IterAudioStream->type = audioStream::atMP2; else if ( g_strrstr(g_audiocodec, "MPEG-1 layer 3") ) IterAudioStream->type = audioStream::atMP3; + else if ( g_strrstr(g_audiocodec, "AAC audio") ) // dont checked if correct + IterAudioStream->type = audioStream::atAAC; + else if ( g_strrstr(g_audiocodec, "DTS audio") ) + IterAudioStream->type = audioStream::atDTS; else if ( g_strrstr(g_audiocodec, "AC-3 audio") ) IterAudioStream->type = audioStream::atAC3; else if ( g_strrstr(g_audiocodec, "Uncompressed 16-bit PCM audio") ) IterAudioStream->type = audioStream::atPCM; + else + eDebug("unknown audiocodec '%s'!", g_audiocodec); gchar *g_language; if ( gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_language) ) IterAudioStream->language_code = std::string(g_language); @@ -919,7 +967,7 @@ void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer use _this->m_audioStreams.push_back(audio); if ( selector ) { - GstPadLinkReturn ret = gst_pad_link(pad, gst_element_get_request_pad (selector, "sink%d")); + gst_pad_link(pad, gst_element_get_request_pad (selector, "sink%d")); if ( _this->m_audioStreams.size() == 1 ) { _this->selectAudioStream(0); @@ -935,6 +983,30 @@ void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer use { gst_pad_link(pad, gst_element_get_static_pad(gst_bin_get_by_name(pipeline,"queue_video"), "sink")); } + if (g_strrstr(name,"subtitle")) + { +// GstCaps *caps; +// const GstStructure *structure; +// caps = gst_pad_get_caps(name); +// structure = gst_caps_get_structure(caps, 0); + char elemname[17]; + sprintf(elemname, "%s_pars", name); + GstElement *parser = gst_element_factory_make("ssaparse", elemname); + eDebug ("ssaparse %s = %p", elemname, parser); + sprintf(elemname, "%s_sink", name); + GstElement *sink = gst_element_factory_make("fakesink", elemname); + eDebug ("fakesink %s = %p", elemname, sink); + g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL); + gst_bin_add_many(pipeline, parser, sink, NULL); + gboolean res = gst_pad_link(pad, gst_element_get_static_pad(parser, "sink")); + eDebug ("parser link = %d", res); + res = gst_element_link(parser, sink); + eDebug ("sink link = %d", res); + g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), _this); + subtitleStream subs; + subs.element = sink; + _this->m_subtitleStreams.push_back(subs); + } g_free (name); } @@ -1010,3 +1082,97 @@ eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::servi #else #warning gstreamer not available, not building media player #endif + +void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data) +{ + const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer); + eServiceMP3 *_this = (eServiceMP3*)user_data; + gchar *sourceName; + sourceName = gst_object_get_name(GST_OBJECT(element)); + if ( _this->m_subtitle_widget && _this->m_subtitleStreams.at(_this->m_currentSubtitleStream).element == element) + { + eDVBTeletextSubtitlePage page; + gRGB rgbcol(0xD0,0xD0,0xD0); + page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, (const char*)text)); + (_this->m_subtitle_widget)->setPage(page); + } + else + eDebug("on inactive element: %s (%p) saw subtitle: %s",sourceName, element, (const char*)text); +} + +RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple) +{ + eDebug("eServiceMP3::enableSubtitles"); + + ePyObject entry; + int tuplesize = PyTuple_Size(tuple); + int type = 0; + int pid; + + if (!PyTuple_Check(tuple)) + goto error_out; + + if (tuplesize < 1) + goto error_out; + + entry = PyTuple_GET_ITEM(tuple, 0); + + if (!PyInt_Check(entry)) + goto error_out; + + type = PyInt_AsLong(entry); + + entry = PyTuple_GET_ITEM(tuple, 1); + if (!PyInt_Check(entry)) + goto error_out; + pid = PyInt_AsLong(entry); + + m_subtitle_widget = new eSubtitleWidget(parent); + m_subtitle_widget->resize(parent->size()); /* full size */ + m_currentSubtitleStream = pid; + + return 0; +error_out: + eDebug("enableSubtitles needs a tuple as 2nd argument!\n" + "for gst subtitles (2, subtitle_stream_count)"); + return -1; +} + +RESULT eServiceMP3::disableSubtitles(eWidget *parent) +{ + eDebug("eServiceMP3::disableSubtitles"); + delete m_subtitle_widget; + m_subtitle_widget = 0; + return 0; +} + +PyObject *eServiceMP3::getCachedSubtitle() +{ + eDebug("eServiceMP3::eDVBServicePlay"); + Py_RETURN_NONE; +} + +PyObject *eServiceMP3::getSubtitleList() +{ + eDebug("eServiceMP3::getSubtitleList"); + + ePyObject l = PyList_New(0); + gchar *sourceName; + int stream_count = 0; + + for (std::vector::iterator IterSubtitleStream(m_subtitleStreams.begin()); IterSubtitleStream != m_subtitleStreams.end(); ++IterSubtitleStream) + { + ePyObject tuple = PyTuple_New(5); + PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(2)); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(stream_count)); + PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(0)); + PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(0)); + sourceName = gst_object_get_name(GST_OBJECT (IterSubtitleStream->element)); + PyTuple_SET_ITEM(tuple, 4, PyString_FromString(sourceName)); + PyList_Append(l, tuple); + Py_DECREF(tuple); + stream_count++; + } + + return l; +}