StreamTranscoder: remove unused attribute _offsetPassed

Clement Champetier · Clement Champetier · commit f8c386b41501 · 2015-02-04T16:01:25.000+01:00
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -38,7 +38,6 @@ StreamTranscoder::StreamTranscoder(
 	, _offset( 0 )
 	, _canSwitchToGenerator( false )
 	, _verbose( false )
-	, _offsetPassed( false )
 {
 	// create a re-wrapping case
 	switch( _inputStream->getStreamType() )
@@ -84,7 +83,6 @@ StreamTranscoder::StreamTranscoder(
 	, _offset( offset )
 	, _canSwitchToGenerator( false )
 	, _verbose( false )
-	, _offsetPassed( false )
 {
 	// create a transcode case
 	switch( _inputStream->getStreamType() )
@@ -183,7 +181,6 @@ StreamTranscoder::StreamTranscoder(
 	, _offset( 0 )
 	, _canSwitchToGenerator( false )
 	, _verbose( false )
-	, _offsetPassed( false )
 {
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
@@ -330,13 +327,9 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 		std::cout << "transcode a frame " << std::endl;
 
 	// check offset
-	if( _offset &&
-		_frameProcessed > _offset &&
-		! _offsetPassed &&
-		_canSwitchToGenerator )
+	if( _offset && _frameProcessed == _offset + 1 )
 	{
 		switchToInputDecoder();
-		_offsetPassed = true;
 	}
 
 	bool decodingStatus = false;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -103,7 +103,6 @@ class AvExport StreamTranscoder
 
 	bool _canSwitchToGenerator;  ///< Automatically switch to a generator at the end of the stream
 	bool _verbose;
-	bool _offsetPassed;  ///< Is the offset at the beginning of the stream is finished.
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ StreamTranscoder::StreamTranscoder(`
`38`	`38`	`, _offset( 0 )`
`39`	`39`	`, _canSwitchToGenerator( false )`
`40`	`40`	`, _verbose( false )`
`41`		`- , _offsetPassed( false )`
`42`	`41`	`{`
`43`	`42`	`// create a re-wrapping case`
`44`	`43`	`switch( _inputStream->getStreamType() )`
`@@ -84,7 +83,6 @@ StreamTranscoder::StreamTranscoder(`
`84`	`83`	`, _offset( offset )`
`85`	`84`	`, _canSwitchToGenerator( false )`
`86`	`85`	`, _verbose( false )`
`87`		`- , _offsetPassed( false )`
`88`	`86`	`{`
`89`	`87`	`// create a transcode case`
`90`	`88`	`switch( _inputStream->getStreamType() )`
`@@ -183,7 +181,6 @@ StreamTranscoder::StreamTranscoder(`
`183`	`181`	`, _offset( 0 )`
`184`	`182`	`, _canSwitchToGenerator( false )`
`185`	`183`	`, _verbose( false )`
`186`		`- , _offsetPassed( false )`
`187`	`184`	`{`
`188`	`185`	`if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )`
`189`	`186`	`{`
`@@ -330,13 +327,9 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )`
`330`	`327`	`std::cout << "transcode a frame " << std::endl;`
`331`	`328`
`332`	`329`	`// check offset`
`333`		`- if( _offset &&`
`334`		`- _frameProcessed > _offset &&`
`335`		`- ! _offsetPassed &&`
`336`		`- _canSwitchToGenerator )`
	`330`	`+ if( _offset && _frameProcessed == _offset + 1 )`
`337`	`331`	`{`
`338`	`332`	`switchToInputDecoder();`
`339`		`- _offsetPassed = true;`
`340`	`333`	`}`
`341`	`334`
`342`	`335`	`bool decodingStatus = false;`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ class AvExport StreamTranscoder`
`103`	`103`
`104`	`104`	`bool _canSwitchToGenerator; ///< Automatically switch to a generator at the end of the stream`
`105`	`105`	`bool _verbose;`
`106`		`- bool _offsetPassed; ///< Is the offset at the beginning of the stream is finished.`
`107`	`106`	`};`
`108`	`107`
`109`	`108`	`}`