Merge pull request #133 from valnoel/fix_progress_bar_length

cchampet · cchampet · commit 0b16a956b35d · 2014-11-21T15:06:46.000+01:00
Fix progress bar length
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -108,6 +108,8 @@ class AvExport OutputFile
 	virtual void addMetadata( const std::string& key, const std::string& value );
 
 	virtual void setVerbose( bool verbose = false ){ _verbose = verbose; }
+	
+	AVFormatContext& getFormatContext() { return *_formatContext; }
 
 private:
 	std::vector<AvOutputStream*> _outputStreams;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <algorithm>
 #include <sstream>
+#include <libavformat/avformat.h>
 
 namespace avtranscoder
 {
@@ -310,10 +311,15 @@ void Transcoder::process( IProgress& progress )
 	{
 		if( _verbose )
 			std::cout << "process frame " << frame << std::endl;
-		if( ! processFrame() )
-			break;
-		
-		if( progress.progress( 1 / _outputFps * ( frame ), totalDuration ) == eJobStatusCancel )
+
+		bool frameProcessed =  processFrame();
+		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 )
 		{
 			break;
 		}
