OptionLoader: add flags to loadOptions

Clement Champetier · Clement Champetier · commit 307a9d0a4c27 · 2014-06-10T13:44:43.000+02:00
* 2 new params:
	* req_flags
	* rej_flags
* Can manage specific AVOptions depending on their flags.
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -5,6 +5,13 @@
 #include <AvTranscoder/Options/OptionChoice.hpp>
 #include <AvTranscoder/OptionLoader.hpp>
 
+extern "C" {
+#ifndef __STDC_CONSTANT_MACROS
+	#define __STDC_CONSTANT_MACROS
+#endif
+#include <libavutil/opt.h>
+}
+
 #include <string>
 #include <iostream>
 #include <iomanip>
@@ -18,7 +25,7 @@ int optionChecker( const std::string& inputfilename )
 	avtranscoder::AudioDesc audioDesc( inputFile.getStream( 0 ).getAudioDesc() );
 	
 	avtranscoder::OptionLoader optionLoader;
-	optionLoader.loadOptions( audioDesc.getCodecContext() );
+	optionLoader.loadOptions( audioDesc.getCodecContext(), 0, 0 );
 	
 	// display Options
 	for( auto option : optionLoader.getOptions() )
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -20,7 +20,7 @@ OptionLoader::OptionLoader()
 	
 }
 
-void OptionLoader::loadOptions( void* av_class )
+void OptionLoader::loadOptions( void* av_class, int req_flags, int rej_flags )
 {
 	// tmp vectors to access easely to the OptionChoice/OptionGroup to add choice / boolean to them
 	std::vector<avtranscoder::OptionChoice*> optionsChoice; 
@@ -31,7 +31,10 @@ void OptionLoader::loadOptions( void* av_class )
 		
 		while( ( avOption = av_opt_next( av_class, avOption ) ) != NULL )
 		{	
-			if( !avOption || ! avOption->name )
+			if( !avOption || 
+				! avOption->name ||
+				( avOption->flags & req_flags ) != req_flags ||
+				( avOption->flags & rej_flags ) )
 			{
 				continue;
 			}
@@ -109,6 +112,8 @@ void OptionLoader::loadOptions( void* av_class )
 		{
 			if( !avOption ||
 				!avOption->name ||
+				( avOption->flags & req_flags ) != req_flags ||
+				( avOption->flags & rej_flags ) ||
 				( avOption->unit && avOption->type == AV_OPT_TYPE_FLAGS ) ||
 				( avOption->unit && avOption->type == AV_OPT_TYPE_INT ) )
 			{
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -19,7 +19,10 @@ class OptionLoader
 	
 	std::vector<Option*>& getOptions() { return m_options; }
 	
-	void loadOptions( void* av_class );
+	/**
+     * @param av_class: a libav / ffmpeg object which contains AVOption.
+     */
+	void loadOptions( void* av_class, int req_flags, int rej_flags );
 	
 private:
 	std::vector<Option*> m_options;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ OptionLoader::OptionLoader()`
`20`	`20`
`21`	`21`	`}`
`22`	`22`
`23`		`-void OptionLoader::loadOptions( void* av_class )`
	`23`	`+void OptionLoader::loadOptions( void* av_class, int req_flags, int rej_flags )`
`24`	`24`	`{`
`25`	`25`	`// tmp vectors to access easely to the OptionChoice/OptionGroup to add choice / boolean to them`
`26`	`26`	`std::vector<avtranscoder::OptionChoice*> optionsChoice;`
`@@ -31,7 +31,10 @@ void OptionLoader::loadOptions( void* av_class )`
`31`	`31`
`32`	`32`	`while( ( avOption = av_opt_next( av_class, avOption ) ) != NULL )`
`33`	`33`	`{`
`34`		`- if( !avOption \|\| ! avOption->name )`
	`34`	`+ if( !avOption \|\|`
	`35`	`+ ! avOption->name \|\|`
	`36`	`+ ( avOption->flags & req_flags ) != req_flags \|\|`
	`37`	`+ ( avOption->flags & rej_flags ) )`
`35`	`38`	`{`
`36`	`39`	`continue;`
`37`	`40`	`}`
`@@ -109,6 +112,8 @@ void OptionLoader::loadOptions( void* av_class )`
`109`	`112`	`{`
`110`	`113`	`if( !avOption \|\|`
`111`	`114`	`!avOption->name \|\|`
	`115`	`+ ( avOption->flags & req_flags ) != req_flags \|\|`
	`116`	`+ ( avOption->flags & rej_flags ) \|\|`
`112`	`117`	`( avOption->unit && avOption->type == AV_OPT_TYPE_FLAGS ) \|\|`
`113`	`118`	`( avOption->unit && avOption->type == AV_OPT_TYPE_INT ) )`
`114`	`119`	`{`