ICodec: add closeCodec public method

Clement Champetier · Clement Champetier · commit bcc0b08be5cc · 2017-01-18T15:11:17.000+01:00
To be able to close a codec from outside of the class without calling ffmpeg/libav methods.
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -44,7 +44,7 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)
 
 ICodec::~ICodec()
 {
-    avcodec_close(_avCodecContext);
+    closeCodec();
 
     if(!_isCodecContextAllocated)
         return;
@@ -73,14 +73,21 @@ void ICodec::openCodec()
             msg += ") ";
         }
 
-        avcodec_close(_avCodecContext);
+        closeCodec();
 
         msg += getDescriptionFromErrorCode(ret);
 
         throw std::runtime_error(msg);
     }
 }
 
+void ICodec::closeCodec()
+{
+    if(!_avCodecContext)
+        throw std::runtime_error("Unable to close a codec without codec context");
+    avcodec_close(_avCodecContext);
+}
+
 std::string ICodec::getCodecName() const
 {
     assert(_avCodecContext != NULL);
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -37,6 +37,8 @@ class AvExport ICodec
 
     /// Initialize the codec context.
     void openCodec();
+    /// Reset the codec context.
+    void closeCodec();
 
     std::string getCodecName() const;
     AVCodecID getCodecId() const;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)`
`44`	`44`
`45`	`45`	`ICodec::~ICodec()`
`46`	`46`	`{`
`47`		`- avcodec_close(_avCodecContext);`
	`47`	`+ closeCodec();`
`48`	`48`
`49`	`49`	`if(!_isCodecContextAllocated)`
`50`	`50`	`return;`
`@@ -73,14 +73,21 @@ void ICodec::openCodec()`
`73`	`73`	`msg += ") ";`
`74`	`74`	`}`
`75`	`75`
`76`		`- avcodec_close(_avCodecContext);`
	`76`	`+ closeCodec();`
`77`	`77`
`78`	`78`	`msg += getDescriptionFromErrorCode(ret);`
`79`	`79`
`80`	`80`	`throw std::runtime_error(msg);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+void ICodec::closeCodec()`
	`85`	`+{`
	`86`	`+ if(!_avCodecContext)`
	`87`	`+ throw std::runtime_error("Unable to close a codec without codec context");`
	`88`	`+ avcodec_close(_avCodecContext);`
	`89`	`+}`
	`90`	`+`
`84`	`91`	`std::string ICodec::getCodecName() const`
`85`	`92`	`{`
`86`	`93`	`assert(_avCodecContext != NULL);`