Don't use deprecated avcodec_close()

Use avcodec_free_context() straight away available on all our targets (lavc 55.52.0 2014)

Author: daschuer

src/encoder/encoderffmpegcore.cpp

@@ -70,7 +70,7 @@ EncoderFfmpegCore::~EncoderFfmpegCore() {
 
 
     if (m_pStream != NULL) {
-        avcodec_close(m_pStream->codec);
+        avcodec_free_context(&m_pStream->codec);
     }
 
     if (m_pEncodeFormatCtx != NULL) {
@@ -432,7 +432,7 @@ int EncoderFfmpegCore::writeAudioFrame(AVFormatContext *formatctx,
 
 
 void EncoderFfmpegCore::closeAudio(AVStream *stream) {
-    avcodec_close(stream->codec);
+    avcodec_free_context(&stream->codec);
     av_free(m_pSamples);
 }
 

src/sources/soundsourceffmpeg.cpp

@@ -958,6 +958,26 @@ SINT readNextPacket(
 }
 } // namespace
 
+bool SoundSourceFFmpeg::deepFlushBuffers() {
+    bool ret = false;
+    AVCodecParameters* pParams = avcodec_parameters_alloc();
+    if (!pParams) {
+        return false;
+    }
+    avcodec_parameters_from_context(pParams, m_pavCodecContext);
+    const AVCodec* pCodec = m_pavCodecContext->codec;
+    AVCodecContextPtr pavCodecContext = AVCodecContextPtr::alloc(pCodec);
+    if (pavCodecContext) {
+        avcodec_parameters_to_context(pavCodecContext, pParams);
+        if (avcodec_open2(pavCodecContext, pCodec, nullptr) == 0) {
+            m_pavCodecContext = std::move(pavCodecContext);
+            ret = true;
+        }
+    }
+    avcodec_parameters_free(&pParams);
+    return ret;
+}
+
 bool SoundSourceFFmpeg::adjustCurrentPosition(SINT startIndex) {
     DEBUG_ASSERT(frameIndexRange().containsIndex(startIndex));
 
@@ -989,9 +1009,11 @@ bool SoundSourceFFmpeg::adjustCurrentPosition(SINT startIndex) {
         // was limited to -661 instead of -2111. The workaround here is to reopen
         // the codec which initializes all buffers with zero.
         // Slow: 43 us (Core Ultra 5 125U)
-        const AVCodec* pCodec = m_pavCodecContext->codec;
-        avcodec_close(m_pavCodecContext);
-        avcodec_open2(m_pavCodecContext, pCodec, nullptr);
+        if (!deepFlushBuffers()) {
+            kLogger.warning() << "deepFlushBuffers failed";
+            m_frameBuffer.invalidate();
+            return false;
+        }
     }
 
     // Seek to new position

src/sources/soundsourceffmpeg.h

@@ -33,6 +33,10 @@ class SoundSourceFFmpeg : public SoundSource {
   private:
     const CSAMPLE* resampleDecodedAVFrame(AVFrame* pavDecodedFrame);
 
+    // recreates the AVCodecContext for cases where the lightweight
+    // avcodec_flush_buffers() is not sufficient
+    bool deepFlushBuffers();
+
     // Seek to the requested start index (if needed) or return false
     // upon seek errors.
     bool adjustCurrentPosition(