DummyVideo: refactoring readNextFrame

Clement Champetier · Clement Champetier · commit fc404723e16f · 2014-08-05T10:39:50.000+02:00
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -34,12 +34,13 @@ void DummyVideo::setFrame( Frame& inputFrame )
 
 bool DummyVideo::readNextFrame( Frame& frameBuffer )
 {
-	frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
-
 	if( ! _inputFrame )
 	{
 		int fillChar = 0; // fill images with black
-		memset( frameBuffer.getPtr(), fillChar, frameBuffer.getSize() );
+		
+		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
+			frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
+		memset( frameBuffer.getPtr(), fillChar, _videoFrameDesc.getDataSize() );
 		return true;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,13 @@ void DummyVideo::setFrame( Frame& inputFrame )`
`34`	`34`
`35`	`35`	`bool DummyVideo::readNextFrame( Frame& frameBuffer )`
`36`	`36`	`{`
`37`		`- frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
`38`		`-`
`39`	`37`	`if( ! _inputFrame )`
`40`	`38`	`{`
`41`	`39`	`int fillChar = 0; // fill images with black`
`42`		`- memset( frameBuffer.getPtr(), fillChar, frameBuffer.getSize() );`
	`40`	`+`
	`41`	`+ if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )`
	`42`	`+ frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
	`43`	`+ memset( frameBuffer.getPtr(), fillChar, _videoFrameDesc.getDataSize() );`
`43`	`44`	`return true;`
`44`	`45`	`}`
`45`	`46`