Merge pull request mikrosimage#221 from cchampet/dev_setupDecoders

valnoel · valnoel · commit 7f789d72661d · 2015-08-27T15:39:11.000+02:00
decoders: the user can decode without any call to setup method
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -18,8 +18,9 @@ namespace avtranscoder
 {
 
 AudioDecoder::AudioDecoder( InputStream& inputStream ) 
-	: _inputStream   ( &inputStream )
-	, _frame         ( NULL )
+	: _inputStream( &inputStream )
+	, _frame( NULL )
+	, _isSetup(false)
 {
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	_frame = av_frame_alloc();
@@ -84,6 +85,7 @@ void AudioDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 
 	// open decoder
 	_inputStream->getAudioCodec().openCodec();
+	_isSetup = true;
 }
 
 bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )
@@ -155,6 +157,9 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn
 
 bool AudioDecoder::decodeNextFrame()
 {
+	if(!_isSetup)
+		setupDecoder();
+
 	int got_frame = 0;
 	while( ! got_frame )
 	{
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -27,6 +27,8 @@ class AvExport AudioDecoder : public IDecoder
 private:
 	InputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
 	AVFrame* _frame;  ///< Libav object to store decoded data (has ownership)
+
+	bool _isSetup;
 };
 
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -16,8 +16,6 @@ class AvExport AudioGenerator : public IDecoder
 
 	~AudioGenerator();
 
-	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) {}
-
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -18,7 +18,7 @@ class AvExport IDecoder
 	 * @param profile: set decoder parameters from the given profile
 	 * @note Open the decoder.
 	 */
-	virtual void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) = 0;
+	virtual void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) {}
 
 	/**
 	 * @brief Decode next frame
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -17,8 +17,9 @@ namespace avtranscoder
 {
 
 VideoDecoder::VideoDecoder( InputStream& inputStream )
-	: _inputStream   ( &inputStream )
-	, _frame         ( NULL )
+	: _inputStream( &inputStream )
+	, _frame( NULL )
+	, _isSetup(false)
 {
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	_frame = av_frame_alloc();
@@ -82,6 +83,7 @@ void VideoDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 
 	// open decoder
 	_inputStream->getVideoCodec().openCodec();
+	_isSetup = true;
 }
 
 bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )
@@ -109,6 +111,9 @@ bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn
 
 bool VideoDecoder::decodeNextFrame()
 {
+	if(!_isSetup)
+		setupDecoder();
+
 	int got_frame = 0;
 	while( ! got_frame )
 	{
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -29,6 +29,8 @@ class AvExport VideoDecoder : public IDecoder
 private:
 	InputStream* _inputStream;  ///< Stream from which we read next frames (no ownership, has link)
 	AVFrame* _frame;  ///< Libav object to store decoded data (has ownership)
+
+	bool _isSetup;
 };
 
 }
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -16,8 +16,6 @@ class AvExport VideoGenerator : public IDecoder
 
 	~VideoGenerator();
 
-	void setupDecoder( const ProfileLoader::Profile& profile = ProfileLoader::Profile() ) {}
-
 	bool decodeNextFrame( Frame& frameBuffer );
 	bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ namespace avtranscoder`
`18`	`18`	`{`
`19`	`19`
`20`	`20`	`AudioDecoder::AudioDecoder( InputStream& inputStream )`
`21`		`- : _inputStream ( &inputStream )`
`22`		`- , _frame ( NULL )`
	`21`	`+ : _inputStream( &inputStream )`
	`22`	`+ , _frame( NULL )`
	`23`	`+ , _isSetup(false)`
`23`	`24`	`{`
`24`	`25`	`#if LIBAVCODEC_VERSION_MAJOR > 54`
`25`	`26`	`_frame = av_frame_alloc();`
`@@ -84,6 +85,7 @@ void AudioDecoder::setupDecoder( const ProfileLoader::Profile& profile )`
`84`	`85`
`85`	`86`	`// open decoder`
`86`	`87`	`_inputStream->getAudioCodec().openCodec();`
	`88`	`+ _isSetup = true;`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )`
`@@ -155,6 +157,9 @@ bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn`
`155`	`157`
`156`	`158`	`bool AudioDecoder::decodeNextFrame()`
`157`	`159`	`{`
	`160`	`+ if(!_isSetup)`
	`161`	`+ setupDecoder();`
	`162`	`+`
`158`	`163`	`int got_frame = 0;`
`159`	`164`	`while( ! got_frame )`
`160`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ class AvExport AudioDecoder : public IDecoder`
`27`	`27`	`private:`
`28`	`28`	`InputStream* _inputStream; ///< Stream from which we read next frames (no ownership, has link)`
`29`	`29`	`AVFrame* _frame; ///< Libav object to store decoded data (has ownership)`
	`30`	`+`
	`31`	`+ bool _isSetup;`
`30`	`32`	`};`
`31`	`33`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ namespace avtranscoder`
`17`	`17`	`{`
`18`	`18`
`19`	`19`	`VideoDecoder::VideoDecoder( InputStream& inputStream )`
`20`		`- : _inputStream ( &inputStream )`
`21`		`- , _frame ( NULL )`
	`20`	`+ : _inputStream( &inputStream )`
	`21`	`+ , _frame( NULL )`
	`22`	`+ , _isSetup(false)`
`22`	`23`	`{`
`23`	`24`	`#if LIBAVCODEC_VERSION_MAJOR > 54`
`24`	`25`	`_frame = av_frame_alloc();`
`@@ -82,6 +83,7 @@ void VideoDecoder::setupDecoder( const ProfileLoader::Profile& profile )`
`82`	`83`
`83`	`84`	`// open decoder`
`84`	`85`	`_inputStream->getVideoCodec().openCodec();`
	`86`	`+ _isSetup = true;`
`85`	`87`	`}`
`86`	`88`
`87`	`89`	`bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )`
`@@ -109,6 +111,9 @@ bool VideoDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn`
`109`	`111`
`110`	`112`	`bool VideoDecoder::decodeNextFrame()`
`111`	`113`	`{`
	`114`	`+ if(!_isSetup)`
	`115`	`+ setupDecoder();`
	`116`	`+`
`112`	`117`	`int got_frame = 0;`
`113`	`118`	`while( ! got_frame )`
`114`	`119`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ class AvExport VideoDecoder : public IDecoder`
`29`	`29`	`private:`
`30`	`30`	`InputStream* _inputStream; ///< Stream from which we read next frames (no ownership, has link)`
`31`	`31`	`AVFrame* _frame; ///< Libav object to store decoded data (has ownership)`
	`32`	`+`
	`33`	`+ bool _isSetup;`
`32`	`34`	`};`
`33`	`35`
`34`	`36`	`}`