Video/AudioProperties: fix check of AVFormatContext when getTimeBase

Clement Champetier · Clement Champetier · commit 427b9b28a9ef · 2015-01-19T19:26:57.000+01:00
Remove check of AVFormatContext when getDuration.
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -172,8 +172,8 @@ size_t AudioProperties::getTicksPerFrame() const
 
 Rational AudioProperties::getTimeBase() const
 {
-	if( ! _codecContext )
-		throw std::runtime_error( "unknown codec context" );
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
 
 	Rational timeBase = {
 		_formatContext->streams[_streamId]->time_base.num,
@@ -193,9 +193,6 @@ double AudioProperties::getFps() const
 
 double AudioProperties::getDuration() const
 {
-	if( ! _formatContext )
-		throw std::runtime_error( "unknown format context" );
-
 	Rational timeBase = getTimeBase();
 	double duration = ( timeBase.num / (double) timeBase.den ) * _formatContext->streams[_streamId]->duration;
 	return duration;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -337,8 +337,8 @@ std::string VideoProperties::getStartTimecodeString() const
 
 Rational VideoProperties::getTimeBase() const
 {
-	if( ! _codecContext )
-		throw std::runtime_error( "unknown codec context" );
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
 
 	Rational timeBase = {
 		_formatContext->streams[_streamId]->time_base.num,
@@ -479,9 +479,6 @@ double VideoProperties::getFps() const
 
 double VideoProperties::getDuration() const
 {
-	if( ! _formatContext )
-		throw std::runtime_error( "unknown format context" );
-
 	Rational timeBase = getTimeBase();
 	double duration = ( timeBase.num / (double) timeBase.den ) * _formatContext->streams[_streamId]->duration;
 	return duration;
