diff options
| author | Jochen Dolze <vdr@dolze.de> | 2010-09-16 21:37:36 +0200 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2010-09-16 21:37:36 +0200 |
| commit | 57df9917d4626d93323c7b0d2368fbf5d4748627 (patch) | |
| tree | ebfe76fe280db47e223335266eab1bd34afa4226 /command/queue.cpp | |
| parent | 03fc6351fce571b5ff7454bdfad9d4a0f0fb7679 (diff) | |
| download | vdr-plugin-markad-57df9917d4626d93323c7b0d2368fbf5d4748627.tar.gz vdr-plugin-markad-57df9917d4626d93323c7b0d2368fbf5d4748627.tar.bz2 | |
Added second pass processing (overlap, audio silence detection)
Diffstat (limited to 'command/queue.cpp')
| -rw-r--r-- | command/queue.cpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/command/queue.cpp b/command/queue.cpp index 81c0287..4f4eaa0 100644 --- a/command/queue.cpp +++ b/command/queue.cpp @@ -361,32 +361,19 @@ uchar *cMarkAdPaketQueue::GetPacket(int *Size, int Type) *Size=0; if (Length()<4) return NULL; - if ((Type==MA_PACKET_H264) && (pktinfo.pktsyncsize>5) && (pktinfo.pkthdr!=-1)) - { - // ignore PES paket - pktinfo.pkthdr=-1; - outptr+=pktinfo.pktsyncsize; - } - if (pktinfo.pkthdr==-1) { scanner=0xFFFFFFFF; switch (Type) { case MA_PACKET_AC3: - pktinfo.pkthdr=FindAudioHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize, true); + pktinfo.pkthdr=FindAudioHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize,true); break; case MA_PACKET_MP2: - pktinfo.pkthdr=FindAudioHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize, false); + pktinfo.pkthdr=FindAudioHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize,false); break; case MA_PACKET_H264: pktinfo.pkthdr=FindPktHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize,true); - if (pktinfo.pktsyncsize>5) - { - // ignore PES paket - pktinfo.pkthdr=-1; - outptr+=pktinfo.pktsyncsize; - } break; default: pktinfo.pkthdr=FindPktHeader(0,&pktinfo.streamsize,&pktinfo.pktsyncsize,false); @@ -418,16 +405,16 @@ uchar *cMarkAdPaketQueue::GetPacket(int *Size, int Type) switch (Type) { case MA_PACKET_AC3: - pkthdr=FindAudioHeader(scannerstart,&streamsize,&pktsyncsize, true); + pkthdr=FindAudioHeader(scannerstart,&streamsize,&pktsyncsize,true); break; case MA_PACKET_MP2: - pkthdr=FindAudioHeader(scannerstart,&streamsize,&pktsyncsize, false); + pkthdr=FindAudioHeader(scannerstart,&streamsize,&pktsyncsize,false); break; case MA_PACKET_H264: - pkthdr=FindPktHeader(scannerstart,&streamsize,&pktsyncsize, true); + pkthdr=FindPktHeader(scannerstart,&streamsize,&pktsyncsize,true); break; default: - pkthdr=FindPktHeader(scannerstart,&streamsize,&pktsyncsize, false); + pkthdr=FindPktHeader(scannerstart,&streamsize,&pktsyncsize,false); break; } |