summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dxr3demuxdevice.c430
-rw-r--r--dxr3pesframe.h5
2 files changed, 210 insertions, 225 deletions
diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index 741ccfd..db8b484 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -244,71 +244,107 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
pesFrame.ExtractNextFrame(buf, length);
- while (pesFrame.IsValid()) {
- if (pesFrame.GetPayloadLength() > (uint32_t) VIDEO_MAX_FRAME_SIZE) {
- throw (cDxr3PesFrame::PES_GENERAL_ERROR);
- };
- if (pesFrame.GetPts() != lastPts) {
- pts = lastPts = pesFrame.GetPts();
- } else {
- pts = 0;
- }
+ if (!pesFrame.IsValid()) {
+ return -1;
+ }
- if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_VIDEO_DATA) {
- /*
- m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(),
- (int) (pesFrame.GetPayloadLength()));
- */
-
- if (m_demuxMode == DXR3_DEMUX_TRICK_MODE) {
- switch (pesFrame.GetFrameType()) {
- case I_FRAME:
- dsyslog("dxr3: demux: I-frame");
- m_dxr3Device.SingleStep();
- bPlaySuc = true;
- //if (bPlayedFrame) return length;
- bPlayedFrame = true;
- m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
- m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
- m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
- break;
+ if (pesFrame.GetPayloadLength() > (uint32_t) VIDEO_MAX_FRAME_SIZE) {
+ throw (cDxr3PesFrame::PES_GENERAL_ERROR);
+ };
+ if (pesFrame.GetPts() != lastPts) {
+ pts = lastPts = pesFrame.GetPts();
+ } else {
+ pts = 0;
+ }
- case UNKNOWN_FRAME:
- dsyslog("dxr3: demux: unknown frame");
- if (bPlaySuc) {
- m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
- }
- break;
+ if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_VIDEO_DATA) {
+ /*
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetEsStart(),
+ (int) (pesFrame.GetPayloadLength()));
+ */
+
+ if (m_demuxMode == DXR3_DEMUX_TRICK_MODE) {
+ switch (pesFrame.GetFrameType()) {
+ case I_FRAME:
+ dsyslog("dxr3: demux: I-frame");
+ m_dxr3Device.SingleStep();
+ bPlaySuc = true;
+ //if (bPlayedFrame) return length;
+ bPlayedFrame = true;
+ m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
+ m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
+ break;
- default:
- dsyslog("dxr3: demux: default frame");
- if (bPlaySuc) {
- m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetOffset()), m_ReUseFrame);
- }
+ case UNKNOWN_FRAME:
+ dsyslog("dxr3: demux: unknown frame");
+ if (bPlaySuc) {
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), m_ReUseFrame);
+ }
+ break;
- bPlaySuc = false;
- break;
+ default:
+ dsyslog("dxr3: demux: default frame");
+ if (bPlaySuc) {
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int) (pesFrame.GetOffset()), m_ReUseFrame);
}
- } else if (m_demuxMode == DXR3_DEMUX_VIDEO_ONLY_MODE) {
- m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int)(pesFrame.GetPayloadLength()));
+ bPlaySuc = false;
+ break;
+ }
+
+ } else if (m_demuxMode == DXR3_DEMUX_VIDEO_ONLY_MODE) {
+ m_dxr3Device.PlayVideoFrame(pesFrame.GetPayload(), (int)(pesFrame.GetPayloadLength()));
+
+ } else if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED ||
+ m_synchState == DXR3_DEMUX_SYNCHED) {
+ m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
+ m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
+ while (!Poll(100));
+ cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), pts, ftVideo);
+ if (!pTempFrame) /* Push Timeout */
+ throw (cDxr3PesFrame::PES_GENERAL_ERROR);
+
+ pTempFrame->SetAspectRatio(pesFrame.GetAspectRatio());
+
+ m_aBuf.WakeUp();
+
+ if (m_vBuf.GetFillLevel() > 5 && m_synchState != DXR3_DEMUX_SYNCHED) {
+ m_synchState = DXR3_DEMUX_SYNCHED;
+ pcr = vPts - PRE_BUFFER_LENGTH;
+ m_dxr3Device.SetSysClock(pcr);
+ m_dxr3Device.SetPlayMode();
+ m_dxr3Device.EnableVideo();
+ m_dxr3Device.EnableAudio();
+ m_vBuf.Start();
+ m_aBuf.Start();
+ }
+ } else {
+ if (pesFrame.GetFrameType() == I_FRAME) {
+ vPts = pts;
- } else if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED ||
- m_synchState == DXR3_DEMUX_SYNCHED) {
m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
- while (!Poll(100));
cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), pts, ftVideo);
if (!pTempFrame) /* Push Timeout */
throw (cDxr3PesFrame::PES_GENERAL_ERROR);
pTempFrame->SetAspectRatio(pesFrame.GetAspectRatio());
- m_aBuf.WakeUp();
-
- if (m_vBuf.GetFillLevel() > 5 && m_synchState != DXR3_DEMUX_SYNCHED) {
+ if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED) {
m_synchState = DXR3_DEMUX_SYNCHED;
- pcr = vPts - PRE_BUFFER_LENGTH;
+ } else {
+ m_synchState = DXR3_DEMUX_VIDEO_SYNCHED;
+ }
+ if (m_synchState == DXR3_DEMUX_SYNCHED) {
+ if (!vPts) {
+ vPts = aPts;
+ }
+ if (aPts < vPts) {
+ pcr = aPts - PRE_BUFFER_LENGTH;
+ } else {
+ pcr = vPts - PRE_BUFFER_LENGTH;
+ }
m_dxr3Device.SetSysClock(pcr);
m_dxr3Device.SetPlayMode();
m_dxr3Device.EnableVideo();
@@ -316,50 +352,51 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_vBuf.Start();
m_aBuf.Start();
}
- } else {
- if (pesFrame.GetFrameType() == I_FRAME) {
- vPts = pts;
+ }
+ }
- m_dxr3Device.SetHorizontalSize(pesFrame.GetHorizontalSize());
- m_dxr3Device.SetVerticalSize(pesFrame.GetVerticalSize());
- cFixedLengthFrame* pTempFrame = m_vBuf.Push(pesFrame.GetPayload(), (int) (pesFrame.GetPayloadLength()), pts, ftVideo);
- if (!pTempFrame) /* Push Timeout */
- throw (cDxr3PesFrame::PES_GENERAL_ERROR);
+ } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_AUDIO_DATA
+ && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
+ && !cDxr3Interface::Instance().IsAudioModeAC3()) {
+ if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
+ m_synchState == DXR3_DEMUX_SYNCHED) {
+ if (pts && m_synchState != DXR3_DEMUX_SYNCHED) {
+ m_synchState = DXR3_DEMUX_SYNCHED;
+ pcr = aPts - PRE_BUFFER_LENGTH;
+ m_dxr3Device.SetSysClock(pcr);
+ m_dxr3Device.SetPlayMode();
+ m_dxr3Device.EnableVideo();
+ m_dxr3Device.EnableAudio();
+ m_vBuf.Start();
+ m_aBuf.Start();
+ }
+ while(!Poll(100));
+ m_aDecoder.Decode(pesFrame.GetPayload(),
+ (int) (pesFrame.GetPayloadLength()),
+ pts, m_aBuf);
- pTempFrame->SetAspectRatio(pesFrame.GetAspectRatio());
+ } else {
+ if (pts) {
+ aPts = pts;
- if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED) {
- m_synchState = DXR3_DEMUX_SYNCHED;
- } else {
- m_synchState = DXR3_DEMUX_VIDEO_SYNCHED;
- }
- if (m_synchState == DXR3_DEMUX_SYNCHED) {
- if (!vPts) {
- vPts = aPts;
- }
- if (aPts < vPts) {
- pcr = aPts - PRE_BUFFER_LENGTH;
- } else {
- pcr = vPts - PRE_BUFFER_LENGTH;
- }
- m_dxr3Device.SetSysClock(pcr);
- m_dxr3Device.SetPlayMode();
- m_dxr3Device.EnableVideo();
- m_dxr3Device.EnableAudio();
- m_vBuf.Start();
- m_aBuf.Start();
- }
- }
- }
+ m_aDecoder.Decode(pesFrame.GetPayload(),
+ (int) (pesFrame.GetPayloadLength()),
+ pts, m_aBuf);
- } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_AUDIO_DATA
- && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
- && !cDxr3Interface::Instance().IsAudioModeAC3()) {
- if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
- m_synchState == DXR3_DEMUX_SYNCHED) {
- if (pts && m_synchState != DXR3_DEMUX_SYNCHED) {
+ if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
m_synchState = DXR3_DEMUX_SYNCHED;
- pcr = aPts - PRE_BUFFER_LENGTH;
+ } else {
+ m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
+ }
+ if (m_synchState == DXR3_DEMUX_SYNCHED) {
+ if (!vPts) {
+ vPts = aPts;
+ }
+ if (aPts < vPts) {
+ pcr = aPts - PRE_BUFFER_LENGTH;
+ } else {
+ pcr = vPts - PRE_BUFFER_LENGTH;
+ }
m_dxr3Device.SetSysClock(pcr);
m_dxr3Device.SetPlayMode();
m_dxr3Device.EnableVideo();
@@ -367,132 +404,89 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
m_vBuf.Start();
m_aBuf.Start();
}
- while(!Poll(100));
- m_aDecoder.Decode(pesFrame.GetPayload(),
- (int) (pesFrame.GetPayloadLength()),
- pts, m_aBuf);
-
- } else {
- if (pts) {
- aPts = pts;
-
- m_aDecoder.Decode(pesFrame.GetPayload(),
- (int) (pesFrame.GetPayloadLength()),
+ }
+ }
+ } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA
+ && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
+ && !cDxr3Interface::Instance().IsAudioModeAC3()
+ && !bAc3Dts) {
+ if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
+ m_synchState == DXR3_DEMUX_SYNCHED) {
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(), pts, m_aBuf);
+ } else {
+ if (pts) {
+ aPts = pts;
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(),
pts, m_aBuf);
- if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
- m_synchState = DXR3_DEMUX_SYNCHED;
- } else {
- m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
- }
- if (m_synchState == DXR3_DEMUX_SYNCHED) {
- if (!vPts) {
- vPts = aPts;
- }
- if (aPts < vPts) {
- pcr = aPts - PRE_BUFFER_LENGTH;
- } else {
- pcr = vPts - PRE_BUFFER_LENGTH;
- }
- m_dxr3Device.SetSysClock(pcr);
- m_dxr3Device.SetPlayMode();
- m_dxr3Device.EnableVideo();
- m_dxr3Device.EnableAudio();
- m_vBuf.Start();
- m_aBuf.Start();
- }
+ if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
+ m_synchState = DXR3_DEMUX_SYNCHED;
+ } else {
+ m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
}
- }
- } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA
- && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
- && !cDxr3Interface::Instance().IsAudioModeAC3()
- && !bAc3Dts) {
- if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
- m_synchState == DXR3_DEMUX_SYNCHED) {
- m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
- pesFrame.GetPayloadLength(), pts, m_aBuf);
- } else {
- if (pts) {
- aPts = pts;
- m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
- pesFrame.GetPayloadLength(),
- pts, m_aBuf);
-
- if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
- m_synchState = DXR3_DEMUX_SYNCHED;
- } else {
- m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
+ if (m_synchState == DXR3_DEMUX_SYNCHED) {
+ if (!vPts) {
+ vPts = aPts;
}
- if (m_synchState == DXR3_DEMUX_SYNCHED) {
- if (!vPts) {
- vPts = aPts;
- }
- if (aPts < vPts) {
- pcr = aPts - PRE_BUFFER_LENGTH;
- } else {
- pcr = vPts - PRE_BUFFER_LENGTH;
- }
- m_dxr3Device.SetSysClock(pcr);
- m_dxr3Device.SetPlayMode();
- m_dxr3Device.EnableVideo();
- m_dxr3Device.EnableAudio();
- m_vBuf.Start();
- m_aBuf.Start();
+ if (aPts < vPts) {
+ pcr = aPts - PRE_BUFFER_LENGTH;
+ } else {
+ pcr = vPts - PRE_BUFFER_LENGTH;
}
+ m_dxr3Device.SetSysClock(pcr);
+ m_dxr3Device.SetPlayMode();
+ m_dxr3Device.EnableVideo();
+ m_dxr3Device.EnableAudio();
+ m_vBuf.Start();
+ m_aBuf.Start();
}
}
- } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA
- && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
- && cDxr3Interface::Instance().IsAudioModeAC3()
- && bAc3Dts) {
- if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
- m_synchState == DXR3_DEMUX_SYNCHED) {
+ }
+ } else if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA
+ && m_demuxMode != DXR3_DEMUX_VIDEO_ONLY_MODE
+ && cDxr3Interface::Instance().IsAudioModeAC3()
+ && bAc3Dts) {
+ if (m_synchState == DXR3_DEMUX_AUDIO_SYNCHED ||
+ m_synchState == DXR3_DEMUX_SYNCHED) {
+ m_aDecoder.DecodeAc3Dts(pesFrame.GetPesStart(),
+ pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(),
+ pts, m_aBuf);
+ } else {
+ if (pts) {
+ aPts = pts;
m_aDecoder.DecodeAc3Dts(pesFrame.GetPesStart(),
pesFrame.GetPayload(),
pesFrame.GetPayloadLength(),
pts, m_aBuf);
- } else {
- if (pts) {
- aPts = pts;
- m_aDecoder.DecodeAc3Dts(pesFrame.GetPesStart(),
- pesFrame.GetPayload(),
- pesFrame.GetPayloadLength(),
- pts, m_aBuf);
-
- if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
- m_synchState = DXR3_DEMUX_SYNCHED;
- } else {
- m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
+
+ if (m_synchState == DXR3_DEMUX_VIDEO_SYNCHED) {
+ m_synchState = DXR3_DEMUX_SYNCHED;
+ } else {
+ m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
+ }
+ if (m_synchState == DXR3_DEMUX_SYNCHED) {
+ if (!vPts) {
+ vPts = aPts;
}
- if (m_synchState == DXR3_DEMUX_SYNCHED) {
- if (!vPts) {
- vPts = aPts;
- }
- if (aPts < vPts) {
- pcr = aPts - PRE_BUFFER_LENGTH;
- } else {
- pcr = vPts - PRE_BUFFER_LENGTH;
- }
- m_dxr3Device.SetSysClock(pcr);
- m_dxr3Device.SetPlayMode();
- m_dxr3Device.EnableVideo();
- m_dxr3Device.EnableAudio();
- m_vBuf.Start();
- m_aBuf.Start();
+ if (aPts < vPts) {
+ pcr = aPts - PRE_BUFFER_LENGTH;
+ } else {
+ pcr = vPts - PRE_BUFFER_LENGTH;
}
+ m_dxr3Device.SetSysClock(pcr);
+ m_dxr3Device.SetPlayMode();
+ m_dxr3Device.EnableVideo();
+ m_dxr3Device.EnableAudio();
+ m_vBuf.Start();
+ m_aBuf.Start();
}
}
-
- }
-
- if (pesFrame.IsValid()) {
- pesFrame.ExtractNextFrame(pesFrame.GetNextStart(),
- pesFrame.GetRemainingLength());
}
}
- length -= pesFrame.GetRemainingLength();
-
//if (m_demuxMode == DXR3_DEMUX_TRICK_MODE) return origLength;
return length;
} catch (cDxr3PesFrame::ePesFrameError err) {
@@ -521,34 +515,30 @@ int cDxr3DemuxDevice::DemuxAudioPes(const uint8_t* buf, int length)
pesFrame.ExtractNextFrame(buf, length);
- while (pesFrame.IsValid()) {
- if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA) {
- if (m_synchState != DXR3_DEMUX_AUDIO_SYNCHED &&
- syncCounter > 2) {
- m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
- m_dxr3Device.SetPlayMode();
- m_dxr3Device.EnableVideo();
- m_dxr3Device.EnableAudio();
- m_vBuf.Start();
- m_aBuf.Start();
- }
- if (m_synchState != DXR3_DEMUX_AUDIO_SYNCHED &&
- syncCounter <= 2) {
- syncCounter++;
- }
- while (!m_aBuf.Poll(100));
- m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
- pesFrame.GetPayloadLength(), 0, m_aBuf);
+ if (!pesFrame.IsValid()) {
+ return -1;
+ }
- }
- if (pesFrame.IsValid()) {
- pesFrame.ExtractNextFrame(pesFrame.GetNextStart(),
- pesFrame.GetRemainingLength());
+ if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA) {
+ if (m_synchState != DXR3_DEMUX_AUDIO_SYNCHED &&
+ syncCounter > 2) {
+ m_synchState = DXR3_DEMUX_AUDIO_SYNCHED;
+ m_dxr3Device.SetPlayMode();
+ m_dxr3Device.EnableVideo();
+ m_dxr3Device.EnableAudio();
+ m_vBuf.Start();
+ m_aBuf.Start();
}
- }
+ if (m_synchState != DXR3_DEMUX_AUDIO_SYNCHED &&
+ syncCounter <= 2) {
+ syncCounter++;
+ }
+ while (!m_aBuf.Poll(100));
+ m_aDecoder.DecodeLpcm(pesFrame.GetPayload(),
+ pesFrame.GetPayloadLength(), 0, m_aBuf);
- length -= pesFrame.GetRemainingLength();
+ }
return length;
} catch (cDxr3PesFrame::ePesFrameError err) {
diff --git a/dxr3pesframe.h b/dxr3pesframe.h
index 9c68b89..5719bfb 100644
--- a/dxr3pesframe.h
+++ b/dxr3pesframe.h
@@ -150,11 +150,6 @@ public:
return m_pNextStart;
}
- uint32_t GetRemainingLength() const
- {
- return m_remainingLength;
- }
-
uint32_t GetPts() const
{
assert(m_bValid);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 17:14:42 +0000