CodecContext could allocate a default context, or setup one from an AVCodec

Clement Champetier · Clement Champetier · commit 58621e70f66c · 2015-01-12T10:44:29.000+01:00
* Update optionChecker app.
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -73,8 +73,7 @@ void optionChecker( const std::string& inputfilename )
 	displayOptions( formatOptions );
 
 	// codec options
-	AVCodecContext* avCodecContext = avcodec_alloc_context3( NULL );
-	avtranscoder::CodecContext codecContext( *avCodecContext, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM );
+	avtranscoder::CodecContext codecContext( 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,10 +1,43 @@
 #include "CodecContext.hpp"
 
+#include <stdexcept>
+
 namespace avtranscoder
 {
 
-CodecContext::CodecContext( AVCodecContext& avCodecContext, int req_flags )
-	: Context( &avCodecContext, req_flags )
-{}
+CodecContext::CodecContext( AVCodec& avCodec, int req_flags )
+	: Context( NULL, req_flags )
+{
+	_avContext = avcodec_alloc_context3( &avCodec );
+	if( ! _avContext )
+	{
+		throw std::runtime_error( "unable to allocate the codecContext and set its fields to default values" );
+	}
+
+	// Set default codec parameters
+	if( avcodec_get_context_defaults3( &getAVCodecContext(), &avCodec ) != 0 )
+	{
+		throw std::runtime_error( "unable to find set codecContext to default values corresponding to the given codec" );
+	}
+
+	loadOptions( _avContext, req_flags );
+}
+
+CodecContext::CodecContext( int req_flags )
+	: Context( NULL, req_flags )
+{
+	_avContext = avcodec_alloc_context3( NULL );
+	loadOptions( _avContext, req_flags );
+}
+
+CodecContext::~CodecContext()
+{
+	if( ! _avContext )
+		return;
+	
+	avcodec_close( &getAVCodecContext() );
+	av_free( &getAVCodecContext() );
+	_avContext = NULL;
+}
 
 }
diff --git a/src/AvTranscoder/option/CodecContext.hpp b/src/AvTranscoder/option/CodecContext.hpp
@@ -16,7 +16,9 @@ namespace avtranscoder
 class AvExport  CodecContext : public Context
 {
 public:
-	CodecContext( AVCodecContext& avCodecContext, int req_flags = 0 );
+	CodecContext( AVCodec& avCodec, int req_flags = 0 );  ///< Allocate an AVCodecContext with the given AVCodec
+	CodecContext( int req_flags = 0 );  ///< Allocate an AVCodecContext with default values
+	~CodecContext();
 
 #ifndef SWIG
 	AVCodecContext& getAVCodecContext() const { return *static_cast<AVCodecContext*>( _avContext ); }
