Merge branch 'develop' of github.com:avTranscoder/avTranscoder into dev_docker

Marc-Antoine Arnaud · Marc-Antoine Arnaud · commit fe478ff1a5b0 · 2016-11-22T17:21:33.000+01:00
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -3,7 +3,7 @@
 
 #define AVTRANSCODER_VERSION_MAJOR 0
 #define AVTRANSCODER_VERSION_MINOR 11
-#define AVTRANSCODER_VERSION_MICRO 1
+#define AVTRANSCODER_VERSION_MICRO 2
 
 #include <AvTranscoder/system.hpp>
 
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -432,7 +432,12 @@ int VideoProperties::getLevel() const
 
 float VideoProperties::getFps() const
 {
-    return av_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);
+    if(! _formatContext)
+        throw std::runtime_error("unknown format context");
+
+    if(_formatContext->streams[_streamIndex]->avg_frame_rate.den)
+        return av_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);
+    return av_q2d(av_inv_q(getTimeBase()));
 }
 
 float VideoProperties::getDuration() const
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -64,6 +64,7 @@ class AvExport VideoProperties : public StreamProperties
 
     /**
      * @brief Corresponds to the 'fps' returned by ffprobe.
+     * @note If the average framerate is not defined in the format, return the tbn.
      * fps = the average framerate that has come from the AVStream
      * tbn = the time base in AVStream that has come from the AVStream
      * tbc = the time base in AVCodecContext for the codec used for a particular stream

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,12 @@ int VideoProperties::getLevel() const`
`432`	`432`
`433`	`433`	`float VideoProperties::getFps() const`
`434`	`434`	`{`
`435`		`- return av_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);`
	`435`	`+ if(! _formatContext)`
	`436`	`+ throw std::runtime_error("unknown format context");`
	`437`	`+`
	`438`	`+ if(_formatContext->streams[_streamIndex]->avg_frame_rate.den)`
	`439`	`+ return av_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);`
	`440`	`+ return av_q2d(av_inv_q(getTimeBase()));`
`436`	`441`	`}`
`437`	`442`
`438`	`443`	`float VideoProperties::getDuration() const`