minor fixes

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit ee07f9d14db9 · 2014-06-27T11:49:28.000-04:00
diff --git a/src/AvTranscoder/StreamTranscoder.hpp b/src/AvTranscoder/StreamTranscoder.hpp
@@ -28,7 +28,7 @@ class StreamTranscoder
 	bool isTranscodeStream() const { return _transcodeStream; }
 
 private:
-	AvInputStream* _stream;
+	InputStream* _stream;
 
 	Frame*      _frameBuffer;
 	Image*      _videoFrameBuffer;
diff --git a/src/AvTranscoder/Transcoder.cpp b/src/AvTranscoder/Transcoder.cpp
@@ -1,4 +1,4 @@
-#include "Transcoder.tcc"
+#include "Transcoder.hpp"
 
 #include <AvTranscoder/AvInputStream.hpp>
 
@@ -117,7 +117,7 @@ void Transcoder::add( const InputStreamsDesc& streamDefs )
 }
 
 
-void Transcoder::processFrame()
+bool Transcoder::processFrame()
 {
 	for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )
 	{
@@ -131,12 +131,13 @@ void Transcoder::processFrame()
 
 	if( _inputStreams.size() == 0 )
 	{
-		break;
+		return false;
 	}
 	for( size_t i = 0; i < _streamTranscoders.size(); ++i )
 	{
 		_streamTranscoders.at( i )->processFrame();
 	}
+	return true;
 }
 
 
@@ -164,7 +165,8 @@ void Transcoder::process( ProgressListener& progress )
 			break;
 		}
 
-		processFrame();
+		if( ! processFrame() )
+			break;
 
 		++frame;
 	}
diff --git a/src/AvTranscoder/Transcoder.hpp b/src/AvTranscoder/Transcoder.hpp
@@ -41,7 +41,7 @@ class Transcoder
 	void add( const std::string& filename, const size_t streamIndex, const std::string& profile );
 	void add( const InputStreamsDesc& streamDefs );
 
-	void processFrame();
+	bool processFrame();
 
 	void process( ProgressListener& progress );
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Transcoder.tcc"`
	`1`	`+#include "Transcoder.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/AvInputStream.hpp>`
`4`	`4`
`@@ -117,7 +117,7 @@ void Transcoder::add( const InputStreamsDesc& streamDefs )`
`117`	`117`	`}`
`118`	`118`
`119`	`119`
`120`		`-void Transcoder::processFrame()`
	`120`	`+bool Transcoder::processFrame()`
`121`	`121`	`{`
`122`	`122`	`for( size_t streamIndex = 0; streamIndex < _inputStreams.size(); ++streamIndex )`
`123`	`123`	`{`
`@@ -131,12 +131,13 @@ void Transcoder::processFrame()`
`131`	`131`
`132`	`132`	`if( _inputStreams.size() == 0 )`
`133`	`133`	`{`
`134`		`- break;`
	`134`	`+ return false;`
`135`	`135`	`}`
`136`	`136`	`for( size_t i = 0; i < _streamTranscoders.size(); ++i )`
`137`	`137`	`{`
`138`	`138`	`_streamTranscoders.at( i )->processFrame();`
`139`	`139`	`}`
	`140`	`+ return true;`
`140`	`141`	`}`
`141`	`142`
`142`	`143`
`@@ -164,7 +165,8 @@ void Transcoder::process( ProgressListener& progress )`
`164`	`165`	`break;`
`165`	`166`	`}`
`166`	`167`
`167`		`- processFrame();`
	`168`	`+ if( ! processFrame() )`
	`169`	`+ break;`
`168`	`170`
`169`	`171`	`++frame;`
`170`	`172`	`}`