From 5a45aa7c9494786d01ccb8d48ea647328f1d0523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= Date: Fri, 30 Sep 2011 14:18:27 +0200 Subject: [PATCH 1/3] Add teletext support for HTSP protocol --- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp index 2737f19..38ca397 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp @@ -284,6 +284,7 @@ void CDVDDemuxHTSP::SubscriptionStart (htsmsg_t *m) CDemuxStreamAudio* a; CDemuxStreamVideo* v; CDemuxStreamSubtitle* s; + CDemuxStreamTeletext* t; } st; CLog::Log(LOGDEBUG, "CDVDDemuxHTSP::SubscriptionStart - id: %d, type: %s", index, type); @@ -320,6 +321,9 @@ void CDVDDemuxHTSP::SubscriptionStart (htsmsg_t *m) } else if(!strcmp(type, "TEXTSUB")) { st.s = new CDemuxStreamSubtitle(); st.s->codec = CODEC_ID_TEXT; + } else if(!strcmp(type, "TELETEXT")) { + st.t = new CDemuxStreamTeletext(); + st.t->codec = CODEC_ID_DVB_TELETEXT; } else { continue; } -- 1.7.3.1 From 76075f53db7011246cd89ca81d663ffc757d09f2 Mon Sep 17 00:00:00 2001 From: Jernej Date: Sat, 1 Oct 2011 20:18:17 +0200 Subject: [PATCH 2/3] Enable teletext in tvheadend client --- xbmc/pvrclients/tvheadend/HTSPDemux.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xbmc/pvrclients/tvheadend/HTSPDemux.cpp b/xbmc/pvrclients/tvheadend/HTSPDemux.cpp index 230b574..34f0913 100644 --- a/xbmc/pvrclients/tvheadend/HTSPDemux.cpp +++ b/xbmc/pvrclients/tvheadend/HTSPDemux.cpp @@ -369,11 +369,11 @@ void CHTSPDemux::SubscriptionStart(htsmsg_t *m) m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_TEXT; HTSPSetDemuxStreamInfoLanguage(m_Streams.stream[m_Streams.iStreamCount], sub); } -// else if(!strcmp(type, "TELETEXT")) -// { -// m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; -// m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_TELETEXT; -// } + else if(!strcmp(type, "TELETEXT")) + { + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_TELETEXT; + } else { bValidStream = false; -- 1.7.3.1 From a5853130a1f633e25f63ba17dcb8695faa8b0aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= Date: Mon, 3 Oct 2011 12:58:07 +0200 Subject: [PATCH 3/3] Call OpenDefaultStreams() to enable teletext with DVDDemuxPVRClient --- xbmc/cores/dvdplayer/DVDPlayer.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 30e897e..e55c319 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -801,6 +801,7 @@ bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream) { m_SelectionStreams.Clear(STREAM_NONE, STREAM_SOURCE_DEMUX); m_SelectionStreams.Update(m_pInputStream, m_pDemuxer); + OpenDefaultStreams(); } return true; } -- 1.7.3.1