Merge pull request #9 from valnoel/fix_transcoder_progress_computing

cchampet · cchampet · commit 362bf2b1b870 · 2014-12-03T15:12:07.000+01:00
Fix transcoder progress computing
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -291,4 +291,13 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 	}
 }
 
+double OutputFile::getProgressDuration()
+{
+	AVStream* firstOutputStream = _formatContext->streams[0];
+	if( firstOutputStream == NULL )
+		throw std::runtime_error( "at least one stream must be set to get the progress duration" );
+	double duration = av_q2d( firstOutputStream->time_base ) * firstOutputStream->cur_dts;
+	return duration;
+}
+
 }
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -109,7 +109,7 @@ class AvExport OutputFile
 
 	virtual void setVerbose( bool verbose = false ){ _verbose = verbose; }
 	
-	AVFormatContext& getFormatContext() { return *_formatContext; }
+	double getProgressDuration();
 
 private:
 	std::vector<AvOutputStream*> _outputStreams;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -317,10 +317,7 @@ void Transcoder::process( IProgress& progress )
 		if( ! frameProcessed )
 			break;	
 
-		AVStream* firstOutputStream = _outputFile.getFormatContext().streams[0];
-		double duration = av_q2d( firstOutputStream->time_base ) * firstOutputStream->cur_dts;
-
-		if( progress.progress( duration, totalDuration ) == eJobStatusCancel )
+		if( progress.progress( _outputFile.getProgressDuration(), totalDuration ) == eJobStatusCancel )
 		{
 			break;
 		}

Original file line number	Diff line number	Diff line change
`@@ -291,4 +291,13 @@ void OutputFile::setProfile( const ProfileLoader::Profile& profile )`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
	`294`	`+double OutputFile::getProgressDuration()`
	`295`	`+{`
	`296`	`+ AVStream* firstOutputStream = _formatContext->streams[0];`
	`297`	`+ if( firstOutputStream == NULL )`
	`298`	`+ throw std::runtime_error( "at least one stream must be set to get the progress duration" );`
	`299`	`+ double duration = av_q2d( firstOutputStream->time_base ) * firstOutputStream->cur_dts;`
	`300`	`+ return duration;`
	`301`	`+}`
	`302`	`+`
`294`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,7 @@ void Transcoder::process( IProgress& progress )`
`317`	`317`	`if( ! frameProcessed )`
`318`	`318`	`break;`
`319`	`319`
`320`		`- AVStream* firstOutputStream = _outputFile.getFormatContext().streams[0];`
`321`		`- double duration = av_q2d( firstOutputStream->time_base ) * firstOutputStream->cur_dts;`
`322`		`-`
`323`		`- if( progress.progress( duration, totalDuration ) == eJobStatusCancel )`
	`320`	`+ if( progress.progress( _outputFile.getProgressDuration(), totalDuration ) == eJobStatusCancel )`
`324`	`321`	`{`
`325`	`322`	`break;`
`326`	`323`	`}`