X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8e60bdc64c73787b8e7955a6a99ad5afe4a071ef..64de540e03c8ab04712797079e5fc76eb0135baa:/lib/service/servicemp3.cpp diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 1f3e2d03..7701d4d5 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -17,12 +17,6 @@ /* for subtitles */ #include -#ifndef GST_SEEK_FLAG_SKIP -#warning Compiling for legacy gstreamer, things will break -#define GST_SEEK_FLAG_SKIP 0 -#define GST_TAG_HOMEPAGE "" -#endif - // eServiceFactoryMP3 eServiceFactoryMP3::eServiceFactoryMP3() @@ -48,6 +42,7 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("mp4"); extensions.push_back("mov"); extensions.push_back("m4a"); + extensions.push_back("m2ts"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } @@ -69,7 +64,7 @@ DEFINE_REF(eServiceFactoryMP3) RESULT eServiceFactoryMP3::play(const eServiceReference &ref, ePtr &ptr) { // check resources... - ptr = new eServiceMP3(ref.path.c_str(),ref.getName().c_str()); + ptr = new eServiceMP3(ref); return 0; } @@ -100,6 +95,7 @@ public: RESULT deleteFromDisk(int simulate); RESULT getListOfFilenames(std::list &); + RESULT reindex(); }; DEFINE_REF(eMP3ServiceOfflineOperations); @@ -142,6 +138,11 @@ RESULT eMP3ServiceOfflineOperations::getListOfFilenames(std::list & return 0; } +RESULT eMP3ServiceOfflineOperations::reindex() +{ + return -1; +} + RESULT eServiceFactoryMP3::offlineOperations(const eServiceReference &ref, ePtr &ptr) { @@ -187,15 +188,18 @@ int eStaticServiceMP3Info::getLength(const eServiceReference &ref) // eServiceMP3 -eServiceMP3::eServiceMP3(const char *filename, const char *title): m_filename(filename), m_title(title), m_pump(eApp, 1) +eServiceMP3::eServiceMP3(eServiceReference ref) + :m_ref(ref), m_pump(eApp, 1) { m_seekTimeout = eTimer::create(eApp); m_subtitle_sync_timer = eTimer::create(eApp); m_stream_tags = 0; - m_currentAudioStream = 0; + m_currentAudioStream = -1; m_currentSubtitleStream = 0; m_subtitle_widget = 0; m_currentTrickRatio = 0; + m_subs_to_pull = 0; + m_buffer_size = 1*1024*1024; CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB); CONNECT(m_subtitle_sync_timer->timeout, eServiceMP3::pushSubtitles); CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll); @@ -203,7 +207,8 @@ eServiceMP3::eServiceMP3(const char *filename, const char *title): m_filename(fi m_state = stIdle; eDebug("eServiceMP3::construct!"); - + + const char *filename = m_ref.path.c_str(); const char *ext = strrchr(filename, '.'); if (!ext) ext = filename; @@ -250,7 +255,7 @@ eServiceMP3::eServiceMP3(const char *filename, const char *title): m_filename(fi sourceinfo.containertype = ctVCD; sourceinfo.is_video = TRUE; } - if ( (strncmp(filename, "http://", 7)) == 0 || (strncmp(filename, "udp://", 6)) == 0 || (strncmp(filename, "rtsp://", 7)) == 0 ) + if ( (strncmp(filename, "http://", 7)) == 0 || (strncmp(filename, "udp://", 6)) == 0 || (strncmp(filename, "rtp://", 6)) == 0 || (strncmp(filename, "https://", 8)) == 0 || (strncmp(filename, "mms://", 6)) == 0 || (strncmp(filename, "rtsp://", 7)) == 0 ) sourceinfo.is_streaming = TRUE; gchar *uri; @@ -297,7 +302,6 @@ eServiceMP3::eServiceMP3(const char *filename, const char *title): m_filename(fi eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-appsink"); else { - g_object_set (G_OBJECT (subsink), "emit-signals", TRUE, NULL); g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this); g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL); } @@ -331,7 +335,7 @@ eServiceMP3::eServiceMP3(const char *filename, const char *title): m_filename(fi m_gst_playbin = 0; } - gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING); + setBufferSize(m_buffer_size); } eServiceMP3::~eServiceMP3() @@ -350,7 +354,7 @@ eServiceMP3::~eServiceMP3() } } -DEFINE_REF(eServiceMP3); +DEFINE_REF(eServiceMP3); RESULT eServiceMP3::connectEvent(const Slot2 &event, ePtr &connection) { @@ -361,25 +365,30 @@ RESULT eServiceMP3::connectEvent(const Slot2 &event, RESULT eServiceMP3::start() { ASSERT(m_state == stIdle); - + m_state = stRunning; if (m_gst_playbin) { eDebug("eServiceMP3::starting pipeline"); gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING); } + m_event(this, evStart); + return 0; } RESULT eServiceMP3::stop() { ASSERT(m_state != stIdle); + if (m_state == stStopped) return -1; - eDebug("eServiceMP3::stop %s", m_filename.c_str()); + + eDebug("eServiceMP3::stop %s", m_ref.path.c_str()); gst_element_set_state(m_gst_playbin, GST_STATE_NULL); m_state = stStopped; + return 0; } @@ -435,24 +444,19 @@ RESULT eServiceMP3::pause() { if (!m_gst_playbin || m_state != stRunning) return -1; - GstStateChangeReturn res = gst_element_set_state(m_gst_playbin, GST_STATE_PAUSED); - if (res == GST_STATE_CHANGE_ASYNC) - { - pts_t ppos; - getPlayPosition(ppos); - seekTo(ppos); - } + + gst_element_set_state(m_gst_playbin, GST_STATE_PAUSED); + return 0; } RESULT eServiceMP3::unpause() { - m_subtitle_pages.clear(); if (!m_gst_playbin || m_state != stRunning) return -1; - GstStateChangeReturn res; - res = gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING); + gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING); + return 0; } @@ -467,9 +471,10 @@ RESULT eServiceMP3::getLength(pts_t &pts) { if (!m_gst_playbin) return -1; + if (m_state != stRunning) return -1; - + GstFormat fmt = GST_FORMAT_TIME; gint64 len; @@ -481,13 +486,8 @@ RESULT eServiceMP3::getLength(pts_t &pts) return 0; } -RESULT eServiceMP3::seekTo(pts_t to) +RESULT eServiceMP3::seekToImpl(pts_t to) { - m_subtitle_pages.clear(); - - if (!m_gst_playbin) - return -1; - /* convert pts to nanoseconds */ gint64 time_nanoseconds = to * 11111LL; if (!gst_element_seek (m_gst_playbin, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, @@ -497,9 +497,27 @@ RESULT eServiceMP3::seekTo(pts_t to) eDebug("eServiceMP3::seekTo failed"); return -1; } + return 0; } +RESULT eServiceMP3::seekTo(pts_t to) +{ + RESULT ret = -1; + + if (m_gst_playbin) { + eSingleLocker l(m_subs_to_pull_lock); // this is needed to dont handle incomming subtitles during seek! + if (!(ret = seekToImpl(to))) + { + m_subtitle_pages.clear(); + m_subs_to_pull = 0; + } + } + + return ret; +} + + RESULT eServiceMP3::trickSeek(gdouble ratio) { if (!m_gst_playbin) @@ -508,11 +526,11 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) return seekRelative(0, 0); GstEvent *s_event; - GstSeekFlags flags; + int flags; flags = GST_SEEK_FLAG_NONE; - flags |= GstSeekFlags (GST_SEEK_FLAG_FLUSH); + flags |= GST_SEEK_FLAG_FLUSH; // flags |= GstSeekFlags (GST_SEEK_FLAG_ACCURATE); - flags |= GstSeekFlags (GST_SEEK_FLAG_KEY_UNIT); + flags |= GST_SEEK_FLAG_KEY_UNIT; // flags |= GstSeekFlags (GST_SEEK_FLAG_SEGMENT); // flags |= GstSeekFlags (GST_SEEK_FLAG_SKIP); @@ -523,13 +541,13 @@ RESULT eServiceMP3::trickSeek(gdouble ratio) if ( ratio >= 0 ) { - s_event = gst_event_new_seek (ratio, GST_FORMAT_TIME, flags, GST_SEEK_TYPE_SET, pos, GST_SEEK_TYPE_SET, len); + s_event = gst_event_new_seek (ratio, GST_FORMAT_TIME, (GstSeekFlags)flags, GST_SEEK_TYPE_SET, pos, GST_SEEK_TYPE_SET, len); eDebug("eServiceMP3::trickSeek with rate %lf to %" GST_TIME_FORMAT " ", ratio, GST_TIME_ARGS (pos)); } else { - s_event = gst_event_new_seek (ratio, GST_FORMAT_TIME, GST_SEEK_FLAG_SKIP|GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); + s_event = gst_event_new_seek (ratio, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_SKIP|GST_SEEK_FLAG_FLUSH), GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); } if (!gst_element_send_event ( GST_ELEMENT (m_gst_playbin), s_event)) @@ -559,19 +577,40 @@ RESULT eServiceMP3::seekRelative(int direction, pts_t to) RESULT eServiceMP3::getPlayPosition(pts_t &pts) { + GstFormat fmt = GST_FORMAT_TIME; + gint64 pos; + GstElement *sink; + pts = 0; + if (!m_gst_playbin) return -1; if (m_state != stRunning) return -1; - GstFormat fmt = GST_FORMAT_TIME; - gint64 len; - - if (!gst_element_query_position(m_gst_playbin, &fmt, &len)) + g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL); + + if (!sink) + g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL); + + if (!sink) return -1; - /* len is in nanoseconds. we have 90 000 pts per second. */ - pts = len / 11111; + gchar *name = gst_element_get_name(sink); + gboolean use_get_decoder_time = strstr(name, "dvbaudiosink") || strstr(name, "dvbvideosink"); + g_free(name); + + if (use_get_decoder_time) + g_signal_emit_by_name(sink, "get-decoder-time", &pos); + + gst_object_unref(sink); + + if (!use_get_decoder_time && !gst_element_query_position(m_gst_playbin, &fmt, &pos)) { + eDebug("gst_element_query_position failed in getPlayPosition"); + return -1; + } + + /* pos is in nanoseconds. we have 90 000 pts per second. */ + pts = pos / 11111; return 0; } @@ -594,15 +633,16 @@ RESULT eServiceMP3::info(ePtr&i) RESULT eServiceMP3::getName(std::string &name) { - if (m_title.empty()) + std::string title = m_ref.getName(); + if (title.empty()) { - name = m_filename; + name = m_ref.path; size_t n = name.rfind('/'); if (n != std::string::npos) name = name.substr(n + 1); } else - name = m_title; + name = title; return 0; } @@ -613,6 +653,7 @@ int eServiceMP3::getInfo(int w) switch (w) { + case sServiceref: return m_ref; case sVideoHeight: return m_height; case sVideoWidth: return m_width; case sFrameRate: return m_framerate; @@ -862,10 +903,7 @@ PyObject *eServiceMP3::getInfoObject(int w) default: break; } - gdouble value; - if ( !tag || !m_stream_tags ) - value = 0.0; - PyObject *pyValue; + if ( isBuffer ) { const GValue *gv_buffer = gst_tag_list_get_value_index(m_stream_tags, tag, 0); @@ -873,16 +911,17 @@ PyObject *eServiceMP3::getInfoObject(int w) { GstBuffer *buffer; buffer = gst_value_get_buffer (gv_buffer); - pyValue = PyBuffer_FromMemory(GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer)); + return PyBuffer_FromMemory(GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer)); } } else { + gdouble value = 0.0; gst_tag_list_get_double(m_stream_tags, tag, &value); - pyValue = PyFloat_FromDouble(value); + return PyFloat_FromDouble(value); } - return pyValue; + return 0; } RESULT eServiceMP3::audioChannel(ePtr &ptr) @@ -910,16 +949,24 @@ int eServiceMP3::getNumberOfTracks() int eServiceMP3::getCurrentTrack() { + if (m_currentAudioStream == -1) + g_object_get (G_OBJECT (m_gst_playbin), "current-audio", &m_currentAudioStream, NULL); return m_currentAudioStream; } RESULT eServiceMP3::selectTrack(unsigned int i) { - int ret = selectAudioStream(i); - /* flush */ pts_t ppos; getPlayPosition(ppos); - seekTo(ppos); + ppos -= 90000; + if (ppos < 0) + ppos = 0; + + int ret = selectAudioStream(i); + if (!ret) { + /* flush */ + seekTo(ppos); + } return ret; } @@ -996,61 +1043,63 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) else eDebug("eServiceMP3::gst_message from %s: %s (without structure)", sourceName, GST_MESSAGE_TYPE_NAME(msg)); #endif - if ( GST_MESSAGE_TYPE (msg) == GST_MESSAGE_STATE_CHANGED ) + switch (GST_MESSAGE_TYPE (msg)) { - // only the pipeline message - if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin)) - return; - - GstState old_state, new_state; - gst_message_parse_state_changed(msg, &old_state, &new_state, NULL); - - if(old_state == new_state) - return; - - eDebug("eServiceMP3::state transition %s -> %s", gst_element_state_get_name(old_state), gst_element_state_get_name(new_state)); - - GstStateChange transition = (GstStateChange)GST_STATE_TRANSITION(old_state, new_state); - - switch(transition) + case GST_MESSAGE_EOS: + m_event((iPlayableService*)this, evEOF); + break; + case GST_MESSAGE_STATE_CHANGED: { - case GST_STATE_CHANGE_NULL_TO_READY: - { - } + if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin)) break; - case GST_STATE_CHANGE_READY_TO_PAUSED: - { - - } break; - case GST_STATE_CHANGE_PAUSED_TO_PLAYING: - { - } break; - case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - { + GstState old_state, new_state; + gst_message_parse_state_changed(msg, &old_state, &new_state, NULL); + + if(old_state == new_state) + break; - } break; - case GST_STATE_CHANGE_PAUSED_TO_READY: - { - - } break; - case GST_STATE_CHANGE_READY_TO_NULL: + eDebug("eServiceMP3::state transition %s -> %s", gst_element_state_get_name(old_state), gst_element_state_get_name(new_state)); + + GstStateChange transition = (GstStateChange)GST_STATE_TRANSITION(old_state, new_state); + + switch(transition) { - - } break; - } - } - - switch (GST_MESSAGE_TYPE (msg)) - { - case GST_MESSAGE_EOS: - m_event((iPlayableService*)this, evEOF); + case GST_STATE_CHANGE_NULL_TO_READY: + { + } break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + { + GstElement *sink; + g_object_get (G_OBJECT (m_gst_playbin), "text-sink", &sink, NULL); + if (sink) + { + g_object_set (G_OBJECT (sink), "max-buffers", 2, NULL); + g_object_set (G_OBJECT (sink), "sync", FALSE, NULL); + g_object_set (G_OBJECT (sink), "async", FALSE, NULL); + g_object_set (G_OBJECT (sink), "emit-signals", TRUE, NULL); + gst_object_unref(sink); + } + } break; + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + { + } break; + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: + { + } break; + case GST_STATE_CHANGE_PAUSED_TO_READY: + { + } break; + case GST_STATE_CHANGE_READY_TO_NULL: + { + } break; + } break; + } case GST_MESSAGE_ERROR: { gchar *debug; GError *err; - gst_message_parse_error (msg, &err, &debug); g_free (debug); eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName ); @@ -1106,13 +1155,15 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) eDebug("eServiceMP3::/tmp/.id3coverart %d bytes written ", ret); m_event((iPlayableService*)this, evUser+13); } - gst_tag_list_free(tags); m_event((iPlayableService*)this, evUpdatedInfo); break; } case GST_MESSAGE_ASYNC_DONE: { + if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin)) + break; + GstTagList *tags; gint i, active_idx, n_video = 0, n_audio = 0, n_text = 0; @@ -1122,6 +1173,9 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) eDebug("eServiceMP3::async-done - %d video, %d audio, %d subtitle", n_video, n_audio, n_text); + if ( n_video + n_audio <= 0 ) + stop(); + active_idx = 0; m_audioStreams.clear(); @@ -1137,9 +1191,8 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg) if (!caps) continue; GstStructure* str = gst_caps_get_structure(caps, 0); -gchar *g_type; -g_type = gst_structure_get_name(str); -eDebug("AUDIO STRUCT=%s", g_type); + const gchar *g_type = gst_structure_get_name(str); + eDebug("AUDIO STRUCT=%s", g_type); audio.type = gstCheckAudioPad(str); g_codec = g_strdup(g_type); g_lang = g_strdup_printf ("und"); @@ -1148,6 +1201,7 @@ eDebug("AUDIO STRUCT=%s", g_type); { gst_tag_list_get_string(tags, GST_TAG_AUDIO_CODEC, &g_codec); gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_lang); + gst_tag_list_free(tags); } audio.language_code = std::string(g_lang); audio.codec = std::string(g_codec); @@ -1155,6 +1209,7 @@ eDebug("AUDIO STRUCT=%s", g_type); m_audioStreams.push_back(audio); g_free (g_lang); g_free (g_codec); + gst_caps_unref(caps); } for (i = 0; i < n_text; i++) @@ -1219,6 +1274,14 @@ eDebug("AUDIO STRUCT=%s", g_type); } } } + break; + } + case GST_MESSAGE_BUFFERING: + { + GstBufferingMode mode; + gst_message_parse_buffering(msg, &(m_bufferInfo.bufferPercent)); + gst_message_parse_buffering_stats(msg, &mode, &(m_bufferInfo.avgInRate), &(m_bufferInfo.avgOutRate), &(m_bufferInfo.bufferingLeft)); + m_event((iPlayableService*)this, evBuffering); } default: break; @@ -1241,12 +1304,12 @@ audiotype_t eServiceMP3::gstCheckAudioPad(GstStructure* structure) if ( gst_structure_has_name (structure, "audio/mpeg")) { - gint mpegversion, layer = -1; + gint mpegversion, layer = -1; if (!gst_structure_get_int (structure, "mpegversion", &mpegversion)) return atUnknown; switch (mpegversion) { - case 1: + case 1: { gst_structure_get_int (structure, "layer", &layer); if ( layer == 3 ) @@ -1274,7 +1337,7 @@ audiotype_t eServiceMP3::gstCheckAudioPad(GstStructure* structure) return atUnknown; } -void eServiceMP3::gstPoll(const int&) +void eServiceMP3::gstPoll(const int &msg) { /* ok, we have a serious problem here. gstBusSyncHandler sends us the wakup signal, but likely before it was posted. @@ -1282,15 +1345,19 @@ void eServiceMP3::gstPoll(const int&) I need to understand the API a bit more to make this work proplerly. */ - usleep(1); - - GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (m_gst_playbin)); - GstMessage *message; - while ((message = gst_bus_pop (bus))) + if (msg == 1) { - gstBusCall(bus, message); - gst_message_unref (message); + GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (m_gst_playbin)); + GstMessage *message; + usleep(1); + while ((message = gst_bus_pop (bus))) + { + gstBusCall(bus, message); + gst_message_unref (message); + } } + else + pullSubtitle(); } eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::service+1, "eServiceFactoryMP3"); @@ -1298,62 +1365,96 @@ eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::servi void eServiceMP3::gstCBsubtitleAvail(GstElement *appsink, gpointer user_data) { eServiceMP3 *_this = (eServiceMP3*)user_data; - GstBuffer *buffer; - g_signal_emit_by_name (appsink, "pull-buffer", &buffer); - if (buffer) + eSingleLocker l(_this->m_subs_to_pull_lock); + ++_this->m_subs_to_pull; + _this->m_pump.send(2); +} + +void eServiceMP3::pullSubtitle() +{ + GstElement *sink; + g_object_get (G_OBJECT (m_gst_playbin), "text-sink", &sink, NULL); + if (sink) { - GstFormat fmt = GST_FORMAT_TIME; - gint64 buf_pos = GST_BUFFER_TIMESTAMP(buffer); - gint64 duration_ns = GST_BUFFER_DURATION(buffer); - size_t len = GST_BUFFER_SIZE(buffer); - unsigned char line[len+1]; - memcpy(line, GST_BUFFER_DATA(buffer), len); - line[len] = 0; -// eDebug("got new subtitle @ buf_pos = %lld ns (in pts=%lld): '%s' ", buf_pos, buf_pos/11111, line); - if ( _this->m_subtitle_widget ) + while (m_subs_to_pull && m_subtitle_pages.size() < 2) { - ePangoSubtitlePage page; - gRGB rgbcol(0xD0,0xD0,0xD0); - page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)line)); - page.show_pts = buf_pos / 11111L; - page.m_timeout = duration_ns / 1000000; - _this->m_subtitle_pages.push_back(page); - _this->pushSubtitles(); + GstBuffer *buffer; + { + eSingleLocker l(m_subs_to_pull_lock); + --m_subs_to_pull; + g_signal_emit_by_name (sink, "pull-buffer", &buffer); + } + if (buffer) + { + gint64 buf_pos = GST_BUFFER_TIMESTAMP(buffer); + gint64 duration_ns = GST_BUFFER_DURATION(buffer); + size_t len = GST_BUFFER_SIZE(buffer); + unsigned char line[len+1]; + memcpy(line, GST_BUFFER_DATA(buffer), len); + line[len] = 0; + eDebug("got new subtitle @ buf_pos = %lld ns (in pts=%lld): '%s' ", buf_pos, buf_pos/11111, line); + ePangoSubtitlePage page; + gRGB rgbcol(0xD0,0xD0,0xD0); + page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)line)); + page.show_pts = buf_pos / 11111L; + page.m_timeout = duration_ns / 1000000; + m_subtitle_pages.push_back(page); + pushSubtitles(); + gst_buffer_unref(buffer); + } } + gst_object_unref(sink); } + else + eDebug("no subtitle sink!"); } void eServiceMP3::pushSubtitles() { ePangoSubtitlePage page; - GstClockTime base_time; pts_t running_pts; - GstElement *syncsink; - g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &syncsink, NULL); - GstClock *clock; - clock = gst_element_get_clock (syncsink); while ( !m_subtitle_pages.empty() ) { + getPlayPosition(running_pts); page = m_subtitle_pages.front(); - - base_time = gst_element_get_base_time (syncsink); - running_pts = gst_clock_get_time (clock) / 11111L; gint64 diff_ms = ( page.show_pts - running_pts ) / 90; -// eDebug("eServiceMP3::pushSubtitles show_pts = %lld running_pts = %lld diff = %lld", page.show_pts, running_pts, diff_ms); - if ( diff_ms > 20 ) + eDebug("eServiceMP3::pushSubtitles show_pts = %lld running_pts = %lld diff = %lld", page.show_pts, running_pts, diff_ms); + if (diff_ms < -100) { -// eDebug("m_subtitle_sync_timer->start(%lld,1)", diff_ms); - m_subtitle_sync_timer->start(diff_ms, 1); + GstFormat fmt = GST_FORMAT_TIME; + gint64 now; + if (gst_element_query_position(m_gst_playbin, &fmt, &now) != -1) + { + now /= 11111; + diff_ms = abs((now - running_pts) / 90); + eDebug("diff < -100ms check decoder/pipeline diff: decoder: %lld, pipeline: %lld, diff: %lld", running_pts, now, diff_ms); + if (diff_ms > 100000) + { + eDebug("high decoder/pipeline difference.. assume decoder has now started yet.. check again in 1sec"); + m_subtitle_sync_timer->start(1000, true); + break; + } + } + else + eDebug("query position for decoder/pipeline check failed!"); + eDebug("subtitle to late... drop"); + m_subtitle_pages.pop_front(); + } + else if ( diff_ms > 20 ) + { +// eDebug("start recheck timer"); + m_subtitle_sync_timer->start(diff_ms > 1000 ? 1000 : diff_ms, true); break; } - else + else // immediate show { - m_subtitle_widget->setPage(page); + if (m_subtitle_widget) + m_subtitle_widget->setPage(page); m_subtitle_pages.pop_front(); } - } ; - - gst_object_unref (clock); + } + if (m_subtitle_pages.empty()) + pullSubtitle(); } RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple) @@ -1376,16 +1477,22 @@ RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple) goto error_out; type = PyInt_AsLong(entry); - g_object_set (G_OBJECT (m_gst_playbin), "current-text", pid, NULL); - m_currentSubtitleStream = pid; + if (m_currentSubtitleStream != pid) + { + eSingleLocker l(m_subs_to_pull_lock); + g_object_set (G_OBJECT (m_gst_playbin), "current-text", pid, NULL); + m_currentSubtitleStream = pid; + m_subs_to_pull = 0; + m_subtitle_pages.clear(); + } + m_subtitle_widget = 0; m_subtitle_widget = new eSubtitleWidget(parent); m_subtitle_widget->resize(parent->size()); /* full size */ g_object_get (G_OBJECT (m_gst_playbin), "current-text", &text_pid, NULL); eDebug ("eServiceMP3::switched to subtitle stream %i", text_pid); - m_subtitle_pages.clear(); return 0; @@ -1406,7 +1513,7 @@ RESULT eServiceMP3::disableSubtitles(eWidget *parent) PyObject *eServiceMP3::getCachedSubtitle() { - eDebug("eServiceMP3::getCachedSubtitle"); +// eDebug("eServiceMP3::getCachedSubtitle"); Py_RETURN_NONE; } @@ -1435,6 +1542,31 @@ PyObject *eServiceMP3::getSubtitleList() return l; } +RESULT eServiceMP3::streamed(ePtr &ptr) +{ + ptr = this; + return 0; +} + +PyObject *eServiceMP3::getBufferCharge() +{ + ePyObject tuple = PyTuple_New(5); + PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(m_bufferInfo.bufferPercent)); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(m_bufferInfo.avgInRate)); + PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(m_bufferInfo.avgOutRate)); + PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(m_bufferInfo.bufferingLeft)); + PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong(m_buffer_size)); + return tuple; +} + +int eServiceMP3::setBufferSize(int size) +{ + m_buffer_size = size; + g_object_set (G_OBJECT (m_gst_playbin), "buffer-size", m_buffer_size, NULL); + return 0; +} + + #else #warning gstreamer not available, not building media player #endif