Merge pull request #250 from cchampet/dev_propertiesGetCodecPrivateOptions

valnoel · valnoel · commit 31a3f01f8b02 · 2016-05-26T14:00:47.000+02:00
StreamProperties: added list of private codec options
diff --git 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
@@ -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
diff --git 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
@@ -509,7 +509,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
                                 positionOfLastKeyFrame = count;
                         }
 
-                        ++count;
+                        _gopSize = ++count;
                     }
                 }
                 av_free_packet(&pkt);

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ size_t VideoProperties::getBitRate() const`
`334`	`334`	`throw std::runtime_error("cannot compute bit rate: invalid frame size");`
`335`	`335`
`336`	`336`	`// Needed to get the gop size`
`337`		`- if(_levelAnalysis < eAnalyseLevelFirstGop)`
	`337`	`+ if(getGopSize() == 0)`
`338`	`338`	`throw std::runtime_error("cannot compute bit rate: need to get info from the first gop (see eAnalyseLevelFirstGop)");`
`339`	`339`
`340`	`340`	`// discard no frame type when decode`
`@@ -509,7 +509,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)`
`509`	`509`	`positionOfLastKeyFrame = count;`
`510`	`510`	`}`
`511`	`511`
`512`		`- ++count;`
	`512`	`+ _gopSize = ++count;`
`513`	`513`	`}`
`514`	`514`	`}`
`515`	`515`	`av_free_packet(&pkt);`