StreamTranscoder: refactoring processFrame

Clement Champetier · Clement Champetier · commit 561f975c059c · 2014-08-12T14:03:34.000+02:00
* If no inputEssence, rewrap.
* Else, transcode.
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -251,22 +251,21 @@ StreamTranscoder::~StreamTranscoder()
 bool StreamTranscoder::processFrame()
 {
 	++_frameProcessed;
-	if( _transform )
+
+	if( ! _inputEssence )
 	{
 		if( _subStreamIndex < 0 )
 		{
-			return processTranscode();
+			return processRewrap();
 		}
-
-		return processTranscode( _subStreamIndex );
+		return processRewrap( _subStreamIndex );
 	}
 
 	if( _subStreamIndex < 0 )
 	{
-		return processRewrap();
+		return processTranscode();
 	}
-
-	return processRewrap( _subStreamIndex );	
+	return processTranscode( _subStreamIndex );	
 }
 
 bool StreamTranscoder::processRewrap()

Original file line number	Diff line number	Diff line change
`@@ -251,22 +251,21 @@ StreamTranscoder::~StreamTranscoder()`
`251`	`251`	`bool StreamTranscoder::processFrame()`
`252`	`252`	`{`
`253`	`253`	`++_frameProcessed;`
`254`		`- if( _transform )`
	`254`	`+`
	`255`	`+ if( ! _inputEssence )`
`255`	`256`	`{`
`256`	`257`	`if( _subStreamIndex < 0 )`
`257`	`258`	`{`
`258`		`- return processTranscode();`
	`259`	`+ return processRewrap();`
`259`	`260`	`}`
`260`		`-`
`261`		`- return processTranscode( _subStreamIndex );`
	`261`	`+ return processRewrap( _subStreamIndex );`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`if( _subStreamIndex < 0 )`
`265`	`265`	`{`
`266`		`- return processRewrap();`
	`266`	`+ return processTranscode();`
`267`	`267`	`}`
`268`		`-`
`269`		`- return processRewrap( _subStreamIndex );`
	`268`	`+ return processTranscode( _subStreamIndex );`
`270`	`269`	`}`
`271`	`270`
`272`	`271`	`bool StreamTranscoder::processRewrap()`