summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dxr3audiodecoder.c2
-rw-r--r--dxr3demuxdevice.c46
-rw-r--r--dxr3pesframe.c26
-rw-r--r--dxr3pesframe.h20
4 files changed, 47 insertions, 47 deletions
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c
index 10b62a3..8de1ccc 100644
--- a/dxr3audiodecoder.c
+++ b/dxr3audiodecoder.c
@@ -287,7 +287,7 @@ void cDxr3AudioDecoder::DecodeAc3Dts(const uint8_t* pPes, const uint8_t* buf,
{
cDxr3PesFrame tempPes;
tempPes.ExtractNextFrame(pFrame->Data(), pFrame->Count());
- int pesHeaderLength = (int) (tempPes.GetEsStart() - tempPes.GetPesStart());
+ int pesHeaderLength = (int) (tempPes.GetPayload() - tempPes.GetPesStart());
uint8_t* pData = pFrame->Data() + pesHeaderLength + LPCM_HEADER_LENGTH;
for (int i = 0; i < pFrame->Count() - pesHeaderLength - LPCM_HEADER_LENGTH; i += 2)
diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index 8cc06d8..e60d2e4 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -246,7 +246,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
while (pesFrame.IsValid())
{
- if (pesFrame.GetEsLength() > (uint32_t) VIDEO_MAX_FRAME_SIZE)
+ if (pesFrame.GetPayloadLength() > (uint32_t) VIDEO_MAX_FRAME_SIZE)
{
throw (cDxr3PesFrame::PES_GENERAL_ERROR);
};
@@ -263,7 +263,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
{
/*
m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(),
- (int) (pesFrame.GetEsLength()));
+ (int) (pesFrame.GetPayloadLength()));
*/
if (m_demuxMode == DXR3_DEMUX_TRICK_MODE)
@@ -278,14 +278,14 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
bPlayedFrame = true;
m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
- m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(), (int) (pesFrame.GetEsLength()), m_ReUseFrame);
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
break;
case UNKNOWN_FRAME:
dsyslog("dxr3: demux: unknown frame");
if (bPlaySuc)
{
- m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(), (int) (pesFrame.GetEsLength()), m_ReUseFrame);
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
}
break;
@@ -293,7 +293,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
dsyslog("dxr3: demux: default frame");
if (bPlaySuc)
{
- m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(), (int) (pesFrame.GetOffset()), m_ReUseFrame);
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetOffset()), m_ReUseFrame);
}
bPlaySuc = false;
@@ -303,8 +303,8 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
}
else if (m_demuxMode == DXR3_DEMUX_VIDEO_ONLY_MODE)
{
- m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(),
- (int)(pesFrame.GetEsLength()));
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(),
+ (int)(pesFrame.GetPayloadLength()));
}
else if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED ||
m_synchState == DXR3_DEMUX_SYNCHED)
@@ -312,7 +312,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
while (!Poll(100));
- cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetEsStart(), (int) (pesFrame.GetEsLength()), pts, ftVideo);
+ cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), pts, ftVideo);
if (!pTempFrame) /* Push Timeout */
throw (cDxr3PesFrame::PES_GENERAL_ERROR);
@@ -341,7 +341,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
- cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetEsStart(), (int) (pesFrame.GetEsLength()), pts, ftVideo);
+ cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), pts, ftVideo);
if (!pTempFrame) /* Push Timeout */
throw (cDxr3PesFrame::PES_GENERAL_ERROR);
@@ -396,8 +396,8 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_aBuf.Start();
}
while(!Poll(100));
- m_aDecoder.Decode(pesFrame.GetEsStart(),
- (int) (pesFrame.GetEsLength()),
+ m_aDecoder.Decode(pesFrame.GetPayload(),
+ (int) (pesFrame.GetPayloadLength()),
pts, m_aBuf);
}
@@ -407,8 +407,8 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
{
aPts = pts;
- m_aDecoder.Decode(pesFrame.GetEsStart(),
- (int) (pesFrame.GetEsLength()),
+ m_aDecoder.Decode(pesFrame.GetPayload(),
+ (int) (pesFrame.GetPayloadLength()),
pts, m_aBuf);
if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED)
@@ -448,16 +448,16 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
m_synchState == DXR3_DEMUX_SYNCHED)
{
- m_aDecoder.DecodeLpcm(pesFrame.GetEsStart(),
- pesFrame.GetEsLength(), pts, m_aBuf);
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(), pts, m_aBuf);
}
else
{
if (pts)
{
aPts = pts;
- m_aDecoder.DecodeLpcm(pesFrame.GetEsStart(),
- pesFrame.GetEsLength(),
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(),
pts, m_aBuf);
if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED)
@@ -498,8 +498,8 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_synchState == DXR3_DEMUX_SYNCHED)
{
m_aDecoder.DecodeAc3Dts(pesFrame.GetPesStart(),
- pesFrame.GetEsStart(),
- pesFrame.GetEsLength(),
+ pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(),
pts, m_aBuf);
}
else
@@ -508,8 +508,8 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
{
aPts = pts;
m_aDecoder.DecodeAc3Dts(pesFrame.GetPesStart(),
- pesFrame.GetEsStart(),
- pesFrame.GetEsLength(),
+ pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(),
pts, m_aBuf);
if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED)
@@ -605,8 +605,8 @@ int cDxr3DemuxDevice::DemuxAudioPes(const uint8_t* buf, int length)
syncCounter++;
}
while (!m_aBuf.Poll(100));
- m_aDecoder.DecodeLpcm(pesFrame.GetEsStart(),
- pesFrame.GetEsLength(), 0, m_aBuf);
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(), 0, m_aBuf);
}
diff --git a/dxr3pesframe.c b/dxr3pesframe.c
index 4895cdf..366da47 100644
--- a/dxr3pesframe.c
+++ b/dxr3pesframe.c
@@ -57,17 +57,17 @@ bool cDxr3PesFrame::ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
{
if (pos + 9 + pesArray[pos + 8] < length)
{
- m_pEsStart = pBuf + pos + 9 + pesArray[pos + 8];
+ m_payload = pBuf + pos + 9 + pesArray[pos + 8];
if ((((int)pesArray[pos + 4]) * (int)256 + (int)pesArray[pos + 5]) > 0)
{
- m_esLength = ((int)pesArray[pos + 4]) *
+ m_payloadLength = ((int)pesArray[pos + 4]) *
(int)256 + (int)pesArray[pos + 5] + (int)6 -
(9 + (int)pesArray[pos + 8]);
- if (pos + 9 + pesArray[pos + 8] + m_esLength <= length)
+ if (pos + 9 + pesArray[pos + 8] + m_payloadLength <= length)
{
m_bValid = true;
- m_pNextStart = m_pEsStart + m_esLength;
- m_remainingLength = pBuf + length - (m_pEsStart + m_esLength);
+ m_pNextStart = m_payload + m_payloadLength;
+ m_remainingLength = pBuf + length - (m_payload + m_payloadLength);
if (pesArray[pos + 6] >> 6 == 2 &&
pesArray[pos + 7] >> 7 != 0)
{
@@ -75,7 +75,7 @@ bool cDxr3PesFrame::ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
}
if (m_pesDataType == PES_VIDEO_DATA)
{
- int retval = ExtractVideoData(pesArray.SubArray(pos + 9 + pesArray[pos + 8], m_esLength));
+ int retval = ExtractVideoData(pesArray.SubArray(pos + 9 + pesArray[pos + 8], m_payloadLength));
if (m_videoFrameType != UNKNOWN_FRAME && retval)
m_offset = retval + pos + 9 + pesArray[pos + 8];
}
@@ -86,8 +86,8 @@ bool cDxr3PesFrame::ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
else
{
uint32_t fpos = pos + 6;
- m_esLength = ((int)pesArray[pos + 4]) * (int)256 + (int)pesArray[pos + 5];
- if (length >= pos + 6 + m_esLength)
+ m_payloadLength = ((int)pesArray[pos + 4]) * (int)256 + (int)pesArray[pos + 5];
+ if (length >= pos + 6 + m_payloadLength)
{
while (pesArray[fpos] == 0xff)
++fpos; // skip stuffing bytes
@@ -110,14 +110,14 @@ bool cDxr3PesFrame::ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
++fpos;
}
- if (m_esLength) m_esLength = m_esLength - (fpos - pos - 6);
- m_pEsStart = pBuf + fpos;
- m_pNextStart = m_pEsStart + m_esLength;
- m_remainingLength = pBuf + length - (m_pEsStart + m_esLength);
+ if (m_payloadLength) m_payloadLength = m_payloadLength - (fpos - pos - 6);
+ m_payload = pBuf + fpos;
+ m_pNextStart = m_payload + m_payloadLength;
+ m_remainingLength = pBuf + length - (m_payload + m_payloadLength);
m_bValid = true;
if (m_pesDataType == PES_VIDEO_DATA)
{
- int retval = ExtractVideoData(pesArray.SubArray(fpos, m_esLength));
+ int retval = ExtractVideoData(pesArray.SubArray(fpos, m_payloadLength));
if (m_videoFrameType != UNKNOWN_FRAME && retval)
m_offset = 0;
}
diff --git a/dxr3pesframe.h b/dxr3pesframe.h
index c0f1202..9c68b89 100644
--- a/dxr3pesframe.h
+++ b/dxr3pesframe.h
@@ -105,8 +105,8 @@ public:
m_pesDataType(PES_UNKNOWN_DATA),
m_bValid(false),
m_pPesStart(0),
- m_pEsStart(0),
- m_esLength(0),
+ m_payload(0),
+ m_payloadLength(0),
m_pts(0),
m_videoFrameType(UNKNOWN_FRAME),
m_aspectRatio(m_staticAspectRatio),
@@ -133,16 +133,16 @@ public:
return m_pPesStart;
}
- const uint8_t* GetEsStart() const
+ const uint8_t* GetPayload() const
{
assert(m_bValid);
- return m_pEsStart;
+ return m_payload;
}
- uint32_t GetEsLength() const
+ uint32_t GetPayloadLength() const
{
assert(m_bValid);
- return m_esLength;
+ return m_payloadLength;
}
const uint8_t* GetNextStart() const
@@ -213,8 +213,8 @@ protected:
m_pesDataType = PES_UNKNOWN_DATA;
m_bValid = false;
m_pPesStart = 0;
- m_pEsStart = 0;
- m_esLength = 0;
+ m_payload = 0;
+ m_payloadLength = 0;
m_pts = 0;
m_videoFrameType = UNKNOWN_FRAME;
m_aspectRatio = m_staticAspectRatio;
@@ -228,8 +228,8 @@ protected:
ePesDataType m_pesDataType;
bool m_bValid;
const uint8_t* m_pPesStart;
- const uint8_t* m_pEsStart;
- uint32_t m_esLength;
+ const uint8_t* m_payload;
+ uint32_t m_payloadLength;
uint32_t m_pts;
eVideoFrameType m_videoFrameType;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 02:32:12 +0000