FormatContext: load options specific to the format when muxing

Clement Champetier · Clement Champetier · commit 141139f94f3b · 2015-04-24T17:29:23.000+02:00
* This need to be done after call of avformat_write_header. * Add attribute _flags. * Fix #92
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -8,6 +8,7 @@ namespace avtranscoder
 
 FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
@@ -29,6 +30,7 @@ FormatContext::FormatContext( const std::string& filename, int req_flags, AVDict
 
 FormatContext::FormatContext( int req_flags )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
@@ -88,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
@@ -51,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
@@ -106,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)
 };

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace avtranscoder`
`8`	`8`
`9`	`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`	`{`
`@@ -29,6 +30,7 @@ FormatContext::FormatContext( const std::string& filename, int req_flags, AVDict`
`29`	`30`
`30`	`31`	`FormatContext::FormatContext( int req_flags )`
`31`	`32`	`: _avFormatContext( NULL )`
	`33`	`+ , _flags( req_flags )`
`32`	`34`	`, _options()`
`33`	`35`	`, _isOpen( false )`
`34`	`36`	`{`
`@@ -88,6 +90,8 @@ void FormatContext::writeHeader( AVDictionary** options )`
`88`	`90`	`{`
`89`	`91`	`throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );`
`90`	`92`	`}`
	`93`	`+ // when muxing, priv_data of AVFormatContext is set by avformat_write_header()`
	`94`	`+ loadOptions( _options, _avFormatContext->priv_data, _flags );`
`91`	`95`	`}`
`92`	`96`
`93`	`97`	`void FormatContext::writeFrame( AVPacket& packet, bool interleaved )`