From 77212f48f972b5e9a7241eed949eb5b8735ee99f Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 25 May 2016 10:43:28 +0200
Subject: [PATCH 1/3] StreamProperties: added list of private codec options

Do not print them with other properties, since:
* they are very specific options.
* not all of them can be printed.
* we can access them with getter methods (getCodecOptions).
---
 .../properties/StreamProperties.cpp           | 23 +++++++++++++++++++
 .../properties/StreamProperties.hpp           | 14 +++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
index 1bc28f31..65dd8c9d 100644
--- a/src/AvTranscoder/properties/StreamProperties.cpp
+++ b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -28,8 +28,21 @@ StreamProperties::StreamProperties(const FormatContext& formatContext, const siz
         _codecContext = _formatContext->streams[_streamIndex]->codec;
     }
 
+    // find the decoder
     if(_formatContext && _codecContext)
+    {
         _codec = avcodec_find_decoder(_codecContext->codec_id);
+
+        if(_codec)
+        {
+            // load specific options of the codec
+            if(avcodec_open2(_codecContext, _codec, NULL) == 0)
+            {
+                loadOptions(_options, _codecContext);
+                avcodec_close(_codecContext);
+            }
+        }
+    }
 }
 
 StreamProperties::~StreamProperties()
@@ -98,6 +111,16 @@ std::string StreamProperties::getCodecLongName() const
     return std::string(_codec->long_name);
 }
 
+std::vector<Option> StreamProperties::getCodecOptions()
+{
+    std::vector<Option> optionsArray;
+    for(OptionMap::iterator it = _options.begin(); it != _options.end(); ++it)
+    {
+        optionsArray.push_back(it->second);
+    }
+    return optionsArray;
+}
+
 PropertyVector StreamProperties::asVector() const
 {
     PropertyVector propertyVector;
diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
index f3c68e04..363cb2f9 100644
--- a/src/AvTranscoder/properties/StreamProperties.hpp
+++ b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -2,6 +2,7 @@
 #define _AV_TRANSCODER_MEDIA_PROPERTY_STREAM_PROPERTIES_HPP
 
 #include <AvTranscoder/common.hpp>
+#include <AvTranscoder/Option.hpp>
 #include <AvTranscoder/properties/util.hpp>
 #include <AvTranscoder/file/FormatContext.hpp>
 
@@ -27,6 +28,17 @@ class AvExport StreamProperties
 
     const PropertyVector& getMetadatas() const { return _metadatas; }
 
+    /**
+     * @return The list of private codec options.
+     * @see getOptionsMap
+     * @see getOption
+     */
+    OptionArray getCodecOptions();
+#ifndef SWIG
+    OptionMap& getCodecOptionsMap() { return _options; } ///< Get options as map
+#endif
+    Option& getCodecOption(const std::string& optionName) { return _options.at(optionName); }
+
 #ifndef SWIG
     const AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 #endif
@@ -59,6 +71,8 @@ class AvExport StreamProperties
 
     size_t _streamIndex;
     PropertyVector _metadatas;
+
+    OptionMap _options;
 };
 
 #ifndef SWIG

From 07a811f02247904ad6fa207f8e638bc1d362c3fe Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 25 May 2016 15:39:34 +0200
Subject: [PATCH 2/3] VideoProperties: fixed gopSize property in case of image

* Images are considered as video streams with one frame by ffmpeg.
* We cannot compute a gop size as a distance between two I frames.
* So we set the gop size by iteration.
---
 src/AvTranscoder/properties/VideoProperties.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
index e2e56c1e..280b5733 100644
--- a/src/AvTranscoder/properties/VideoProperties.cpp
+++ b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -509,7 +509,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
                                 positionOfLastKeyFrame = count;
                         }
 
-                        ++count;
+                        _gopSize = ++count;
                     }
                 }
                 av_free_packet(&pkt);

From 2890f5ba938fbad4b3ced47fec1e6b02fc7912b5 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Wed, 25 May 2016 15:41:03 +0200
Subject: [PATCH 3/3] VideoProperties: fixed potential floating point errors
 when getBitRate

We could analyse first gop and don't retreive the gop size (in case of a
decoding error).
---
 src/AvTranscoder/properties/VideoProperties.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
index 280b5733..6891345a 100644
--- a/src/AvTranscoder/properties/VideoProperties.cpp
+++ b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -334,7 +334,7 @@ size_t VideoProperties::getBitRate() const
         throw std::runtime_error("cannot compute bit rate: invalid frame size");
 
     // Needed to get the gop size
-    if(_levelAnalysis < eAnalyseLevelFirstGop)
+    if(getGopSize() == 0)
         throw std::runtime_error("cannot compute bit rate: need to get info from the first gop (see eAnalyseLevelFirstGop)");
 
     // discard no frame type when decode