Factor decoder flushing into its own function

2 files changed, 19 insertions, 10 deletions

diff --git a/decoder/LAVAudio/LAVAudio.cpp b/decoder/LAVAudio/LAVAudio.cpp
index 4fdb8885..f6088fc1 100644
--- a/decoder/LAVAudio/LAVAudio.cpp
+++ b/decoder/LAVAudio/LAVAudio.cpp
@@ -1410,17 +1410,8 @@ HRESULT CLAVAudio::EndFlush()
   m_buff.SetSize(0);
   FlushOutput(FALSE);
 
-  if(m_pParser) {
-    av_parser_close(m_pParser);
-    m_pParser = av_parser_init(m_nCodecId);
-    m_bUpdateTimeCache = TRUE;
-  }
+  FlushDecoder();
 
-  if (m_pAVCtx && m_pAVCtx->codec) {
-    avcodec_flush_buffers (m_pAVCtx);
-  }
-
-  FlushDTSDecoder();
   m_bsOutput.SetSize(0);
 
   m_bQueueResync = TRUE;
@@ -1442,6 +1433,23 @@ HRESULT CLAVAudio::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, doubl
   return __super::NewSegment(tStart, tStop, dRate);
 }
 
+HRESULT CLAVAudio::FlushDecoder()
+{
+  if(m_pParser) {
+    av_parser_close(m_pParser);
+    m_pParser = av_parser_init(m_nCodecId);
+    m_bUpdateTimeCache = TRUE;
+  }
+
+  if (m_pAVCtx && m_pAVCtx->codec) {
+    avcodec_flush_buffers (m_pAVCtx);
+  }
+
+  FlushDTSDecoder();
+
+  return S_OK;
+}
+
 HRESULT CLAVAudio::Receive(IMediaSample *pIn)
 {
   CAutoLock cAutoLock(&m_csReceive);
diff --git a/decoder/LAVAudio/LAVAudio.h b/decoder/LAVAudio/LAVAudio.h
index e2a4da4f..0ccf79ae 100644
--- a/decoder/LAVAudio/LAVAudio.h
+++ b/decoder/LAVAudio/LAVAudio.h
@@ -194,6 +194,7 @@ private:
 
   HRESULT QueueOutput(BufferDetails &buffer);
   HRESULT FlushOutput(BOOL bDeliver = TRUE);
+  HRESULT FlushDecoder();
 
   HRESULT Deliver(BufferDetails &buffer);