ICodec: fix free avcodec in destructor

Clement Champetier · Clement Champetier · commit 1887683488b4 · 2014-10-23T15:26:24.000+02:00
* Close and free avcodec in destructor only if AVCodecContext and AVCodec
are not NULL.
* Generator Video / Audio: get a pointer to an ICodec, because we set its codec from the outside (method setVideoCodec / setAudioCodec). And this codec outside will be free elsewhere.
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -29,11 +29,12 @@ ICodec::ICodec( const ECodecType type, const AVCodecID codecId )
 
 ICodec::~ICodec()
 {
-	if( ! _codecContext )
+	if( _codecContext && _codec )
 	{
 		avcodec_close( _codecContext );
 		av_free( _codecContext );
 		_codecContext = NULL;
+		_codec = NULL;
 	}
 }
 
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -5,25 +5,25 @@ namespace avtranscoder
 
 GeneratorAudio::GeneratorAudio( )
 	: IInputEssence( )
+	, _codec( NULL )
 	, _inputFrame( NULL )
-	, _codec( eCodecTypeEncoder )
 	, _frameDesc()
 {
 }
 
 void GeneratorAudio::setAudioCodec( const AudioCodec& codec )
 {
 	_frameDesc.setFps         ( 25.0 );
-	_codec = codec;
+	_codec = &codec;
 
-	_frameDesc.setSampleRate( _codec.getAVCodecContext()->sample_rate );
-	_frameDesc.setChannels( _codec.getAVCodecContext()->channels );
-	_frameDesc.setSampleFormat( _codec.getAVCodecContext()->sample_fmt );
+	_frameDesc.setSampleRate( _codec->getAVCodecContext()->sample_rate );
+	_frameDesc.setChannels( _codec->getAVCodecContext()->channels );
+	_frameDesc.setSampleFormat( _codec->getAVCodecContext()->sample_fmt );
 }
 
-AudioCodec& GeneratorAudio::getAudioCodec()
+const AudioCodec& GeneratorAudio::getAudioCodec()
 {
-	return _codec;
+	return *_codec;
 }
 
 void GeneratorAudio::setFrame( Frame& inputFrame )
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -14,7 +14,7 @@ class AvExport GeneratorAudio : public IInputEssence
 
 	void setAudioCodec( const AudioCodec& codec );
 
-	AudioCodec& getAudioCodec();
+	const AudioCodec& getAudioCodec();
 	
 	void setup() {}
 	
@@ -24,10 +24,9 @@ class AvExport GeneratorAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	AudioCodec _codec;
-	AudioFrameDesc _frameDesc;
-	
+	const AudioCodec* _codec;
 	Frame*         _inputFrame;
+	AudioFrameDesc _frameDesc;
 };
 
 }
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -7,22 +7,22 @@ namespace avtranscoder
 
 GeneratorVideo::GeneratorVideo( )
 	: IInputEssence( )
+	, _codec( NULL )
 	, _inputFrame( NULL )
-	, _codec( eCodecTypeEncoder )
 	, _videoFrameDesc()
 	, _numberOfView( 1 )
 {
 }
 
 void GeneratorVideo::setVideoCodec( const VideoCodec& codec )
 {
-	_codec = codec;
-	_videoFrameDesc = _codec.getVideoFrameDesc();
+	_codec = &codec;
+	_videoFrameDesc = _codec->getVideoFrameDesc();
 }
 
-VideoCodec& GeneratorVideo::getVideoCodec()
+const VideoCodec& GeneratorVideo::getVideoCodec()
 {
-	return _codec;
+	return *_codec;
 }
 
 void GeneratorVideo::setFrame( Frame& inputFrame )
@@ -40,7 +40,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
 			frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
 
-		VideoFrameDesc desc( _codec.getVideoFrameDesc() );
+		VideoFrameDesc desc( _codec->getVideoFrameDesc() );
 		Pixel rgbPixel;
 		rgbPixel.setColorComponents( eComponentRgb );
 		rgbPixel.setPlanar( false );
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -15,7 +15,7 @@ class AvExport GeneratorVideo : public IInputEssence
 	// Stream properties
 	void setVideoCodec( const VideoCodec& codec );
 
-	VideoCodec& getVideoCodec();
+	const VideoCodec& getVideoCodec();
 	
 	void setup() {}
 
@@ -25,8 +25,8 @@ class AvExport GeneratorVideo : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	Frame*         _inputFrame;
-	VideoCodec      _codec;
+	const VideoCodec* _codec;
+	Frame* _inputFrame;
 	VideoFrameDesc _videoFrameDesc;
 
 	size_t         _numberOfView;

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,12 @@ ICodec::ICodec( const ECodecType type, const AVCodecID codecId )`
`29`	`29`
`30`	`30`	`ICodec::~ICodec()`
`31`	`31`	`{`
`32`		`- if( ! _codecContext )`
	`32`	`+ if( _codecContext && _codec )`
`33`	`33`	`{`
`34`	`34`	`avcodec_close( _codecContext );`
`35`	`35`	`av_free( _codecContext );`
`36`	`36`	`_codecContext = NULL;`
	`37`	`+ _codec = NULL;`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -5,25 +5,25 @@ namespace avtranscoder`
`5`	`5`
`6`	`6`	`GeneratorAudio::GeneratorAudio( )`
`7`	`7`	`: IInputEssence( )`
	`8`	`+ , _codec( NULL )`
`8`	`9`	`, _inputFrame( NULL )`
`9`		`- , _codec( eCodecTypeEncoder )`
`10`	`10`	`, _frameDesc()`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`void GeneratorAudio::setAudioCodec( const AudioCodec& codec )`
`15`	`15`	`{`
`16`	`16`	`_frameDesc.setFps ( 25.0 );`
`17`		`- _codec = codec;`
	`17`	`+ _codec = &codec;`
`18`	`18`
`19`		`- _frameDesc.setSampleRate( _codec.getAVCodecContext()->sample_rate );`
`20`		`- _frameDesc.setChannels( _codec.getAVCodecContext()->channels );`
`21`		`- _frameDesc.setSampleFormat( _codec.getAVCodecContext()->sample_fmt );`
	`19`	`+ _frameDesc.setSampleRate( _codec->getAVCodecContext()->sample_rate );`
	`20`	`+ _frameDesc.setChannels( _codec->getAVCodecContext()->channels );`
	`21`	`+ _frameDesc.setSampleFormat( _codec->getAVCodecContext()->sample_fmt );`
`22`	`22`	`}`
`23`	`23`
`24`		`-AudioCodec& GeneratorAudio::getAudioCodec()`
	`24`	`+const AudioCodec& GeneratorAudio::getAudioCodec()`
`25`	`25`	`{`
`26`		`- return _codec;`
	`26`	`+ return *_codec;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`void GeneratorAudio::setFrame( Frame& inputFrame )`
Original file line number	Diff line number	Diff line change
`@@ -7,22 +7,22 @@ namespace avtranscoder`
`7`	`7`
`8`	`8`	`GeneratorVideo::GeneratorVideo( )`
`9`	`9`	`: IInputEssence( )`
	`10`	`+ , _codec( NULL )`
`10`	`11`	`, _inputFrame( NULL )`
`11`		`- , _codec( eCodecTypeEncoder )`
`12`	`12`	`, _videoFrameDesc()`
`13`	`13`	`, _numberOfView( 1 )`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`void GeneratorVideo::setVideoCodec( const VideoCodec& codec )`
`18`	`18`	`{`
`19`		`- _codec = codec;`
`20`		`- _videoFrameDesc = _codec.getVideoFrameDesc();`
	`19`	`+ _codec = &codec;`
	`20`	`+ _videoFrameDesc = _codec->getVideoFrameDesc();`
`21`	`21`	`}`
`22`	`22`
`23`		`-VideoCodec& GeneratorVideo::getVideoCodec()`
	`23`	`+const VideoCodec& GeneratorVideo::getVideoCodec()`
`24`	`24`	`{`
`25`		`- return _codec;`
	`25`	`+ return *_codec;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`void GeneratorVideo::setFrame( Frame& inputFrame )`
`@@ -40,7 +40,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )`
`40`	`40`	`if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )`
`41`	`41`	`frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
`42`	`42`
`43`		`- VideoFrameDesc desc( _codec.getVideoFrameDesc() );`
	`43`	`+ VideoFrameDesc desc( _codec->getVideoFrameDesc() );`
`44`	`44`	`Pixel rgbPixel;`
`45`	`45`	`rgbPixel.setColorComponents( eComponentRgb );`
`46`	`46`	`rgbPixel.setPlanar( false );`