Merge pull request #176 from cchampet/fix_FormatContextOptions

valnoel · valnoel · commit 1cc630c7a202 · 2015-04-27T16:02:42.000+02:00
Fix FormatContext private options
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -6,12 +6,13 @@
 namespace avtranscoder
 {
 
-FormatContext::FormatContext( const std::string& filename, int req_flags )
+FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
-	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );
+	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, options );
 	if( ret < 0 )
 	{
 		std::string msg = "unable to open file ";
@@ -21,11 +22,15 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )
 		throw std::ios_base::failure( msg );
 	}
 	_isOpen = true;
+
 	loadOptions( _options, _avFormatContext, req_flags );
+	// when demuxing, priv_data of AVFormatContext is set by avformat_open_input()
+	loadOptions( _options, _avFormatContext->priv_data, req_flags );
 }
 
 FormatContext::FormatContext( int req_flags )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
@@ -85,6 +90,8 @@ void FormatContext::writeHeader( AVDictionary** options )
 	{
 		throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );
 	}
+	// when muxing, priv_data of AVFormatContext is set by avformat_write_header()
+	loadOptions( _options, _avFormatContext->priv_data, _flags );
 }
 
 void FormatContext::writeFrame( AVPacket& packet, bool interleaved )
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -21,8 +21,16 @@ class AvExport FormatContext
 	FormatContext& operator=( const FormatContext& formatContext );
 
 public:
-	FormatContext( const std::string& filename, int req_flags = 0 );  ///< Allocate an AVFormatContext by opening an input file
-	FormatContext( int req_flags = 0 );  ///< Allocate an AVFormatContext with default values
+	/**
+	 * @brief Allocate an AVFormatContext by opening an input file
+         */
+	FormatContext( const std::string& filename, int req_flags = 0, AVDictionary** options = NULL );
+
+	/**
+	 * @brief Allocate an AVFormatContext with default values
+         */
+	FormatContext( int req_flags = 0 );
+
 	~FormatContext();
 
 	/**
@@ -43,7 +51,11 @@ class AvExport FormatContext
 	 */
 	void closeRessource();
 
-	void writeHeader( AVDictionary** options = NULL );  ///< Write the stream header to an output media file
+	/**
+	 * @brief Write the stream header to an output media file
+	 * @note Also load options specific to the output format
+	 */
+	void writeHeader( AVDictionary** options = NULL );
 
 	/**
 	 * @brief Write a packet to an output media file
@@ -98,6 +110,7 @@ class AvExport FormatContext
 
 private:
 	AVFormatContext* _avFormatContext;  ///< Has ownership
+	const int _flags;  ///< Flags with which the options are loaded (see AV_OPT_FLAG_xxx)
 	OptionMap _options;
 	bool _isOpen;  ///< Is the AVFormatContext open (in constructor with a filename)
 };
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -15,7 +15,6 @@ OutputFile::OutputFile( const std::string& filename )
 	, _previousProcessedStreamDuration( 0.0 )
 {
 	_formatContext.setOutputFormat( _filename );
-	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
 }
 
 OutputFile::~OutputFile()
@@ -90,9 +89,12 @@ bool OutputFile::beginWrap( )
 {
 	LOG_DEBUG( "Begin wrap of OutputFile" )
 
+	_formatContext.openRessource( _filename, AVIO_FLAG_WRITE );
 	_formatContext.writeHeader();
+
 	_frameCount.clear();
 	_frameCount.resize( _outputStreams.size(), 0 );
+
 	return true;
 }
 
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -33,8 +33,16 @@ class AvExport OutputFile : public IOutputFile
 	IOutputStream& addAudioStream( const AudioCodec& audioDesc );
 	IOutputStream& addDataStream( const DataCodec& dataDesc );
 
+	/**
+	 * @brief Open ressource and write header.
+         */
 	bool beginWrap();
+
 	IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamId );
+
+	/**
+	 * @brief Close ressource and write trailer.
+         */
 	bool endWrap();
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,13 @@`
`6`	`6`	`namespace avtranscoder`
`7`	`7`	`{`
`8`	`8`
`9`		`-FormatContext::FormatContext( const std::string& filename, int req_flags )`
	`9`	`+FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )`
`10`	`10`	`: _avFormatContext( NULL )`
	`11`	`+ , _flags( req_flags )`
`11`	`12`	`, _options()`
`12`	`13`	`, _isOpen( false )`
`13`	`14`	`{`
`14`		`- int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );`
	`15`	`+ int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, options );`
`15`	`16`	`if( ret < 0 )`
`16`	`17`	`{`
`17`	`18`	`std::string msg = "unable to open file ";`
`@@ -21,11 +22,15 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )`
`21`	`22`	`throw std::ios_base::failure( msg );`
`22`	`23`	`}`
`23`	`24`	`_isOpen = true;`
	`25`	`+`
`24`	`26`	`loadOptions( _options, _avFormatContext, req_flags );`
	`27`	`+ // when demuxing, priv_data of AVFormatContext is set by avformat_open_input()`
	`28`	`+ loadOptions( _options, _avFormatContext->priv_data, req_flags );`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`FormatContext::FormatContext( int req_flags )`
`28`	`32`	`: _avFormatContext( NULL )`
	`33`	`+ , _flags( req_flags )`
`29`	`34`	`, _options()`
`30`	`35`	`, _isOpen( false )`
`31`	`36`	`{`
`@@ -85,6 +90,8 @@ void FormatContext::writeHeader( AVDictionary** options )`
`85`	`90`	`{`
`86`	`91`	`throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );`
`87`	`92`	`}`
	`93`	`+ // when muxing, priv_data of AVFormatContext is set by avformat_write_header()`
	`94`	`+ loadOptions( _options, _avFormatContext->priv_data, _flags );`
`88`	`95`	`}`
`89`	`96`
`90`	`97`	`void FormatContext::writeFrame( AVPacket& packet, bool interleaved )`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ OutputFile::OutputFile( const std::string& filename )`
`15`	`15`	`, _previousProcessedStreamDuration( 0.0 )`
`16`	`16`	`{`
`17`	`17`	`_formatContext.setOutputFormat( _filename );`
`18`		`- _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`OutputFile::~OutputFile()`
`@@ -90,9 +89,12 @@ bool OutputFile::beginWrap( )`
`90`	`89`	`{`
`91`	`90`	`LOG_DEBUG( "Begin wrap of OutputFile" )`
`92`	`91`
	`92`	`+ _formatContext.openRessource( _filename, AVIO_FLAG_WRITE );`
`93`	`93`	`_formatContext.writeHeader();`
	`94`	`+`
`94`	`95`	`_frameCount.clear();`
`95`	`96`	`_frameCount.resize( _outputStreams.size(), 0 );`
	`97`	`+`
`96`	`98`	`return true;`
`97`	`99`	`}`
`98`	`100`