CodecContext has a link to an AVCodecContext

Clement Champetier · Clement Champetier · commit 4f9988f1b631 · 2015-01-12T10:43:31.000+01:00
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -73,7 +73,8 @@ void optionChecker( const std::string& inputfilename )
 	displayOptions( formatOptions );
 
 	// codec options
-	avtranscoder::CodecContext codecContext( AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM );
+	AVCodecContext* avCodecContext = avcodec_alloc_context3( NULL );
+	avtranscoder::CodecContext codecContext( *avCodecContext, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM );
 	std::vector<avtranscoder::Option> codecOptions = codecContext.getOptions();
 	displayOptions( codecOptions );
 
diff --git a/src/AvTranscoder/option/CodecContext.cpp b/src/AvTranscoder/option/CodecContext.cpp
@@ -1,24 +1,10 @@
 #include "CodecContext.hpp"
 
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavutil/mem.h>
-}
-
 namespace avtranscoder
 {
 
-CodecContext::CodecContext( int req_flags )
-	: _avCodecContext( NULL )
-{
-	_avCodecContext = avcodec_alloc_context3( NULL );
-	loadOptions( _avCodecContext, req_flags );
-}
-
-CodecContext::~CodecContext()
-{
-	avcodec_close( _avCodecContext );
-	av_free( _avCodecContext );
-}
+CodecContext::CodecContext( AVCodecContext& avCodecContext, int req_flags )
+	: Context( &avCodecContext, req_flags )
+{}
 
 }
diff --git a/src/AvTranscoder/option/CodecContext.hpp b/src/AvTranscoder/option/CodecContext.hpp
@@ -3,23 +3,24 @@
 
 #include "Context.hpp"
 
-struct AVCodecContext;
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
 
 namespace avtranscoder
 {
 
 /**
  * @brief Wrapper of an AVCodecContext.
- * @note The AVCodecContext is allocated and free by the class. It is not the case of the base class.
  */
 class AvExport  CodecContext : public Context
 {
 public:
-	CodecContext( int req_flags = 0 );
-	~CodecContext();
-	
-private:
-	AVCodecContext* _avCodecContext;
+	CodecContext( AVCodecContext& avCodecContext, int req_flags = 0 );
+
+#ifndef SWIG
+	AVCodecContext& getAVCodecContext() const { return *static_cast<AVCodecContext*>( _avContext ); }
+#endif
 };
 
 }
diff --git a/src/AvTranscoder/option/Context.hpp b/src/AvTranscoder/option/Context.hpp
@@ -48,7 +48,7 @@ class AvExport Context
 protected:
 	void loadOptions( void* av_class, int req_flags );
 
-private:
+protected:
 	OptionMap _options;
 	void* _avContext;  ///< Has link (no ownership)
 };
