Merge pull request #277 from cchampet/fix_generatorSetCustomFrame

valnoel · web-flow · commit 9bb6bcd97eec · 2016-08-23T11:22:39.000+02:00
generators: fixed set of a custom frame with any parameters
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -56,7 +56,8 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)
     {
         if((*it).first == constants::avProfileIdentificator || (*it).first == constants::avProfileIdentificatorHuman ||
-           (*it).first == constants::avProfileType || (*it).first == constants::avProfileThreads)
+           (*it).first == constants::avProfileType || (*it).first == constants::avProfileCodec ||
+           (*it).first == constants::avProfileThreads)
             continue;
 
         try
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.
 };
 }
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -54,7 +54,8 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)
     {
         if((*it).first == constants::avProfileIdentificator || (*it).first == constants::avProfileIdentificatorHuman ||
-           (*it).first == constants::avProfileType || (*it).first == constants::avProfileThreads)
+           (*it).first == constants::avProfileType || (*it).first == constants::avProfileCodec ||
+           (*it).first == constants::avProfileThreads)
             continue;
 
         try
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -11,7 +11,6 @@ VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)
     : _inputFrame(NULL)
     , _blackImage(NULL)
     , _frameDesc(frameDesc)
-    , _videoTransform()
 {
 }
 
@@ -57,8 +56,8 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
     // Take image from _inputFrame
     else
     {
-        LOG_DEBUG("Copy data of the image specified when decode next frame")
-        frameBuffer.copyData(*_inputFrame);
+        LOG_DEBUG("Convert data of the image specified when decode next frame")
+        _videoTransform.convert(*_inputFrame, frameBuffer);
     }
     return true;
 }
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -23,7 +23,8 @@ class AvExport VideoGenerator : public IDecoder
 
     /**
      * @brief Force to return this frame when calling the decoding methods.
-     * @param inputFrame: should have the same properties as the given frames when decoding.
+     * @param inputFrame: could have other properties than the given frame when decoding (will be converted).
+     * @see decodeNextFrame
      */
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -147,7 +147,7 @@ void InputFile::setupUnwrapping(const ProfileLoader::Profile& profile)
     for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)
     {
         if((*it).first == constants::avProfileIdentificator || (*it).first == constants::avProfileIdentificatorHuman ||
-           (*it).first == constants::avProfileType)
+           (*it).first == constants::avProfileType || (*it).first == constants::avProfileFormat)
             continue;
 
         try
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
@@ -38,7 +38,7 @@ def testSetVideoFrame():
         p.progress( i, nbFrames )
 
         # set video frame
-        frame = av.VideoFrame( av.VideoFrameDesc(1920, 1080, "yuv422p") )
+        frame = av.VideoFrame(av.VideoFrameDesc(1920, 1080, "rgb24"))
         frame.assign(i)
         videoDecoder.setNextFrame( frame )
 
@@ -84,7 +84,7 @@ def testSetAudioFrame():
         p.progress( i, nbFrames )
 
         # set video frame
-        frame = av.AudioFrame( av.AudioFrameDesc(48000, 1, "s32") )
+        frame = av.AudioFrame(av.AudioFrameDesc(44100, 1, "s16"))
         frame.assign(i)
         audioDecoder.setNextFrame( frame )
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`56`	`56`	`for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)`
`57`	`57`	`{`
`58`	`58`	`if((it).first == constants::avProfileIdentificator \|\| (it).first == constants::avProfileIdentificatorHuman \|\|`
`59`		`- (it).first == constants::avProfileType \|\| (it).first == constants::avProfileThreads)`
	`59`	`+ (it).first == constants::avProfileType \|\| (it).first == constants::avProfileCodec \|\|`
	`60`	`+ (*it).first == constants::avProfileThreads)`
`60`	`61`	`continue;`
`61`	`62`
`62`	`63`	`try`
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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`54`	`54`	`for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)`
`55`	`55`	`{`
`56`	`56`	`if((it).first == constants::avProfileIdentificator \|\| (it).first == constants::avProfileIdentificatorHuman \|\|`
`57`		`- (it).first == constants::avProfileType \|\| (it).first == constants::avProfileThreads)`
	`57`	`+ (it).first == constants::avProfileType \|\| (it).first == constants::avProfileCodec \|\|`
	`58`	`+ (*it).first == constants::avProfileThreads)`
`58`	`59`	`continue;`
`59`	`60`
`60`	`61`	`try`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)`
`11`	`11`	`: _inputFrame(NULL)`
`12`	`12`	`, _blackImage(NULL)`
`13`	`13`	`, _frameDesc(frameDesc)`
`14`		`- , _videoTransform()`
`15`	`14`	`{`
`16`	`15`	`}`
`17`	`16`
`@@ -57,8 +56,8 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`57`	`56`	`// Take image from _inputFrame`
`58`	`57`	`else`
`59`	`58`	`{`
`60`		`- LOG_DEBUG("Copy data of the image specified when decode next frame")`
`61`		`- frameBuffer.copyData(*_inputFrame);`
	`59`	`+ LOG_DEBUG("Convert data of the image specified when decode next frame")`
	`60`	`+ _videoTransform.convert(*_inputFrame, frameBuffer);`
`62`	`61`	`}`
`63`	`62`	`return true;`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ void InputFile::setupUnwrapping(const ProfileLoader::Profile& profile)`
`147`	`147`	`for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)`
`148`	`148`	`{`
`149`	`149`	`if((it).first == constants::avProfileIdentificator \|\| (it).first == constants::avProfileIdentificatorHuman \|\|`
`150`		`- (*it).first == constants::avProfileType)`
	`150`	`+ (it).first == constants::avProfileType \|\| (it).first == constants::avProfileFormat)`
`151`	`151`	`continue;`
`152`	`152`
`153`	`153`	`try`