ICodec: fix how to close the codec

Clement Champetier · Clement Champetier · commit d5d633facd65 · 2017-01-18T17:13:36.000+01:00
* The decoder can open the codec (and so there is a flag _isSetup to check this).
* If the codec was open by the decoder, it should close it at the end of its life.
* So the codec itself is not responsible to close its context.
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -44,8 +44,6 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)
 
 ICodec::~ICodec()
 {
-    closeCodec();
-
     if(!_isCodecContextAllocated)
         return;
 
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -27,6 +27,8 @@ AudioDecoder::AudioDecoder(InputStream& inputStream)
 
 AudioDecoder::~AudioDecoder()
 {
+    if(_isSetup)
+        _inputStream->getAudioCodec().closeCodec();
 }
 
 void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)
@@ -73,7 +75,7 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     }
 
     // open decoder
-    _inputStream->getAudioCodec().openCodec();
+    codec.openCodec();
     _isSetup = true;
 }
 
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -24,6 +24,8 @@ VideoDecoder::VideoDecoder(InputStream& inputStream)
 
 VideoDecoder::~VideoDecoder()
 {
+    if(_isSetup)
+        _inputStream->getVideoCodec().closeCodec();
 }
 
 void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)
@@ -70,7 +72,7 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     }
 
     // open decoder
-    _inputStream->getVideoCodec().openCodec();
+    codec.openCodec();
     _isSetup = true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)`
`44`	`44`
`45`	`45`	`ICodec::~ICodec()`
`46`	`46`	`{`
`47`		`- closeCodec();`
`48`		`-`
`49`	`47`	`if(!_isCodecContextAllocated)`
`50`	`48`	`return;`
`51`	`49`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ AudioDecoder::AudioDecoder(InputStream& inputStream)`
`27`	`27`
`28`	`28`	`AudioDecoder::~AudioDecoder()`
`29`	`29`	`{`
	`30`	`+ if(_isSetup)`
	`31`	`+ _inputStream->getAudioCodec().closeCodec();`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`@@ -73,7 +75,7 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`// open decoder`
`76`		`- _inputStream->getAudioCodec().openCodec();`
	`78`	`+ codec.openCodec();`
`77`	`79`	`_isSetup = true;`
`78`	`80`	`}`
`79`	`81`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ VideoDecoder::VideoDecoder(InputStream& inputStream)`
`24`	`24`
`25`	`25`	`VideoDecoder::~VideoDecoder()`
`26`	`26`	`{`
	`27`	`+ if(_isSetup)`
	`28`	`+ _inputStream->getVideoCodec().closeCodec();`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`@@ -70,7 +72,7 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`// open decoder`
`73`		`- _inputStream->getVideoCodec().openCodec();`
	`75`	`+ codec.openCodec();`
`74`	`76`	`_isSetup = true;`
`75`	`77`	`}`
`76`	`78`