diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | patches/patch-set/0001-Record-teletext-subtitles.patch | 2 | ||||
| -rw-r--r-- | patches/patch-set/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch | 2 | ||||
| -rw-r--r-- | patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch | 2 | ||||
| -rw-r--r-- | patches/patch-set/0004-Decrypt-teletext-stream.patch | 26 | ||||
| -rw-r--r-- | patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch (renamed from patches/patch-set/0004-Capture-teletext-subtitle-pages-from-PMT.patch) | 4 | ||||
| -rw-r--r-- | patches/patch-set/0006-Ttxtsubs-plugin-hook.patch (renamed from patches/patch-set/0005-Ttxtsubs-plugin-hook.patch) | 4 | ||||
| -rw-r--r-- | patches/vdr-1.7.12-ttxtsubs.patch | 14 |
8 files changed, 48 insertions, 7 deletions
@@ -19,6 +19,7 @@ VDR Plugin 'ttxtsubs' Revision History - Position subtitles always centered at the bottom, independent of the OSD resolution and dropped custom text position settings (Closes #231) - Render subtitles outlined (Closes #51) +- Decrypt encrypted teletext stream (Closes #241) 2009-04-26: Version 0.1.0 - Updated VDR patch and plugin to VDR 1.7.6 with support for the TS recording diff --git a/patches/patch-set/0001-Record-teletext-subtitles.patch b/patches/patch-set/0001-Record-teletext-subtitles.patch index 05122c6..4272381 100644 --- a/patches/patch-set/0001-Record-teletext-subtitles.patch +++ b/patches/patch-set/0001-Record-teletext-subtitles.patch @@ -1,7 +1,7 @@ From 43914f1e49c368fbcc4d97e63e0e878de1238594 Mon Sep 17 00:00:00 2001 From: etobi <git@e-tobi.net> Date: Fri, 12 Feb 2010 21:55:04 +0100 -Subject: [PATCH 1/5] Record teletext subtitles +Subject: [PATCH 1/6] Record teletext subtitles --- channels.c | 7 +++++++ diff --git a/patches/patch-set/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch b/patches/patch-set/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch index 80cfac5..2c49115 100644 --- a/patches/patch-set/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch +++ b/patches/patch-set/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch @@ -1,7 +1,7 @@ From 53a2a588490c058bb2a907d00dad88927bec4618 Mon Sep 17 00:00:00 2001 From: etobi <git@e-tobi.net> Date: Sat, 13 Feb 2010 14:42:30 +0100 -Subject: [PATCH 2/5] Added setup option to enable teletext subtitle recording +Subject: [PATCH 2/6] Added setup option to enable teletext subtitle recording --- MANUAL | 3 +++ diff --git a/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch b/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch index 249185a..300282b 100644 --- a/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch +++ b/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch @@ -1,7 +1,7 @@ From f33ffd78393792ba23c4ee48b3543e182663dc97 Mon Sep 17 00:00:00 2001 From: etobi <git@e-tobi.net> Date: Fri, 12 Feb 2010 21:56:41 +0100 -Subject: [PATCH 3/5] Allow manual configuration of teletetxt subtitle pages in channels.conf +Subject: [PATCH 3/6] Allow manual configuration of teletetxt subtitle pages in channels.conf --- channels.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- diff --git a/patches/patch-set/0004-Decrypt-teletext-stream.patch b/patches/patch-set/0004-Decrypt-teletext-stream.patch new file mode 100644 index 0000000..7eb732f --- /dev/null +++ b/patches/patch-set/0004-Decrypt-teletext-stream.patch @@ -0,0 +1,26 @@ +From 047e1fc5c4e7f6b4b987f3d19dba963d60126d55 Mon Sep 17 00:00:00 2001 +From: etobi <git@e-tobi.net> +Date: Sun, 14 Feb 2010 01:30:34 +0100 +Subject: [PATCH 4/6] Decrypt teletext stream + +--- + ci.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/ci.c b/ci.c +index 6c7b031..f158a18 100644 +--- a/ci.c ++++ b/ci.c +@@ -1932,6 +1932,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel) + CaPmt.AddPid(*Apid, STREAM_TYPE_AUDIO); + for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++) + CaPmt.AddPid(*Dpid, STREAM_TYPE_DOLBY); ++ if (Channel->Tpid() && Setup.RecordTtxtSubtitles) { ++ CaPmt.AddPid(Channel->Tpid(), STREAM_TYPE_DOLBY); // FIXME: STREAM_TYPE_DOLBY should probably be renamed STREAM_TYPE_PRIVATE ++ } + cas->SendPMT(&CaPmt); + cTimeMs Timeout(QUERY_REPLY_TIMEOUT); + do { +-- +1.6.5 + diff --git a/patches/patch-set/0004-Capture-teletext-subtitle-pages-from-PMT.patch b/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch index 4424838..91b57c3 100644 --- a/patches/patch-set/0004-Capture-teletext-subtitle-pages-from-PMT.patch +++ b/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch @@ -1,7 +1,7 @@ -From a0823f9a5d13174c8942a4c7dff52e0270ad483e Mon Sep 17 00:00:00 2001 +From cd69cfb12c691834710beb346527920b8802552e Mon Sep 17 00:00:00 2001 From: etobi <git@e-tobi.net> Date: Fri, 12 Feb 2010 22:06:19 +0100 -Subject: [PATCH 4/5] Capture teletext subtitle pages from PMT +Subject: [PATCH 5/6] Capture teletext subtitle pages from PMT --- remux.c | 26 ++++++++++++++++++++++++++ diff --git a/patches/patch-set/0005-Ttxtsubs-plugin-hook.patch b/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch index b338345..59fb8c8 100644 --- a/patches/patch-set/0005-Ttxtsubs-plugin-hook.patch +++ b/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch @@ -1,7 +1,7 @@ -From 122be8fa91973f031586fdd2026585cb0510e19f Mon Sep 17 00:00:00 2001 +From 2432eec2b93648cf2b75155b6237293de91da1b6 Mon Sep 17 00:00:00 2001 From: etobi <git@e-tobi.net> Date: Sat, 13 Feb 2010 00:28:21 +0100 -Subject: [PATCH 5/5] Ttxtsubs plugin hook +Subject: [PATCH 6/6] Ttxtsubs plugin hook --- Makefile | 2 + diff --git a/patches/vdr-1.7.12-ttxtsubs.patch b/patches/vdr-1.7.12-ttxtsubs.patch index fb85ffb..113e14a 100644 --- a/patches/vdr-1.7.12-ttxtsubs.patch +++ b/patches/vdr-1.7.12-ttxtsubs.patch @@ -177,6 +177,20 @@ index b465f6a..1ddef40 100644 void SetCaIds(const int *CaIds); // list must be zero-terminated void SetCaDescriptors(int Level); void SetLinkChannels(cLinkChannels *LinkChannels); +diff --git a/ci.c b/ci.c +index 6c7b031..f158a18 100644 +--- a/ci.c ++++ b/ci.c +@@ -1932,6 +1932,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel) + CaPmt.AddPid(*Apid, STREAM_TYPE_AUDIO); + for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++) + CaPmt.AddPid(*Dpid, STREAM_TYPE_DOLBY); ++ if (Channel->Tpid() && Setup.RecordTtxtSubtitles) { ++ CaPmt.AddPid(Channel->Tpid(), STREAM_TYPE_DOLBY); // FIXME: STREAM_TYPE_DOLBY should probably be renamed STREAM_TYPE_PRIVATE ++ } + cas->SendPMT(&CaPmt); + cTimeMs Timeout(QUERY_REPLY_TIMEOUT); + do { diff --git a/config.c b/config.c index acdf4c4..4aaf720 100644 --- a/config.c |