AudioGenerator: check channel layout of the input frame to be able to copy silence

Clement Champetier · Clement Champetier · commit c908e9b526fd · 2016-04-04T14:13:56.000+02:00
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -38,6 +38,15 @@ void AudioGenerator::setNextFrame(Frame& inputFrame)
 
 bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
 {
+    // Check channel layout of the given frame to be able to copy audio data to it.
+    // @see Frame.copyData method
+    if(frameBuffer.getAVFrame().channel_layout == 0)
+    {
+        const size_t channelLayout = av_get_default_channel_layout(frameBuffer.getAVFrame().channels);
+        LOG_WARN("Channel layout en the audio frame is not set. Set it to '" << channelLayout << "' to be able to copy silence data.")
+        av_frame_set_channel_layout(&frameBuffer.getAVFrame(), channelLayout);
+    }
+
     // Generate silent
     if(!_inputFrame)
     {
