NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commit849b910

Clement Champetier

committed

Option: fixed missing childs of options with the same unit

* LibAV has some options with the same unit. Example, with these videoencoding options with the unit 'cmp_func': * subcmp * mbcmp * ildctcmp * precmp * skipcmp* In our code, when looking for the parent options of a given unit, weuse a multimap and the equal_range method.

1 parent9f692e9 commit849b910Copy full SHA for 849b910

File tree

1 file changed

+18

-11

lines changed

src/AvTranscoder
- Option.cpp

1 file changed

+18

-11

lines changed

`‎src/AvTranscoder/Option.cpp`

Lines changed: 18 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)`
`229`	`229`	`if(!av_class)`
`230`	`230`	`return;`
`231`	`231`
	`232`	`+// Use multimap because it is possible to have several parent options with the same unit`
`232`	`233`	`std::multimap<std::string, std::string> optionUnitToParentName;`
`233`	`234`	`std::vector<Option> childOptions;`
`234`	`235`
`@@ -270,22 +271,28 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)`
`270`	`271`	`itUnitToParents != optionUnitToParentName.end(); ++itUnitToParents)`
`271`	`272`	`{`
`272`	`273`	`const std::string parentUnit = itUnitToParents->first;`
`273`		`-const std::string parentName = itUnitToParents->second;`
`274`	`274`	`if(parentUnit == itChild->getUnit())`
`275`	`275`	`{`
`276`		`- Option& parentOption = outOptions.at(parentName);`
`277`		`-`
`278`		`- parentOption.appendChild(*itChild);`
`279`		`-`
`280`		`-// child of a Choice`
`281`		`-if(parentOption.getType() == eOptionBaseTypeChoice)`
	`276`	`+// Get all the parent options with the same unit`
	`277`	`+ std::pair<std::multimap<std::string, std::string>::iterator, std::multimap<std::string, std::string>::iterator> parentOptions = optionUnitToParentName.equal_range(parentUnit);`
	`278`	`+for(std::multimap<std::string, std::string>::iterator itParent = parentOptions.first; itParent != parentOptions.second; ++itParent)`
`282`	`279`	`{`
`283`		`-if(itChild->getDefaultInt() == parentOption.getDefaultInt())`
`284`		`- parentOption.setDefaultChildIndex(parentOption.getChilds().size() -1);`
	`280`	`+const std::string parentName = itParent->second;`
	`281`	`+ Option& parentOption = outOptions.at(parentName);`
	`282`	`+ parentOption.appendChild(*itChild);`
	`283`	`+`
	`284`	`+// child of a Choice`
	`285`	`+if(parentOption.getType() == eOptionBaseTypeChoice)`
	`286`	`+ {`
	`287`	`+if(itChild->getDefaultInt() == parentOption.getDefaultInt())`
	`288`	`+ parentOption.setDefaultChildIndex(parentOption.getChilds().size() -1);`
	`289`	`+ }`
	`290`	`+`
	`291`	`+ parentFound =true;`
`285`	`292`	`}`
`286`	`293`
`287`		`- parentFound =true;`
`288`		`-break;`
	`294`	`+if(parentFound)`
	`295`	`+break;`
`289`	`296`	`}`
`290`	`297`	`}`
`291`	`298`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit849b910

File tree

1 file changed

1 file changed

`‎src/AvTranscoder/Option.cpp`

0 commit comments