diff options
Diffstat (limited to 'pat.c')
| -rw-r--r-- | pat.c | 64 |
1 files changed, 43 insertions, 21 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: pat.c 2.13 2010/06/13 11:12:12 kls Exp $ + * $Id: pat.c 2.15 2010/11/07 13:47:16 kls Exp $ */ #include "pat.h" @@ -456,29 +456,51 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length } } break; - case 0x81: // STREAMTYPE_USER_PRIVATE - if (Channel->IsAtsc()) { // ATSC AC-3 - char lang[MAXLANGCODE1] = { 0 }; - SI::Descriptor *d; - for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) { - switch (d->getDescriptorTag()) { - case SI::ISO639LanguageDescriptorTag: { - SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d; - strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1); - } - break; - default: ; - } - delete d; - } - if (NumDpids < MAXDPIDS) { - Dpids[NumDpids] = esPid; - Dtypes[NumDpids] = SI::AC3DescriptorTag; - strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1); - NumDpids++; + case 0x80 ... 0xFF: // STREAMTYPE_USER_PRIVATE + { + char lang[MAXLANGCODE1] = { 0 }; + bool IsAc3 = false; + 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; + // http://www.smpte-ra.org/mpegreg/mpegreg.html + switch (rd->getFormatIdentifier()) { + case 0x44434949: // 'DCII' aka. DigiCipher II + Vpid = esPid; + Ppid = pmt.getPCRPid(); + Vtype = 0x02; // DCII compression is based upon MPEG-2 + ProcessCaDescriptors = true; + break; + case 0x41432D33: // 'AC-3' + IsAc3 = true; + break; + default: + //printf("Format identifier: 0x08X\n", rd->getFormatIdentifier()); + break; + } + } + break; + case SI::ISO639LanguageDescriptorTag: { + SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d; + strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1); + } + break; + default: ; } + delete d; + } + if (IsAc3) { + if (NumDpids < MAXDPIDS) { + Dpids[NumDpids] = esPid; + Dtypes[NumDpids] = SI::AC3DescriptorTag; + strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1); + NumDpids++; + } ProcessCaDescriptors = true; } + } break; default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number()); } |