AudioGenerator: fixed copy of data from a specified frame

Clement Champetier · Clement Champetier · commit 90986511d388 · 2016-08-22T17:37:33.000+02:00
The specified frame could have other properties than the given frame
when decoding (will be converted).
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -55,8 +55,8 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
     // Take audio frame from _inputFrame
     else
     {
-        LOG_DEBUG("Copy data of the audio specified when decode next frame")
-        frameBuffer.copyData(*_inputFrame);
+        LOG_DEBUG("Convert data of the audio specified when decode next frame")
+        _audioTransform.convert(*_inputFrame, frameBuffer);
     }
     return true;
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -3,6 +3,7 @@
 
 #include "IDecoder.hpp"
 #include <AvTranscoder/codec/AudioCodec.hpp>
+#include <AvTranscoder/transform/AudioTransform.hpp>
 
 namespace avtranscoder
 {
@@ -21,12 +22,18 @@ class AvExport AudioGenerator : public IDecoder
     bool decodeNextFrame(Frame& frameBuffer);
     bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
+    /**
+     * @brief Force to return this frame when calling the decoding methods.
+     * @param inputFrame: could have other properties than the given frame when decoding (will be converted).
+     * @see decodeNextFrame
+     */
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
 private:
     Frame* _inputFrame;              ///< Has link (no ownership)
     AudioFrame* _silent;             ///< The generated silent (has ownership)
     const AudioFrameDesc _frameDesc; ///< The description of the given frame buffer when decoding.
+    AudioTransform _audioTransform;  ///< To transform the specified data when decoding.
 };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`55`	`55`	`// Take audio frame from _inputFrame`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- LOG_DEBUG("Copy data of the audio specified when decode next frame")`
`59`		`- frameBuffer.copyData(*_inputFrame);`
	`58`	`+ LOG_DEBUG("Convert data of the audio specified when decode next frame")`
	`59`	`+ _audioTransform.convert(*_inputFrame, frameBuffer);`
`60`	`60`	`}`
`61`	`61`	`return true;`
`62`	`62`	`}`