AudioDecoder: fix memory leak in demultiplexing cases

Clement Champetier · Clement Champetier · commit 7ff35fcdd03c · 2016-10-28T11:39:21.000+02:00
In a demultiplexing case, the buffer should be allocated by us, but only
once (not in the decodeNextFrame method)!
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -159,8 +159,6 @@ bool AudioDecoder::decodeNextFrame(IFrame& frameBuffer, const std::vector<size_t
             throw std::runtime_error(msg.str());
         }
     }
-    // allocate data to store the subpart of the next frame
-    audioBuffer.allocateData();
 
     // copy frame properties of decoded frame
     audioBuffer.copyProperties(allDataOfNextFrame);
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -261,9 +261,13 @@ void StreamTranscoder::addDecoder(const InputStreamDesc& inputStreamDesc, IInput
 
             // buffers to get the decoded data
             AudioFrameDesc inputFrameDesc(inputStream.getAudioCodec().getAudioFrameDesc());
+            bool allocateDecodedData = false;
             if(inputStreamDesc.demultiplexing())
+            {
                 inputFrameDesc._nbChannels = inputStreamDesc._channelIndexArray.size();
-            _decodedData.push_back(new AudioFrame(inputFrameDesc, false));
+                allocateDecodedData = true;
+            }
+            _decodedData.push_back(new AudioFrame(inputFrameDesc, allocateDecodedData));
 
             // generator decoder
             _generators.push_back(new AudioGenerator(inputFrameDesc));

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,6 @@ bool AudioDecoder::decodeNextFrame(IFrame& frameBuffer, const std::vector<size_t`
`159`	`159`	`throw std::runtime_error(msg.str());`
`160`	`160`	`}`
`161`	`161`	`}`
`162`		`- // allocate data to store the subpart of the next frame`
`163`		`- audioBuffer.allocateData();`
`164`	`162`
`165`	`163`	`// copy frame properties of decoded frame`
`166`	`164`	`audioBuffer.copyProperties(allDataOfNextFrame);`