FormatContext has a link to an AVFormatContext

Clement Champetier · Clement Champetier · commit 5ca483947065 · 2015-01-12T10:43:41.000+01:00
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -1,5 +1,6 @@
 #include <AvTranscoder/util.hpp>
 #include <AvTranscoder/option/Context.hpp>
+#include "AvTranscoder/option/FormatContext.hpp"
 #include <AvTranscoder/option/CodecContext.hpp>
 #include <AvTranscoder/option/Option.hpp>
 #include <AvTranscoder/file/InputFile.hpp>
@@ -68,7 +69,8 @@ void optionChecker( const std::string& inputfilename )
 	avtranscoder::InputFile file( inputfilename );
 
 	// format options
-	avtranscoder::Context formatContext( &file.getAVFormatContext() );
+	AVFormatContext* avFormatContext = avformat_alloc_context();
+	avtranscoder::FormatContext formatContext( *avFormatContext );
 	std::vector<avtranscoder::Option> formatOptions = formatContext.getOptions();
 	displayOptions( formatOptions );
 
diff --git a/src/AvTranscoder/option/Context.hpp b/src/AvTranscoder/option/Context.hpp
@@ -12,7 +12,7 @@ namespace avtranscoder
 {
 
 typedef std::vector<Option> OptionArray;
-typedef std::map<std::string, Option> OptionMap;
+typedef std::map<std::string, Option> OptionMap;  ///< Key: option name / value: option
 
 /**
  * @brief Wrapper of AVContext.
@@ -40,8 +40,8 @@ class AvExport Context
 		loadOptions( avContext, req_flags );
 	}
 
-	OptionArray getOptions();
-	OptionMap& getOptionsMap() { return _options; }
+	OptionArray getOptions();  ///< Get options as array
+	OptionMap& getOptionsMap() { return _options; }  ///< Get options as map
 
 	Option& getOption( const std::string& optionName ) { return _options.at(optionName); }
 
diff --git a/src/AvTranscoder/option/FormatContext.cpp b/src/AvTranscoder/option/FormatContext.cpp
@@ -1,22 +1,10 @@
 #include "FormatContext.hpp"
 
-extern "C" {
-#include <libavformat/avformat.h>
-}
-
 namespace avtranscoder
 {
 
-FormatContext::FormatContext( int req_flags )
-	: _avFormatContext( NULL )
-{
-	_avFormatContext = avformat_alloc_context();
-	loadOptions( _avFormatContext, req_flags );
-}
-
-FormatContext::~FormatContext()
-{
-	avformat_free_context( _avFormatContext );
-}
+FormatContext::FormatContext( AVFormatContext& avFormatContext, int req_flags )
+	: Context( &avFormatContext, req_flags )
+{}
 
 }
diff --git a/src/AvTranscoder/option/FormatContext.hpp b/src/AvTranscoder/option/FormatContext.hpp
@@ -3,23 +3,24 @@
 
 #include "Context.hpp"
 
-struct AVFormatContext;
+extern "C" {
+#include <libavformat/avformat.h>
+}
 
 namespace avtranscoder
 {
 
 /**
  * @brief Wrapper of an AVFormatContext.
- * @note The AVFormatContext is allocated and free by the class. It is not the case of the base class.
  */
 class FormatContext : public Context
 {
 public:
-	FormatContext( int req_flags = 0 );
-	~FormatContext();
+	FormatContext( AVFormatContext& avFormatContext, int req_flags = 0 );
 
-private:
-	AVFormatContext* _avFormatContext;
+#ifndef SWIG
+	AVFormatContext& getAVFormatContext() const { return *static_cast<AVFormatContext*>( _avContext ); }
+#endif
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace avtranscoder`
`12`	`12`	`{`
`13`	`13`
`14`	`14`	`typedef std::vector<Option> OptionArray;`
`15`		`-typedef std::map<std::string, Option> OptionMap;`
	`15`	`+typedef std::map<std::string, Option> OptionMap; ///< Key: option name / value: option`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* @brief Wrapper of AVContext.`
`@@ -40,8 +40,8 @@ class AvExport Context`
`40`	`40`	`loadOptions( avContext, req_flags );`
`41`	`41`	`}`
`42`	`42`
`43`		`- OptionArray getOptions();`
`44`		`- OptionMap& getOptionsMap() { return _options; }`
	`43`	`+ OptionArray getOptions(); ///< Get options as array`
	`44`	`+ OptionMap& getOptionsMap() { return _options; } ///< Get options as map`
`45`	`45`
`46`	`46`	`Option& getOption( const std::string& optionName ) { return _options.at(optionName); }`
`47`	`47`