Transcoder & StreamTranscoder: clean

Clement Champetier · Clement Champetier · commit 639768d9cf7f · 2014-08-07T14:06:32.000+02:00
* Remove unused bool _transcodeStream and function isTranscodeStream.
* Suppress spaces.
* Suppress comments.
* Add verbose (symmetry between processTranscode functions).
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -35,7 +35,6 @@ StreamTranscoder::StreamTranscoder(
 	, _subStreamIndex( -1 )
 	, _frameProcessed( 0 )
 	, _offset( 0 )
-	, _transcodeStream( false )
 	, _takeFromDummy( false )
 	, _verbose( false )
 	, _offsetPassed( false )
@@ -77,7 +76,6 @@ StreamTranscoder::StreamTranscoder(
 	, _subStreamIndex( subStreamIndex )
 	, _frameProcessed( 0 )
 	, _offset( offset )
-	, _transcodeStream( true )
 	, _takeFromDummy( false )
 	, _verbose( false )
 	, _offsetPassed( false )
@@ -153,7 +151,6 @@ StreamTranscoder::StreamTranscoder(
 			break;
 		}
 	}
-	
 	switchEssence( offset != 0 );
 }
 
@@ -173,7 +170,6 @@ StreamTranscoder::StreamTranscoder(
 	, _subStreamIndex( -1 )
 	, _frameProcessed( 0 )
 	, _offset( 0 )
-	, _transcodeStream( true )
 	, _takeFromDummy( false )
 	, _verbose( false )
 	, _offsetPassed( false )
@@ -250,7 +246,7 @@ StreamTranscoder::~StreamTranscoder()
 bool StreamTranscoder::processFrame()
 {
 	++_frameProcessed;
-	if( _transcodeStream )
+	if( _transform )
 	{
 		if( _subStreamIndex < 0 )
 		{
@@ -288,12 +284,10 @@ bool StreamTranscoder::processRewrap( const int subStreamIndex )
 	assert( _outputStream != NULL );
 	
 	DataStream dataStream;
-	// std::vector<DataStream> dataStream;
 
 	if( ! _inputStream->readNextPacket( dataStream ) )
 		return false;
 	_outputStream->wrap( dataStream );
-	// outputStream.wrap( dataStream.at( subStreamIndex ) );
 
 	return true;
 }
@@ -383,6 +377,8 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	}
 	else
 	{
+		if( _verbose )
+			std::cout << "encode last frame(s)" << std::endl;
 		if( ! _outputEssence->encodeFrame( dataStream ) )
 		{
 			if( _infinityStream )
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -45,15 +45,14 @@ class StreamTranscoder
 	 */
 	bool processFrame();
 
-	bool isTranscodeStream() const { return _transcodeStream; }
-
-	void setVerbose( bool verbose = true ){ _verbose = verbose; }
-
 	void switchEssence( bool swithToDummy = true );
 	void switchToDummyEssence();
 	void switchToInputEssence();
 
+	void setVerbose( bool verbose = true ){ _verbose = verbose; }
+
 	void setInfinityStream( bool isInfinity ) { _infinityStream = isInfinity; }
+
 	void setOffset( bool offset = true ){ _offset = offset; }
 
 	/**
@@ -93,7 +92,6 @@ class StreamTranscoder
 	 */
 	size_t _offset;
 
-	bool _transcodeStream;
 	bool _takeFromDummy;
 
 	bool _verbose;
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -80,7 +80,6 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 	_profile.update( profileDesc );
 	if( ! filename.length() )
 	{
-		// if( _verbose )
 		std::cerr << "can't add a stream with no filename indicated" << std::endl;
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ StreamTranscoder::StreamTranscoder(`
`35`	`35`	`, _subStreamIndex( -1 )`
`36`	`36`	`, _frameProcessed( 0 )`
`37`	`37`	`, _offset( 0 )`
`38`		`- , _transcodeStream( false )`
`39`	`38`	`, _takeFromDummy( false )`
`40`	`39`	`, _verbose( false )`
`41`	`40`	`, _offsetPassed( false )`
`@@ -77,7 +76,6 @@ StreamTranscoder::StreamTranscoder(`
`77`	`76`	`, _subStreamIndex( subStreamIndex )`
`78`	`77`	`, _frameProcessed( 0 )`
`79`	`78`	`, _offset( offset )`
`80`		`- , _transcodeStream( true )`
`81`	`79`	`, _takeFromDummy( false )`
`82`	`80`	`, _verbose( false )`
`83`	`81`	`, _offsetPassed( false )`
`@@ -153,7 +151,6 @@ StreamTranscoder::StreamTranscoder(`
`153`	`151`	`break;`
`154`	`152`	`}`
`155`	`153`	`}`
`156`		`-`
`157`	`154`	`switchEssence( offset != 0 );`
`158`	`155`	`}`
`159`	`156`
`@@ -173,7 +170,6 @@ StreamTranscoder::StreamTranscoder(`
`173`	`170`	`, _subStreamIndex( -1 )`
`174`	`171`	`, _frameProcessed( 0 )`
`175`	`172`	`, _offset( 0 )`
`176`		`- , _transcodeStream( true )`
`177`	`173`	`, _takeFromDummy( false )`
`178`	`174`	`, _verbose( false )`
`179`	`175`	`, _offsetPassed( false )`
`@@ -250,7 +246,7 @@ StreamTranscoder::~StreamTranscoder()`
`250`	`246`	`bool StreamTranscoder::processFrame()`
`251`	`247`	`{`
`252`	`248`	`++_frameProcessed;`
`253`		`- if( _transcodeStream )`
	`249`	`+ if( _transform )`
`254`	`250`	`{`
`255`	`251`	`if( _subStreamIndex < 0 )`
`256`	`252`	`{`
`@@ -288,12 +284,10 @@ bool StreamTranscoder::processRewrap( const int subStreamIndex )`
`288`	`284`	`assert( _outputStream != NULL );`
`289`	`285`
`290`	`286`	`DataStream dataStream;`
`291`		`- // std::vector<DataStream> dataStream;`
`292`	`287`
`293`	`288`	`if( ! _inputStream->readNextPacket( dataStream ) )`
`294`	`289`	`return false;`
`295`	`290`	`_outputStream->wrap( dataStream );`
`296`		`- // outputStream.wrap( dataStream.at( subStreamIndex ) );`
`297`	`291`
`298`	`292`	`return true;`
`299`	`293`	`}`
`@@ -383,6 +377,8 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )`
`383`	`377`	`}`
`384`	`378`	`else`
`385`	`379`	`{`
	`380`	`+ if( _verbose )`
	`381`	`+ std::cout << "encode last frame(s)" << std::endl;`
`386`	`382`	`if( ! _outputEssence->encodeFrame( dataStream ) )`
`387`	`383`	`{`
`388`	`384`	`if( _infinityStream )`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro`
`80`	`80`	`_profile.update( profileDesc );`
`81`	`81`	`if( ! filename.length() )`
`82`	`82`	`{`
`83`		`- // if( _verbose )`
`84`	`83`	`std::cerr << "can't add a stream with no filename indicated" << std::endl;`
`85`	`84`	`return;`
`86`	`85`	`}`