GeneratorVideo: rename _videoDesc to _codec

Clement Champetier · Clement Champetier · commit c3e46c1b16d0 · 2014-10-16T18:54:13.000+02:00
* According to the class name "VideoCodec".
* "getVideoCodec" returns a reference instead of make a copy.
* Rename "setVideoDesc" to "setVideoCodec".
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -8,7 +8,7 @@ namespace avtranscoder
 GeneratorVideo::GeneratorVideo( )
 	: IInputEssence( )
 	, _inputFrame( NULL )
-	, _videoDesc( eCodecTypeEncoder )
+	, _codec( eCodecTypeEncoder )
 	, _videoFrameDesc()
 	, _numberOfView( 1 )
 {
@@ -18,15 +18,15 @@ GeneratorVideo::~GeneratorVideo( )
 {
 }
 
-void GeneratorVideo::setVideoDesc( const VideoCodec& videoDesc )
+void GeneratorVideo::setVideoCodec( const VideoCodec& codec )
 {
-	_videoDesc = videoDesc;
-	_videoFrameDesc = _videoDesc.getVideoFrameDesc();
+	_codec = codec;
+	_videoFrameDesc = _codec.getVideoFrameDesc();
 }
 
-VideoCodec GeneratorVideo::getVideoCodec() const
+VideoCodec& GeneratorVideo::getVideoCodec()
 {
-	return _videoDesc;
+	return _codec;
 }
 
 void GeneratorVideo::setFrame( Frame& inputFrame )
@@ -44,7 +44,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
 			frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
 
-		VideoFrameDesc desc( _videoDesc.getVideoFrameDesc() );
+		VideoFrameDesc desc( _codec.getVideoFrameDesc() );
 		Pixel rgbPixel;
 		rgbPixel.setColorComponents( eComponentRgb );
 		rgbPixel.setPlanar( false );
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -15,9 +15,9 @@ class AvExport GeneratorVideo : public IInputEssence
 	~GeneratorVideo( );
 
 	// Stream properties
-	void setVideoDesc( const VideoCodec& videoDesc );
+	void setVideoCodec( const VideoCodec& codec );
 
-	VideoCodec getVideoCodec() const;
+	VideoCodec& getVideoCodec();
 	
 	void setup() {}
 
@@ -28,7 +28,7 @@ class AvExport GeneratorVideo : public IInputEssence
 
 private:
 	Frame*         _inputFrame;
-	VideoCodec      _videoDesc;
+	VideoCodec      _codec;
 	VideoFrameDesc _videoFrameDesc;
 
 	size_t         _numberOfView;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -112,7 +112,7 @@ StreamTranscoder::StreamTranscoder(
 			_transform = new VideoTransform();
 
 			GeneratorVideo* generatorVideo = new GeneratorVideo();
-			generatorVideo->setVideoDesc( outputVideo->getVideoCodec() );
+			generatorVideo->setVideoCodec( outputVideo->getVideoCodec() );
 			_generatorEssence = generatorVideo;
 			
 			break;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -415,7 +415,7 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 		if( _verbose )
 			std::cout << "add generated video stream" << std::endl;
 		_generatorVideo.push_back( new GeneratorVideo() );
-		_generatorVideo.back()->setVideoDesc( static_cast<VideoCodec>( codec ) );
+		_generatorVideo.back()->setVideoCodec( static_cast<VideoCodec>( codec ) );
 		
 		_streamTranscoders.push_back( new StreamTranscoder( *_generatorVideo.back(), _outputFile, profile ) );
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace avtranscoder`
`8`	`8`	`GeneratorVideo::GeneratorVideo( )`
`9`	`9`	`: IInputEssence( )`
`10`	`10`	`, _inputFrame( NULL )`
`11`		`- , _videoDesc( eCodecTypeEncoder )`
	`11`	`+ , _codec( eCodecTypeEncoder )`
`12`	`12`	`, _videoFrameDesc()`
`13`	`13`	`, _numberOfView( 1 )`
`14`	`14`	`{`
`@@ -18,15 +18,15 @@ GeneratorVideo::~GeneratorVideo( )`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`
`21`		`-void GeneratorVideo::setVideoDesc( const VideoCodec& videoDesc )`
	`21`	`+void GeneratorVideo::setVideoCodec( const VideoCodec& codec )`
`22`	`22`	`{`
`23`		`- _videoDesc = videoDesc;`
`24`		`- _videoFrameDesc = _videoDesc.getVideoFrameDesc();`
	`23`	`+ _codec = codec;`
	`24`	`+ _videoFrameDesc = _codec.getVideoFrameDesc();`
`25`	`25`	`}`
`26`	`26`
`27`		`-VideoCodec GeneratorVideo::getVideoCodec() const`
	`27`	`+VideoCodec& GeneratorVideo::getVideoCodec()`
`28`	`28`	`{`
`29`		`- return _videoDesc;`
	`29`	`+ return _codec;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`void GeneratorVideo::setFrame( Frame& inputFrame )`
`@@ -44,7 +44,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )`
`44`	`44`	`if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )`
`45`	`45`	`frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
`46`	`46`
`47`		`- VideoFrameDesc desc( _videoDesc.getVideoFrameDesc() );`
	`47`	`+ VideoFrameDesc desc( _codec.getVideoFrameDesc() );`
`48`	`48`	`Pixel rgbPixel;`
`49`	`49`	`rgbPixel.setColorComponents( eComponentRgb );`
`50`	`50`	`rgbPixel.setPlanar( false );`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod`
`415`	`415`	`if( _verbose )`
`416`	`416`	`std::cout << "add generated video stream" << std::endl;`
`417`	`417`	`_generatorVideo.push_back( new GeneratorVideo() );`
`418`		`- _generatorVideo.back()->setVideoDesc( static_cast<VideoCodec>( codec ) );`
	`418`	`+ _generatorVideo.back()->setVideoCodec( static_cast<VideoCodec>( codec ) );`
`419`	`419`
`420`	`420`	`_streamTranscoders.push_back( new StreamTranscoder( *_generatorVideo.back(), _outputFile, profile ) );`
`421`	`421`	`}`