OptionLoader: simplify call to loadOptions

Clement Champetier · Clement Champetier · commit 4108338f23da · 2014-06-12T14:27:13.000+02:00
* Parameter rej_flags was useless:
   * req_flags = 0 &amp; (DECODING | ENCODING): get options of formatContext
   * req_flags = (VIDEO | AUDIO | SUBTITLE | METADATA) &amp; (DECODING |
ENCODING): get options of codecContext.
* Update OptionChecker to correctly load options (AUDIO in the example).
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -8,7 +8,7 @@
 int optionChecker( const std::string& inputfilename )
 {	
 	avtranscoder::OptionLoader optionLoader;
-	optionLoader.loadOptions( 0, 0 );
+	optionLoader.loadOptions( AV_OPT_FLAG_AUDIO_PARAM );
 	
 	// display Options
 	for( auto option : optionLoader.getOptions() )
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -35,10 +35,10 @@ OptionLoader::OptionLoader()
 OptionLoader::~OptionLoader()
 {
 	avformat_free_context( m_avFormatContext );
-	avcodec_close( m_avCodecContext );
+	av_free( m_avCodecContext );
 }
 
-void OptionLoader::loadOptions( int req_flags, int rej_flags )
+void OptionLoader::loadOptions( int req_flags )
 {
 	std::map<std::string, int> optionUnitToIndex;
 	std::vector<Option> childOptions;
@@ -65,8 +65,7 @@ void OptionLoader::loadOptions( int req_flags, int rej_flags )
 	{	
 		if( !avOption || 
 			! avOption->name ||
-			( avOption->flags & req_flags ) != req_flags ||
-			( avOption->flags & rej_flags ) )
+			( avOption->flags & req_flags ) != req_flags )
 		{
 			continue;
 		}
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -33,10 +33,9 @@ class OptionLoader
 	
 	/**
 	 * @brief: load array of Option depending on the flags.
-     * @param req_flags
-     * @param rej_flags
+     * @param req_flags: AVOption flags we want to load.
      */
-	void loadOptions( int req_flags, int rej_flags );
+	void loadOptions( int req_flags );
 	
 private:
 	std::vector<Option> m_options;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`int optionChecker( const std::string& inputfilename )`
`9`	`9`	`{`
`10`	`10`	`avtranscoder::OptionLoader optionLoader;`
`11`		`- optionLoader.loadOptions( 0, 0 );`
	`11`	`+ optionLoader.loadOptions( AV_OPT_FLAG_AUDIO_PARAM );`
`12`	`12`
`13`	`13`	`// display Options`
`14`	`14`	`for( auto option : optionLoader.getOptions() )`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ OptionLoader::OptionLoader()`
`35`	`35`	`OptionLoader::~OptionLoader()`
`36`	`36`	`{`
`37`	`37`	`avformat_free_context( m_avFormatContext );`
`38`		`- avcodec_close( m_avCodecContext );`
	`38`	`+ av_free( m_avCodecContext );`
`39`	`39`	`}`
`40`	`40`
`41`		`-void OptionLoader::loadOptions( int req_flags, int rej_flags )`
	`41`	`+void OptionLoader::loadOptions( int req_flags )`
`42`	`42`	`{`
`43`	`43`	`std::map<std::string, int> optionUnitToIndex;`
`44`	`44`	`std::vector<Option> childOptions;`
`@@ -65,8 +65,7 @@ void OptionLoader::loadOptions( int req_flags, int rej_flags )`
`65`	`65`	`{`
`66`	`66`	`if( !avOption \|\|`
`67`	`67`	`! avOption->name \|\|`
`68`		`- ( avOption->flags & req_flags ) != req_flags \|\|`
`69`		`- ( avOption->flags & rej_flags ) )`
	`68`	`+ ( avOption->flags & req_flags ) != req_flags )`
`70`	`69`	`{`
`71`	`70`	`continue;`
`72`	`71`	`}`