From 80ef9d32ee6ad3ac7bd8fdcc3b5eb25e866246ab Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 29 Aug 2016 12:30:46 +0200
Subject: [PATCH 1/3] Option: removed unnecessary insert of options without
 unit to looking for childs

---
 src/AvTranscoder/Option.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
index bd016ff8..c7cc0c50 100644
--- a/src/AvTranscoder/Option.cpp
+++ b/src/AvTranscoder/Option.cpp
@@ -255,7 +255,10 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)
         else
         {
             outOptions.insert(std::make_pair(option.getName(), option));
-            optionUnitToParentName.insert(std::make_pair(option.getUnit(), option.getName()));
+            if(! option.getUnit().empty())
+            {
+                optionUnitToParentName.insert(std::make_pair(option.getUnit(), option.getName()));
+            }
         }
     }
 

From 9f692e9176df42902cf53d574f6a70e96214da53 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 29 Aug 2016 12:32:06 +0200
Subject: [PATCH 2/3] Option: renamed local variables when looking for
 childrens

* Renamed 'itOption' to 'itChild'.
* Renamed 'itParentUnit' to 'itUnitToParents'.
* Added local variables 'parentUnit' and 'parentName'.
---
 src/AvTranscoder/Option.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
index c7cc0c50..0ce2110c 100644
--- a/src/AvTranscoder/Option.cpp
+++ b/src/AvTranscoder/Option.cpp
@@ -263,23 +263,24 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)
     }
 
     // iterate on child options
-    for(std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption)
+    for(std::vector<Option>::iterator itChild = childOptions.begin(); itChild != childOptions.end(); ++itChild)
     {
         bool parentFound = false;
-        for(std::multimap<std::string, std::string>::iterator itUnit = optionUnitToParentName.begin();
-            itUnit != optionUnitToParentName.end(); ++itUnit)
+        for(std::multimap<std::string, std::string>::iterator itUnitToParents = optionUnitToParentName.begin();
+            itUnitToParents != optionUnitToParentName.end(); ++itUnitToParents)
         {
-            if(itUnit->first == itOption->getUnit())
+            const std::string parentUnit = itUnitToParents->first;
+            const std::string parentName = itUnitToParents->second;
+            if(parentUnit == itChild->getUnit())
             {
-                std::string nameParentOption = itUnit->second;
-                Option& parentOption = outOptions.at(nameParentOption);
+                Option& parentOption = outOptions.at(parentName);
 
-                parentOption.appendChild(*itOption);
+                parentOption.appendChild(*itChild);
 
                 // child of a Choice
                 if(parentOption.getType() == eOptionBaseTypeChoice)
                 {
-                    if(itOption->getDefaultInt() == parentOption.getDefaultInt())
+                    if(itChild->getDefaultInt() == parentOption.getDefaultInt())
                         parentOption.setDefaultChildIndex(parentOption.getChilds().size() - 1);
                 }
 
@@ -290,7 +291,7 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)
 
         if(!parentFound)
         {
-            LOG_WARN("Can't find a choice option for " << itOption->getName())
+            LOG_WARN("Can't find a choice option for " << itChild->getName())
         }
     }
 }

From 849b910bfa33b14abc0e920b2e44f8fa2df945ad Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Mon, 29 Aug 2016 12:47:59 +0200
Subject: [PATCH 3/3] Option: fixed missing childs of options with the same
 unit

* LibAV has some options with the same unit. Example, with these video
encoding options with the unit 'cmp_func':
    * subcmp
    * mbcmp
    * ildctcmp
    * precmp
    * skipcmp
* In our code, when looking for the parent options of a given unit, we
use a multimap and the equal_range method.
---
 src/AvTranscoder/Option.cpp | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
index 0ce2110c..b93c153f 100644
--- a/src/AvTranscoder/Option.cpp
+++ b/src/AvTranscoder/Option.cpp
@@ -229,6 +229,7 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)
     if(!av_class)
         return;
 
+    // Use multimap because it is possible to have several parent options with the same unit
     std::multimap<std::string, std::string> optionUnitToParentName;
     std::vector<Option> childOptions;
 
@@ -270,22 +271,28 @@ void loadOptions(OptionMap& outOptions, void* av_class, int req_flags)
             itUnitToParents != optionUnitToParentName.end(); ++itUnitToParents)
         {
             const std::string parentUnit = itUnitToParents->first;
-            const std::string parentName = itUnitToParents->second;
             if(parentUnit == itChild->getUnit())
             {
-                Option& parentOption = outOptions.at(parentName);
-
-                parentOption.appendChild(*itChild);
-
-                // child of a Choice
-                if(parentOption.getType() == eOptionBaseTypeChoice)
+                // Get all the parent options with the same unit
+                std::pair<std::multimap<std::string, std::string>::iterator, std::multimap<std::string, std::string>::iterator> parentOptions = optionUnitToParentName.equal_range(parentUnit);
+                for(std::multimap<std::string, std::string>::iterator itParent = parentOptions.first; itParent != parentOptions.second; ++itParent)
                 {
-                    if(itChild->getDefaultInt() == parentOption.getDefaultInt())
-                        parentOption.setDefaultChildIndex(parentOption.getChilds().size() - 1);
+                    const std::string parentName = itParent->second;
+                    Option& parentOption = outOptions.at(parentName);
+                    parentOption.appendChild(*itChild);
+
+                    // child of a Choice
+                    if(parentOption.getType() == eOptionBaseTypeChoice)
+                    {
+                        if(itChild->getDefaultInt() == parentOption.getDefaultInt())
+                            parentOption.setDefaultChildIndex(parentOption.getChilds().size() - 1);
+                    }
+
+                    parentFound = true;
                 }
 
-                parentFound = true;
-                break;
+                if(parentFound)
+                    break;
             }
         }