util: add typedef OptionArrayMap

Clement Champetier · Clement Champetier · commit 2e6fd674d7dc · 2014-10-31T18:56:45.000+01:00
* Easier to manipulate complexe data (in AvTranscoder and in other
libraries...).
* Remove forward declaration of 'Option': need to include 'Context' to
get 'OptionArray' typedef.
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -261,7 +261,7 @@ std::vector<std::string> getAudioCodecsShortNames()
 	return audioCodecsShortNames;
 }
 
-std::map< std::string, std::vector<Option> > getOutputFormatOptions()
+OptionArrayMap getOutputFormatOptions()
 {
 	av_register_all();
 
@@ -288,7 +288,7 @@ std::map< std::string, std::vector<Option> > getOutputFormatOptions()
 	return optionsPerFormat;
 }
 
-std::map< std::string, std::vector<Option> > getVideoCodecOptions()
+OptionArrayMap getVideoCodecOptions()
 {
 	std::map< std::string, std::vector<Option> > videoCodecOptions;
 	
@@ -319,7 +319,7 @@ std::map< std::string, std::vector<Option> > getVideoCodecOptions()
 	return videoCodecOptions;
 }
 
-std::map< std::string, std::vector<Option> > getAudioCodecOptions()
+OptionArrayMap getAudioCodecOptions()
 {
 	std::map< std::string, std::vector<Option> > audioCodecOptions;
 	
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -3,6 +3,8 @@
 
 #include "common.hpp"
 
+#include <AvTranscoder/option/Context.hpp>
+
 extern "C" {
 #include <libavutil/pixfmt.h>
 #include <libavutil/samplefmt.h>
@@ -15,7 +17,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-class Option;
+typedef std::map<std::string, OptionArray> OptionArrayMap;
 
 /**
 *  @brief Get pixel format supported by a video codec.
@@ -65,17 +67,17 @@ std::vector<std::string> getAudioCodecsShortNames();
 /**
  * @brief Get the list of options for each output format
  */
-std::map< std::string, std::vector<Option> > getOutputFormatOptions();
+OptionArrayMap getOutputFormatOptions();
 
 /**
  * @brief Get the list of options for each video codec
  */
-std::map< std::string, std::vector<Option> > getVideoCodecOptions();
+OptionArrayMap getVideoCodecOptions();
 
 /**
  * @brief Get the list of options for each audio codec
  */
-std::map< std::string, std::vector<Option> > getAudioCodecOptions();
+OptionArrayMap getAudioCodecOptions();
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ std::vector<std::string> getAudioCodecsShortNames()`
`261`	`261`	`return audioCodecsShortNames;`
`262`	`262`	`}`
`263`	`263`
`264`		`-std::map< std::string, std::vector<Option> > getOutputFormatOptions()`
	`264`	`+OptionArrayMap getOutputFormatOptions()`
`265`	`265`	`{`
`266`	`266`	`av_register_all();`
`267`	`267`
`@@ -288,7 +288,7 @@ std::map< std::string, std::vector<Option> > getOutputFormatOptions()`
`288`	`288`	`return optionsPerFormat;`
`289`	`289`	`}`
`290`	`290`
`291`		`-std::map< std::string, std::vector<Option> > getVideoCodecOptions()`
	`291`	`+OptionArrayMap getVideoCodecOptions()`
`292`	`292`	`{`
`293`	`293`	`std::map< std::string, std::vector<Option> > videoCodecOptions;`
`294`	`294`
`@@ -319,7 +319,7 @@ std::map< std::string, std::vector<Option> > getVideoCodecOptions()`
`319`	`319`	`return videoCodecOptions;`
`320`	`320`	`}`
`321`	`321`
`322`		`-std::map< std::string, std::vector<Option> > getAudioCodecOptions()`
	`322`	`+OptionArrayMap getAudioCodecOptions()`
`323`	`323`	`{`
`324`	`324`	`std::map< std::string, std::vector<Option> > audioCodecOptions;`
`325`	`325`