# HG changeset patch # User nicodvb # Date 1119705927 0 # Node ID 488f31bd127e49f7b9e64db9303a21b701021829 # Parent 9d05b304f0384c0e174738ba57b93a508f0467f5 support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott diff -r 9d05b304f038 -r 488f31bd127e libmpdemux/demux_mpg.c --- a/libmpdemux/demux_mpg.c Fri Jun 24 21:02:36 2005 +0000 +++ b/libmpdemux/demux_mpg.c Sat Jun 25 13:25:27 2005 +0000 @@ -262,8 +262,22 @@ //============== DVD Audio sub-stream ====================== if(id==0x1BD){ - int aid=stream_read_char(demux->stream);--len; - if(len<3) return -1; // invalid audio packet + int aid, rawa52 = 0; + off_t tmppos; + unsigned int tmp; + + tmppos = stream_tell(demux->stream); + tmp = stream_read_word(demux->stream); + stream_seek(demux->stream, tmppos); + /// vdr stores A52 without the 4 header bytes, so we have to check this condition first + if(tmp == 0x0B77) { + aid = 128; + rawa52 = 1; + } + else { + aid=stream_read_char(demux->stream);--len; + if(len<3) return -1; // invalid audio packet + } // AID: // 0x20..0x3F subtitle @@ -293,11 +307,13 @@ ds=demux->audio; if(!ds->sh) ds->sh=demux->a_streams[aid]; // READ Packet: Skip additional audio header data: + if(!rawa52) { c=stream_read_char(demux->stream);//num of frames type=stream_read_char(demux->stream);//startpos hi type=(type<<8)|stream_read_char(demux->stream);//startpos lo // printf("\r[%02X][%04X]",c,type); len-=3; + } if((aid&0xE0)==0xA0 && len>=3){ unsigned char* hdr; // save audio header as codecdata!