StreamProperties: update getDuration method

Clement Champetier · Clement Champetier · commit c8ddd63e5c58 · 2016-05-03T16:50:57.000+02:00
Throw a runtime_error if the duration is unknown.
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -53,7 +53,10 @@ Rational StreamProperties::getTimeBase() const
 float StreamProperties::getDuration() const
 {
     const Rational timeBase = getTimeBase();
-    return av_q2d(timeBase) * _formatContext->streams[_streamIndex]->duration;
+    const size_t streamDurationInStreamTimeBase = _formatContext->streams[_streamIndex]->duration;
+    if(streamDurationInStreamTimeBase == (size_t)AV_NOPTS_VALUE)
+        throw std::runtime_error("unknown stream duration");
+    return av_q2d(timeBase) * streamDurationInStreamTimeBase;
 }
 
 AVMediaType StreamProperties::getStreamType() const
diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -18,6 +18,13 @@ class AvExport StreamProperties
     size_t getStreamIndex() const { return _streamIndex; }
     size_t getStreamId() const;
     Rational getTimeBase() const;
+
+    /**
+     * @return duration of the stream in seconds
+     * @throw runtime_error if the duration is unknown
+     * @note If a source file does not specify a duration, but does specify
+     * a bitrate, this value will be estimated from bitrate and file size.
+     */
     float getDuration() const; ///< in seconds
     AVMediaType getStreamType() const;
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,10 @@ Rational StreamProperties::getTimeBase() const`
`53`	`53`	`float StreamProperties::getDuration() const`
`54`	`54`	`{`
`55`	`55`	`const Rational timeBase = getTimeBase();`
`56`		`- return av_q2d(timeBase) * _formatContext->streams[_streamIndex]->duration;`
	`56`	`+ const size_t streamDurationInStreamTimeBase = _formatContext->streams[_streamIndex]->duration;`
	`57`	`+ if(streamDurationInStreamTimeBase == (size_t)AV_NOPTS_VALUE)`
	`58`	`+ throw std::runtime_error("unknown stream duration");`
	`59`	`+ return av_q2d(timeBase) * streamDurationInStreamTimeBase;`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`AVMediaType StreamProperties::getStreamType() const`