Merge pull request #65 from cchampet/clean_outputTimeBase

valnoel · valnoel · commit 8f8350984a0f · 2015-01-26T11:52:55.000+01:00
OutputFile: refactore getProgressDuration
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -112,10 +112,7 @@ IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const si
 
 	av_free_packet( &packet );
 
-	// compute the duration of current stream
-	AVStream& currentStream = _formatContext.getAVStream( streamId );
-	double currentStreamDuration = (double)currentStream.cur_dts * currentStream.time_base.num / currentStream.time_base.den;
-
+	double currentStreamDuration = getProgressDuration( 0 );
 	if( currentStreamDuration < _previousProcessedStreamDuration )
 	{
 		// if the current stream is strictly shorter than the previous, wait for more data
@@ -197,12 +194,10 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 	}
 }
 
-double OutputFile::getProgressDuration()
+double OutputFile::getProgressDuration( const size_t streamIndex )
 {
-	if( _formatContext.getNbStreams() == 0 )
-		throw std::runtime_error( "at least one stream must be set to get the progress duration" );
-	AVStream& firstOutputStream = _formatContext.getAVStream( 0 );
-	return av_q2d( firstOutputStream.time_base ) * firstOutputStream.cur_dts;
+	AVStream& outputStream = _formatContext.getAVStream( streamIndex );
+	return av_q2d( outputStream.time_base ) * outputStream.cur_dts;
 }
 
 }
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -102,8 +102,9 @@ class AvExport OutputFile
 	virtual void addMetadata( const std::string& key, const std::string& value );
 
 	virtual void setVerbose( bool verbose = false ){ _verbose = verbose; }
-	
-	virtual double getProgressDuration();
+
+	/// By default get the duration, in seconds, of the first output stream
+	virtual double getProgressDuration( const size_t streamIndex = 0 );
 
 private:
 	FormatContext _formatContext;

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,7 @@ IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const si`
`112`	`112`
`113`	`113`	`av_free_packet( &packet );`
`114`	`114`
`115`		`- // compute the duration of current stream`
`116`		`- AVStream& currentStream = _formatContext.getAVStream( streamId );`
`117`		`- double currentStreamDuration = (double)currentStream.cur_dts * currentStream.time_base.num / currentStream.time_base.den;`
`118`		`-`
	`115`	`+ double currentStreamDuration = getProgressDuration( 0 );`
`119`	`116`	`if( currentStreamDuration < _previousProcessedStreamDuration )`
`120`	`117`	`{`
`121`	`118`	`// if the current stream is strictly shorter than the previous, wait for more data`
`@@ -197,12 +194,10 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )`
`197`	`194`	`}`
`198`	`195`	`}`
`199`	`196`
`200`		`-double OutputFile::getProgressDuration()`
	`197`	`+double OutputFile::getProgressDuration( const size_t streamIndex )`
`201`	`198`	`{`
`202`		`- if( _formatContext.getNbStreams() == 0 )`
`203`		`- throw std::runtime_error( "at least one stream must be set to get the progress duration" );`
`204`		`- AVStream& firstOutputStream = _formatContext.getAVStream( 0 );`
`205`		`- return av_q2d( firstOutputStream.time_base ) * firstOutputStream.cur_dts;`
	`199`	`+ AVStream& outputStream = _formatContext.getAVStream( streamIndex );`
	`200`	`+ return av_q2d( outputStream.time_base ) * outputStream.cur_dts;`
`206`	`201`	`}`
`207`	`202`
`208`	`203`	`}`