Since AFCOffset uses a strange off index value it should be moved to TSPacket From: Erik Hovland instead of TSHeader --- libs/libmythtv/mpeg/tspacket.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libmythtv/mpeg/tspacket.h b/libs/libmythtv/mpeg/tspacket.h index 4d10c02..3e87609 100644 --- a/libs/libmythtv/mpeg/tspacket.h +++ b/libs/libmythtv/mpeg/tspacket.h @@ -74,10 +74,6 @@ class TSHeader { bool HasAdaptationField() const { return bool(_tsdata[3] & 0x20); } bool HasPayload() const { return bool(_tsdata[3] & 0x10); } - unsigned int AFCOffset() const { // only works if AFC fits in TSPacket - return HasAdaptationField() ? _tsdata[4]+1+4 : 4; - } - void SetTransportError(bool err) { if (err) _tsdata[1] |= 0x80; else _tsdata[1] &= (0xff-(0x80)); } @@ -141,6 +137,10 @@ class TSPacket : public TSHeader memcpy(_tspayload, payload, PAYLOAD_SIZE); } + unsigned int AFCOffset() const { // only works if AFC fits in TSPacket + return HasAdaptationField() ? _tspayload[0]+1+4 : 4; + } + //4.0 8 bits, iff payloadStart(), points to start of field unsigned int StartOfFieldPointer() const { return data()[AFCOffset()]; } void SetStartOfFieldPointer(uint sof) { data()[AFCOffset()] = sof; }