Merge pull request #81 from cchampet/dev_option_fix_unit

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 5e2d6af1338c · 2014-09-10T13:04:46.000-07:00
OptionLoader: fix AVOption which correspond to a choice parameter
diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
@@ -16,7 +16,7 @@ OptionType Option::getTypeFromAVOption( const char* unit, AVOptionType avType )
 {
 	if( unit && avType == AV_OPT_TYPE_FLAGS )
 		return TypeGroup;
-	else if( unit && avType == AV_OPT_TYPE_INT )
+	else if( unit && ( avType == AV_OPT_TYPE_INT || avType == AV_OPT_TYPE_INT64 ) )
 		return TypeChoice;
 	else if( unit && avType == AV_OPT_TYPE_CONST )
 		return TypeChild;
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -262,6 +262,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 	// iterate on child options
 	for( std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption )
 	{
+		bool parentFound = false;
 		for( std::multimap<std::string, int>::iterator itUnit = optionUnitToIndex.begin(); itUnit != optionUnitToIndex.end(); ++itUnit )
 		{
 			if( itUnit->first == itOption->getUnit() )
@@ -277,8 +278,16 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 					if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )
 						parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
 				}
+
+				parentFound = true;
+				break;
 			}
         }
+
+		if( ! parentFound )
+		{
+			std::cout << "Warning: Can't find a choice option for " << itOption->getName() << std::endl;
+		}
 	}
 	return options;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ OptionType Option::getTypeFromAVOption( const char* unit, AVOptionType avType )`
`16`	`16`	`{`
`17`	`17`	`if( unit && avType == AV_OPT_TYPE_FLAGS )`
`18`	`18`	`return TypeGroup;`
`19`		`- else if( unit && avType == AV_OPT_TYPE_INT )`
	`19`	`+ else if( unit && ( avType == AV_OPT_TYPE_INT \|\| avType == AV_OPT_TYPE_INT64 ) )`
`20`	`20`	`return TypeChoice;`
`21`	`21`	`else if( unit && avType == AV_OPT_TYPE_CONST )`
`22`	`22`	`return TypeChild;`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla`
`262`	`262`	`// iterate on child options`
`263`	`263`	`for( std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption )`
`264`	`264`	`{`
	`265`	`+ bool parentFound = false;`
`265`	`266`	`for( std::multimap<std::string, int>::iterator itUnit = optionUnitToIndex.begin(); itUnit != optionUnitToIndex.end(); ++itUnit )`
`266`	`267`	`{`
`267`	`268`	`if( itUnit->first == itOption->getUnit() )`
`@@ -277,8 +278,16 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla`
`277`	`278`	`if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )`
`278`	`279`	`parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );`
`279`	`280`	`}`
	`281`	`+`
	`282`	`+ parentFound = true;`
	`283`	`+ break;`
`280`	`284`	`}`
`281`	`285`	`}`
	`286`	`+`
	`287`	`+ if( ! parentFound )`
	`288`	`+ {`
	`289`	`+ std::cout << "Warning: Can't find a choice option for " << itOption->getName() << std::endl;`
	`290`	`+ }`
`282`	`291`	`}`
`283`	`292`	`return options;`
`284`	`293`	`}`