summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dxr3audiodecoder.h4
-rw-r--r--dxr3demuxdevice.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/dxr3audiodecoder.h b/dxr3audiodecoder.h
index 0283e4b..c5daf10 100644
--- a/dxr3audiodecoder.h
+++ b/dxr3audiodecoder.h
@@ -41,8 +41,6 @@ public:
cDxr3AudioDecoder();
~cDxr3AudioDecoder();
- void Init();
-
void Decode(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuffer &aBuf);
void DecodeLpcm(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuffer &aBuf);
void DecodeAc3Dts(cDxr3PesFrame *frame, uint32_t pts, cDxr3SyncBuffer &aBuf);
@@ -67,6 +65,8 @@ private:
int frameSize;
uint8_t lastBitrate;
uint8_t pcmbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+
+ void Init();
};
#endif /*_DXR3_AUDIODECODER_H_*/
diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index a834e25..4bd0ec3 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -43,7 +43,6 @@ cDxr3DemuxDevice::cDxr3DemuxDevice() :
exit(1);
}
m_pVideoThread->Start();
- m_aDecoder.Init();
}
void cDxr3DemuxDevice::setAudio(iAudio *audio)
@@ -70,7 +69,6 @@ void cDxr3DemuxDevice::Stop()
m_aBuf.Clear();
m_vBuf.WakeUp();
m_aBuf.WakeUp();
- m_aDecoder.Init();
m_vBuf.WaitForReceiverStopped();
m_aBuf.WaitForReceiverStopped();
m_synchState = DXR3_DEMUX_UNSYNCHED;
@@ -88,7 +86,6 @@ void cDxr3DemuxDevice::Resync()
m_aBuf.Clear();
m_vBuf.WakeUp();
m_aBuf.WakeUp();
- m_aDecoder.Init();
m_vBuf.WaitForReceiverStopped();
m_aBuf.WaitForReceiverStopped();
m_synchState = DXR3_DEMUX_UNSYNCHED;
@@ -104,7 +101,6 @@ void cDxr3DemuxDevice::Clear()
m_aBuf.Clear();
m_vBuf.WakeUp();
m_aBuf.WakeUp();
- m_aDecoder.Init();
m_vBuf.WaitForReceiverStopped();
m_aBuf.WaitForReceiverStopped();
m_synchState = DXR3_DEMUX_UNSYNCHED;