frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added handling of "ANSI/SCTE 57" descriptors

This commit is contained in:
Klaus Schmidinger 2011-04-17 13:48:20 +02:00
parent 31d80e527e
commit 71dacdce96
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1103,6 +1103,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for fixing the array size of Atypes in cPatFilter::Process() for fixing the array size of Atypes in cPatFilter::Process()
for adding support for "registration descriptor" to 'libsi' and using it in pat.c for adding support for "registration descriptor" to 'libsi' and using it in pat.c
for adding an include of VDR's 'Make.global' to libsi's Makefile for adding an include of VDR's 'Make.global' to libsi's Makefile
for adding handling of "ANSI/SCTE 57" descriptors
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

1
HISTORY
View File

@ -6603,3 +6603,4 @@ Video Disk Recorder Revision History
- Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks - Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
to Ville Skyttä). to Ville Skyttä).
- The Makefile now also installs the include files (thanks to Ville Skyttä). - The Makefile now also installs the include files (thanks to Ville Skyttä).
- Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg).

52
pat.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: pat.c 2.15 2010/11/07 13:47:16 kls Exp $ * $Id: pat.c 2.16 2011/04/17 13:45:25 kls Exp $
*/ */
#include "pat.h" #include "pat.h"
@ -456,7 +456,37 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
} }
} }
break; break;
case 0x80 ... 0xFF: // STREAMTYPE_USER_PRIVATE 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;
break;
case 0x81: // STREAMTYPE_USER_PRIVATE - ATSC A/53 AUDIO (ANSI/SCTE 57)
{
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++;
}
ProcessCaDescriptors = true;
}
break;
case 0x82 ... 0xFF: // STREAMTYPE_USER_PRIVATE
{ {
char lang[MAXLANGCODE1] = { 0 }; char lang[MAXLANGCODE1] = { 0 };
bool IsAc3 = false; bool IsAc3 = false;
@ -467,17 +497,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d; SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d;
// http://www.smpte-ra.org/mpegreg/mpegreg.html // http://www.smpte-ra.org/mpegreg/mpegreg.html
switch (rd->getFormatIdentifier()) { 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' case 0x41432D33: // 'AC-3'
IsAc3 = true; IsAc3 = true;
break; break;
default: default:
//printf("Format identifier: 0x08X\n", rd->getFormatIdentifier()); //printf("Format identifier: 0x%08X (pid: %d)\n", rd->getFormatIdentifier(), esPid);
break; break;
} }
} }
@ -493,11 +517,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
} }
if (IsAc3) { if (IsAc3) {
if (NumDpids < MAXDPIDS) { if (NumDpids < MAXDPIDS) {
Dpids[NumDpids] = esPid; Dpids[NumDpids] = esPid;
Dtypes[NumDpids] = SI::AC3DescriptorTag; Dtypes[NumDpids] = SI::AC3DescriptorTag;
strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1); strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
NumDpids++; NumDpids++;
} }
ProcessCaDescriptors = true; ProcessCaDescriptors = true;
} }
} }