frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Additional fixes to cDolbyRepacker

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-03-20 13:18:15 +01:00
parent 5d17dc3fdc
commit fa512884b9
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
remux.c
View File

@ -11,7 +11,7 @@
* The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>, * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
* and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de. * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
* *
* $Id: remux.c 1.32 2005/03/13 12:02:15 kls Exp $ * $Id: remux.c 1.33 2005/03/20 13:18:15 kls Exp $
*/ */
#include "remux.h" #include "remux.h"
@ -59,8 +59,8 @@ private:
get_length, get_length,
output_packet output_packet
} state; } state;
void ResetPesHeader(void); void ResetPesHeader(bool ContinuationFrame = false);
void AppendSubStreamID(void); void AppendSubStreamID(bool ContinuationFrame = false);
bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite); bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite); bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
public: public:
@ -105,23 +105,26 @@ cDolbyRepacker::cDolbyRepacker(void)
Reset(); Reset();
} }
void cDolbyRepacker::AppendSubStreamID(void) void cDolbyRepacker::AppendSubStreamID(bool ContinuationFrame)
{ {
if (subStreamId) { if (subStreamId) {
pesHeader[pesHeaderLen++] = subStreamId; pesHeader[pesHeaderLen++] = subStreamId;
// number of ac3 frames "starting" in this packet (1 by design).
pesHeader[pesHeaderLen++] = 0x01;
// offset to start of first ac3 frame (0 means "no ac3 frame starting"
// so 1 (by design) addresses the first byte after the next two bytes).
pesHeader[pesHeaderLen++] = 0x00; pesHeader[pesHeaderLen++] = 0x00;
pesHeader[pesHeaderLen++] = 0x00; pesHeader[pesHeaderLen++] = (ContinuationFrame ? 0x00 : 0x01);
pesHeader[pesHeaderLen++] = 0x00;
} }
} }
void cDolbyRepacker::ResetPesHeader(void) void cDolbyRepacker::ResetPesHeader(bool ContinuationFrame)
{ {
pesHeader[6] = 0x80; pesHeader[6] = 0x80;
pesHeader[7] = 0x00; pesHeader[7] = 0x00;
pesHeader[8] = 0x00; pesHeader[8] = 0x00;
pesHeaderLen = 9; pesHeaderLen = 9;
AppendSubStreamID(); AppendSubStreamID(ContinuationFrame);
} }
void cDolbyRepacker::Reset(void) void cDolbyRepacker::Reset(void)
@ -327,8 +330,8 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
// start a new packet // start a new packet
if (!StartNewPacket(ResultBuffer, data, todo, done, bite)) if (!StartNewPacket(ResultBuffer, data, todo, done, bite))
return done; return done;
// prepare for next packet // prepare for next (continuation) packet
ResetPesHeader(); ResetPesHeader(state == output_packet);
} }
data += bite; data += bite;
done += bite; done += bite;