Transcoder: fixed how to process a frame for each stream

Clement Champetier · Clement Champetier · commit 95d9d420c911 · 2016-01-04T17:17:02.000+01:00
* Try to process a new frame for each stream (do not exit the method if
a stream failed to process).
* Skip the generated streams because they always succeed.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -209,16 +209,33 @@ bool Transcoder::processFrame()
 	if( _streamTranscoders.size() == 0 )
 		return false;
 
+	// For each stream, process a frame
+	size_t nbStreamProcessStatusFailed = 0;
 	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
 	{
 		LOG_DEBUG( "Process stream " << streamIndex << "/" << ( _streamTranscoders.size() - 1 ) )
-
-		bool streamProcessStatus = _streamTranscoders.at( streamIndex )->processFrame();
-		if( ! streamProcessStatus )
+		const bool currentStreamProcessStatus = _streamTranscoders.at( streamIndex )->processFrame();
+		if( ! currentStreamProcessStatus )
 		{
-			return false;
+			LOG_WARN( "Failed to process stream " << streamIndex )
+			++nbStreamProcessStatusFailed;
 		}
 	}
+
+	// Get the number of streams without the generators (they always succeed)
+	size_t nbStreamsWithoutGenerator = _streamTranscoders.size();
+	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
+	{
+		if( _streamTranscoders.at( streamIndex )->getProcessCase() == StreamTranscoder::eProcessCaseGenerator )
+			--nbStreamsWithoutGenerator;
+	}
+
+	// If all streams failed to process a new frame
+	if( nbStreamsWithoutGenerator != 0 && nbStreamProcessStatusFailed == nbStreamsWithoutGenerator )
+	{
+		LOG_INFO( "End of process because all streams (except generators) failed to process a new frame." )
+		return false;
+	}
 	return true;
 }
 
