From patchwork Mon Apr 9 15:57:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Schmidinger X-Patchwork-Id: 12941 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SHGy7-000157-Cl for vdr@linuxtv.org; Mon, 09 Apr 2012 17:57:27 +0200 X-tubIT-Incoming-IP: 188.40.50.18 Received: from racoon.tvdr.de ([188.40.50.18]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtps [TLSv1:AES256-SHA:256] for id 1SHGy6-0006Ry-CU; Mon, 09 Apr 2012 17:57:27 +0200 Received: from dolphin.tvdr.de (dolphin.tvdr.de [192.168.100.2]) by racoon.tvdr.de (8.14.3/8.14.3) with ESMTP id q39FvxZm008988 for ; Mon, 9 Apr 2012 17:58:00 +0200 Received: from [192.168.100.10] (hawk.tvdr.de [192.168.100.10]) by dolphin.tvdr.de (8.14.4/8.14.4) with ESMTP id q39FvKbm031888 for ; Mon, 9 Apr 2012 17:57:20 +0200 Message-ID: <4F8306E0.3090108@tvdr.de> Date: Mon, 09 Apr 2012 17:57:20 +0200 From: Klaus Schmidinger User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.27) Gecko/20120215 SUSE/3.1.19 Thunderbird/3.1.19 MIME-Version: 1.0 To: vdr@linuxtv.org References: <201204081838.46069.pboettcher@kernellabs.com> <4F82AE8B.4090401@tvdr.de> <201204091749.07760.pboettcher@kernellabs.com> In-Reply-To: <201204091749.07760.pboettcher@kernellabs.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (racoon.tvdr.de [188.40.50.18]); Mon, 09 Apr 2012 17:58:00 +0200 (CEST) X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.9.154514 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, RDNS_NONE=0.793 autolearn=no Subject: Re: [vdr] Bug in pat.c (VDR 1.7.27) - possible fix attached X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 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: Mon, 09 Apr 2012 15:57:27 -0000 Status: O X-Status: X-Keywords: X-UID: 26067 On 09.04.2012 17:49, Patrick Boettcher wrote: > On Monday 09 April 2012 13:39:36 Dominic Evans wrote: >> On 9 April 2012 10:40, Klaus Schmidinger > wrote: >>> + // >>> http://www.smpte-ra.org/mpegreg/mpegreg.html + >>> ... >>> + case 0x44434949: // STREAMTYPE_USER_PRIVATE >>> - DigiCipher II VIDEO (ANSI/SCTE 57) >>> >>> There is no entry for 44-43-49-49 on the given page. > > It wasn't me who added this stream-type check, I just re-applied the checks > how they were done before. No big deal, I was just wondering. I have adopted your patch in the attached form. Maybe you (and/or Rolf) would like to verify it. Klaus --- pat.c 2012/03/02 10:56:45 2.17 +++ pat.c 2012/04/09 11:49:39 2.18 @@ -456,11 +456,28 @@ } } break; - case 0x80: // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57) - Vpid = esPid; - Ppid = pmt.getPCRPid(); - Vtype = 0x02; // compression based upon MPEG-2 - ProcessCaDescriptors = true; + // see http://www.smpte-ra.org/mpegreg/mpegreg.html for the codes used below + case 0x80: { // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57) + SI::Descriptor *d; + for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) { + switch (d->getDescriptorTag()) { + case SI::RegistrationDescriptorTag: { + SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d; + switch (rd->getFormatIdentifier()) { + case 0x44434949: // 'DCII' aka. DigiCipher II + Vpid = esPid; + Ppid = pmt.getPCRPid(); + Vtype = 0x02; // compression based upon MPEG-2 + ProcessCaDescriptors = true; + break; + default: ; + } + } + break; + default: ; + } + } + } break; case 0x81: // STREAMTYPE_USER_PRIVATE - ATSC A/53 AUDIO (ANSI/SCTE 57) { @@ -495,7 +512,6 @@ switch (d->getDescriptorTag()) { case SI::RegistrationDescriptorTag: { SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d; - // http://www.smpte-ra.org/mpegreg/mpegreg.html switch (rd->getFormatIdentifier()) { case 0x41432D33: // 'AC-3' IsAc3 = true;