diff options
| -rw-r--r-- | lib/dvb/pmt.cpp | 4 | ||||
| -rw-r--r-- | lib/service/servicedvb.cpp | 44 | ||||
| -rw-r--r-- | lib/service/servicedvb.h | 2 |
3 files changed, 33 insertions, 17 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index dc427aa1..fb81fa4c 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -400,9 +400,9 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) case 0x56432d31: // == 'VC-1' { const AdditionalIdentificationInfoVector *vec = d->getAdditionalIdentificationInfo(); - if (vec->size() > 1 && (*vec)[1] == 0x01) // subdescriptor tag + if (vec->size() > 1 && (*vec)[0] == 0x01) // subdescriptor tag { - if ((*vec)[2] >= 0x90) // profile_level + if ((*vec)[1] >= 0x90) // profile_level video.type = videoStream::vtVC1; // advanced profile else video.type = videoStream::vtVC1_SM; // simple main diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index e62d7783..5166414f 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -920,7 +920,7 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_is_primary = 1; m_is_pvr = !m_reference.path.empty(); - m_timeshift_enabled = m_timeshift_active = 0; + m_timeshift_enabled = m_timeshift_active = 0, m_timeshift_changed = 0; m_skipmode = 0; CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent); @@ -2229,6 +2229,7 @@ void eDVBServicePlay::switchToLive() /* free the timeshift service handler, we need the resources */ m_service_handler_timeshift.free(); m_timeshift_active = 0; + m_timeshift_changed = 1; m_event((iPlayableService*)this, evSeekableStatusChanged); @@ -2251,6 +2252,7 @@ void eDVBServicePlay::switchToTimeshift() m_video_event_connection = 0; m_timeshift_active = 1; + m_timeshift_changed = 1; eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference; r.path = m_timeshift_file; @@ -2318,28 +2320,42 @@ void eDVBServicePlay::updateDecoder() if (!m_decoder) { h.getDecodeDemux(m_decode_demux); + if (m_timeshift_changed) + m_decoder = 0; if (m_decode_demux) { m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary); if (m_decoder) m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection); + if (m_is_primary) + { + ePyObject subs; + if (m_timeshift_changed) + subs = getCachedSubtitle(); + m_teletext_parser = new eDVBTeletextParser(m_decode_demux); + m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection); + m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux); + m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection); + if (subs) + { + int type = PyInt_AsLong(PyTuple_GET_ITEM(subs, 0)), + pid = PyInt_AsLong(PyTuple_GET_ITEM(subs, 1)), + comp_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 2)), // ttx page + anc_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 3)); // ttx magazine + if (type == 0) // dvb + m_subtitle_parser->start(pid, comp_page, anc_page); + else if (type == 1) // ttx + m_teletext_parser->setPageAndMagazine(comp_page, anc_page); + Py_DECREF(subs); + } + } } - if (m_decode_demux && m_is_primary) - { - m_teletext_parser = new eDVBTeletextParser(m_decode_demux); - m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection); - m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux); - m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection); - } else - { - m_teletext_parser = 0; - m_subtitle_parser = 0; - } - if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); } + m_timeshift_changed = 0; + if (m_decoder) { if (m_dvb_service) @@ -2703,7 +2719,7 @@ PyObject *eDVBServicePlay::getCachedSubtitle() PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(1)); // type teletext else PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(0)); // type dvb - PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((data&0xFFFF0000)>>16)); // pid + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(pid)); // pid PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong((data&0xFF00)>>8)); // composition_page / page PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(data&0xFF)); // ancillary_page / magazine return tuple; diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 6eba5064..b4d0f196 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -210,7 +210,7 @@ private: Signal2<void,iPlayableService*,int> m_event; /* pvr */ - int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active; + int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active, m_timeshift_changed; int m_first_program_info; std::string m_timeshift_file; |