Wrapping: feed the wrapper when waiting for data (from the same stream) to complete wrapping

Valentin Noel · Valentin Noel · commit 54a6e3e05096 · 2014-11-21T17:49:41.000+01:00
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -303,7 +303,19 @@ bool StreamTranscoder::processRewrap()
 	if( ! _inputStream->readNextPacket( data ) )
 		return false;
 
-	_outputStream->wrap( data );
+	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
+
+	switch( wrappingStatus )
+	{
+		case IOutputStream::eWrappingSuccess:
+			return true;
+		case IOutputStream::eWrappingWaitingForData:
+			// the wrapper needs more data to write the current packet
+			return processRewrap();
+		case IOutputStream::eWrappingError:
+			return false;
+	}
+
 	return true;
 }
 
@@ -355,7 +367,20 @@ bool StreamTranscoder::processTranscode()
 
 	if( _verbose )
 		std::cout << "wrap (" << data.getSize() << ")" << std::endl;
-	_outputStream->wrap( data );
+
+	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
+
+	switch( wrappingStatus )
+	{
+		case IOutputStream::eWrappingSuccess:
+			return true;
+		case IOutputStream::eWrappingWaitingForData:
+			// the wrapper needs more data to write the current packet
+			return processTranscode();
+		case IOutputStream::eWrappingError:
+			return false;
+	}
+
 	return true;
 }
 
@@ -406,7 +431,20 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	}
 	if( _verbose )
 		std::cout << "wrap (" << data.getSize() << ")" << std::endl;
-	_outputStream->wrap( data );
+
+	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
+
+	switch( wrappingStatus )
+	{
+		case IOutputStream::eWrappingSuccess:
+			return true;
+		case IOutputStream::eWrappingWaitingForData:
+			// the wrapper needs more data to write the current packet
+			return processTranscode( subStreamIndex );
+		case IOutputStream::eWrappingError:
+			return false;
+	}
+	
 	return true;
 }
 
