StreamTranscoder: fix preProcessCodecLatency on rewrap cases

Clement Champetier · Clement Champetier · commit 8da854967be2 · 2015-04-21T17:43:41.000+02:00
A rewrap case can need to transcode at specific moments:
* if there is an offset at the beginning
* if it continues with a generator at the end of the rewrap.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -305,10 +305,6 @@ StreamTranscoder::~StreamTranscoder()
 
 void StreamTranscoder::preProcessCodecLatency()
 {
-	// rewrap case: no need to take care of the latency of codec
-	if( ! _currentDecoder )
-		return;
-
 	int latency = _outputEncoder->getCodec().getLatency();
 
 	LOG_DEBUG( "Latency of stream: " << latency )
@@ -317,6 +313,10 @@ void StreamTranscoder::preProcessCodecLatency()
 		latency < _outputEncoder->getCodec().getAVCodecContext().frame_number )
 		return;
 
+	// set a decoder to preload generated frames
+	if( isRewrapCase() )
+		switchToGeneratorDecoder();
+
 	while( ( latency-- ) > 0 )
 	{
 		processFrame();
@@ -325,7 +325,7 @@ void StreamTranscoder::preProcessCodecLatency()
 
 bool StreamTranscoder::processFrame()
 {
-	if( ! _currentDecoder )
+	if( isRewrapCase() )
 	{
 		return processRewrap();
 	}

Original file line number	Diff line number	Diff line change
`@@ -305,10 +305,6 @@ StreamTranscoder::~StreamTranscoder()`
`305`	`305`
`306`	`306`	`void StreamTranscoder::preProcessCodecLatency()`
`307`	`307`	`{`
`308`		`- // rewrap case: no need to take care of the latency of codec`
`309`		`- if( ! _currentDecoder )`
`310`		`- return;`
`311`		`-`
`312`	`308`	`int latency = _outputEncoder->getCodec().getLatency();`
`313`	`309`
`314`	`310`	`LOG_DEBUG( "Latency of stream: " << latency )`
`@@ -317,6 +313,10 @@ void StreamTranscoder::preProcessCodecLatency()`
`317`	`313`	`latency < _outputEncoder->getCodec().getAVCodecContext().frame_number )`
`318`	`314`	`return;`
`319`	`315`
	`316`	`+ // set a decoder to preload generated frames`
	`317`	`+ if( isRewrapCase() )`
	`318`	`+ switchToGeneratorDecoder();`
	`319`	`+`
`320`	`320`	`while( ( latency-- ) > 0 )`
`321`	`321`	`{`
`322`	`322`	`processFrame();`
`@@ -325,7 +325,7 @@ void StreamTranscoder::preProcessCodecLatency()`
`325`	`325`
`326`	`326`	`bool StreamTranscoder::processFrame()`
`327`	`327`	`{`
`328`		`- if( ! _currentDecoder )`
	`328`	`+ if( isRewrapCase() )`
`329`	`329`	`{`
`330`	`330`	`return processRewrap();`
`331`	`331`	`}`