VideoDesc: refactoring

Clement Champetier · Clement Champetier · commit 4918995a7b0d · 2014-06-02T11:08:44.000+02:00
SetImageParameters by the ImageDesc instead of the complete Image.
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -63,7 +63,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	videoDesc.setTimeBase( 1, 25 ); // 25 fps
 
-	videoDesc.setImageParameters( sourceImage );
+	videoDesc.setImageParameters( sourceImage.desc() );
 
 	//videoDesc.initCodecContext();
 
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -49,9 +49,9 @@ void VideoDesc::setVideoCodec( const AVCodecID codecId )
 	initCodecContext();
 }
 
-void VideoDesc::setImageParameters( const Image& image )
+void VideoDesc::setImageParameters( const ImageDesc& imageDesc )
 {
-	setImageParameters( image.desc().getWidth(), image.desc().getHeight(), image.desc().getPixelDesc() );
+	setImageParameters( imageDesc.getWidth(), imageDesc.getHeight(), imageDesc.getPixelDesc() );
 }
 
 
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/DatasStructures/VideoDesc.hpp
@@ -30,7 +30,7 @@ class AvExport VideoDesc
 	void setVideoCodec( const std::string& codecName );
 	void setVideoCodec( const AVCodecID codecId );
 
-	void setImageParameters( const Image& image );
+	void setImageParameters( const ImageDesc& imageDesc );
 	void setImageParameters( const size_t width, const size_t height, const Pixel& pixel );
 	void setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel );
 

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ void VideoDesc::setVideoCodec( const AVCodecID codecId )`
`49`	`49`	`initCodecContext();`
`50`	`50`	`}`
`51`	`51`
`52`		`-void VideoDesc::setImageParameters( const Image& image )`
	`52`	`+void VideoDesc::setImageParameters( const ImageDesc& imageDesc )`
`53`	`53`	`{`
`54`		`- setImageParameters( image.desc().getWidth(), image.desc().getHeight(), image.desc().getPixelDesc() );`
	`54`	`+ setImageParameters( imageDesc.getWidth(), imageDesc.getHeight(), imageDesc.getPixelDesc() );`
`55`	`55`	`}`
`56`	`56`
`57`	`57`