From patchwork Thu Sep 9 13:30:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: michael_kaplan@inode.at X-Patchwork-Id: 12828 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1OthFz-0000YH-GV for vdr@linuxtv.org; Thu, 09 Sep 2010 15:33:40 +0200 X-tubIT-Incoming-IP: 213.47.214.141 Received: from webmail.inode.at ([213.47.214.141]) by mail.tu-berlin.de (exim-4.69/mailfrontend-c) with esmtp for id 1OthFz-0004Y7-3i; Thu, 09 Sep 2010 15:33:39 +0200 Received: from [127.0.0.1] (helo=inode.at) by webmail with smtp (Exim 4.67) (envelope-from ) id 1OthDD-00075q-Km for vdr@linuxtv.org; Thu, 09 Sep 2010 15:30:47 +0200 Received: from 213.164.21.2 (SquirrelMail authenticated user michael_kaplan@inode.at) by webmail.inode.at with HTTP; Thu, 9 Sep 2010 15:30:47 +0200 (CEST) Message-ID: <213.164.21.2.1284039047.wm@webmail.inode.at> Date: Thu, 9 Sep 2010 15:30:47 +0200 (CEST) From: To: X-Priority: 3 Importance: Normal X-Mailer: SquirrelMail (version 1.2.8) MIME-Version: 1.0 X-tubIT-Score: 0.0 () X-PMX-Version: 5.5.4.371499, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2010.9.9.132414 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_REAL_NAME 0, WEBMAIL_SOURCE 0, WEBMAIL_XMAILER 0, __CP_MEDIA_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_PRIORITY 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0' X-LSpam-Score: -3.6 (---) X-LSpam-Report: No, score=-3.6 required=5.0 tests=BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Subject: [vdr] patch for crypted teletext pids X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2010 13:33:40 -0000 Status: O X-Status: X-Keywords: X-UID: 23503 Hi! I have had a problem watching the teletext on the crypted channels "ORF1 HD" and "ORF2 HD" ... after doing some research on the web, i found out that these two channels not only crypt their audio and video streams, but also the teletext. (as far as I know, not even Sky/Premiere crypt their teletext) So I had a look into the vdr code, and found out, that in ci.c in the function AddChannels(), only video and audio pids are added to the cam device. I made a small patch (which is included in this mail), which also adds the teletext pid in case there was a tpid detected before, and now I can watch the teletext in the ORF HD channels. Other channels, which do only crypt audio+video, but not the teletext, should not be affected by this patch, because the CAM module should be intelligent enough to detect whether a ts packet is crypted or not (via the two scrambling control bits in the ts packet header) I wanted to ask, if it would be possible and reasonable to add this patch to the vanilla-vdr. Kind regards, Michael Kaplan *** ci.c 2010-01-02 11:39:50.000000000 +0100 --- ci.c.patched 2010-09-09 15:10:54.000000000 +0200 *************** *** 1911,1916 **** --- 1911,1919 ---- AddPid(Channel->Sid(), *Apid, STREAM_TYPE_AUDIO); for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++) AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_DOLBY); + if (Channel->Tpid()) { + AddPid(Channel->Sid(), Channel->Tpid(), STREAM_TYPE_DOLBY); + } } }