AudioDecoder: fixed channel layout value after decoding

Clement Champetier · Clement Champetier · commit 27a65ac9aa2f · 2016-07-20T17:01:24.000+02:00
After calling 'avcodec_decode_audio4', sometimes the channel layout of
the frame is set to 0. I could be a problem in the next steps of the
process.
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -78,6 +78,7 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)
 bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
 {
     bool decodeNextFrame = false;
+    const size_t channelLayout = frameBuffer.getAVFrame().channel_layout;
 
     if(!_isSetup)
         setupDecoder();
@@ -100,6 +101,9 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
             throw std::runtime_error("An error occurred during audio decoding: " + getDescriptionFromErrorCode(ret));
         }
 
+        // fixed channel layout value after decoding
+        frameBuffer.getAVFrame().channel_layout = channelLayout;
+
         // if no frame could be decompressed
         if(!nextPacketRead && ret == 0 && got_frame == 0)
             decodeNextFrame = false;
