VideoEssenceTransform: clean convert

Clement Champetier · Clement Champetier · commit eb465461432b · 2014-08-05T10:40:34.000+02:00
* Add space.
* Test the result of sws_scale with height of dst (the src has the same
height, but according to ffmpeg documentation, the test concerns the
output).
diff --git a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
@@ -103,7 +103,7 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 		_dstData.at( plane ) = (uint8_t*) dst.getPtr() + _dstOffsets.at( plane );
 	}
 	
-	if( !_imageConvertContext )
+	if( ! _imageConvertContext )
 	{
 		throw std::runtime_error( "unknown color convert context" );
 	}
@@ -112,7 +112,7 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 		&_srcData[0], &_srcLineSize[0], 0, src.desc().getHeight(),
 		&_dstData[0], &_dstLineSize[0] );
 
-	if( ret != (int) src.desc().getHeight() )
+	if( ret != (int) dst.desc().getHeight() )
 		throw std::runtime_error( "error in color converter" );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`103`	`103`	`_dstData.at( plane ) = (uint8_t*) dst.getPtr() + _dstOffsets.at( plane );`
`104`	`104`	`}`
`105`	`105`
`106`		`- if( !_imageConvertContext )`
	`106`	`+ if( ! _imageConvertContext )`
`107`	`107`	`{`
`108`	`108`	`throw std::runtime_error( "unknown color convert context" );`
`109`	`109`	`}`
`@@ -112,7 +112,7 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`112`	`112`	`&_srcData[0], &_srcLineSize[0], 0, src.desc().getHeight(),`
`113`	`113`	`&_dstData[0], &_dstLineSize[0] );`
`114`	`114`
`115`		`- if( ret != (int) src.desc().getHeight() )`
	`115`	`+ if( ret != (int) dst.desc().getHeight() )`
`116`	`116`	`throw std::runtime_error( "error in color converter" );`
`117`	`117`	`}`
`118`	`118`