Merge pull request #42 from cchampet/dev_clean_correctif

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 96dcd8975c3e · 2014-08-05T11:00:36.000+02:00
Clean
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -6,6 +6,8 @@ namespace avtranscoder
 DummyVideo::DummyVideo( )
 	: InputEssence( )
 	, _inputFrame( NULL )
+	, _videoDesc()
+	, _videoFrameDesc()
 	, _numberOfView( 1 )
 {
 }
@@ -32,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;
 	}
 	
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -80,12 +80,7 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
 	if( ( codecContext->coded_frame ) &&
 		( codecContext->coded_frame->pts != (int)AV_NOPTS_VALUE ) )
 	{
-		// why need to do that ?
-		//packet.pts = av_rescale_q( codecContext->coded_frame->pts, codecContext->time_base, codecContext->time_base );
-
-		//std::cout << "pts with rescale " << (int)packet.pts << std::endl;
 		packet.pts = codecContext->coded_frame->pts;
-		//std::cout << "pts without rescale " << (int)packet.pts << std::endl;
 	}
 
 	if( codecContext->coded_frame &&
@@ -94,7 +89,6 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
 		packet.flags |= AV_PKT_FLAG_KEY;
 	}
 
-
 #if LIBAVCODEC_VERSION_MAJOR > 53
 	int gotPacket = 0;
 	int ret = avcodec_encode_video2( codecContext, &packet, frame, &gotPacket );
@@ -145,7 +139,6 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
 	return ret == 0;
 }
 
-
 bool OutputVideo::encodeFrame( DataStream& codedFrame )
 {
 	AVCodecContext* codecContext = _videoDesc.getCodecContext();
diff --git a/src/AvTranscoder/EssenceStructures/VideoFrame.hpp b/src/AvTranscoder/EssenceStructures/VideoFrame.hpp
@@ -97,9 +97,6 @@ class AvExport VideoFrame : public Frame
 		m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );
 	}
 
-	virtual ~VideoFrame()
-	{};
-
 	const VideoFrameDesc&     desc() const    { return m_videoFrameDesc; }
 
 private:
diff --git a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
@@ -128,11 +128,11 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 
 	for( size_t plane = 0; plane < MAX_SWS_PLANE; ++plane )
 	{
-		_srcData.at( plane ) = (uint8_t*) const_cast< unsigned char* >( src.getPtr() + _srcOffsets.at( plane ) );
+		_srcData.at( plane ) = (uint8_t*) src.getPtr() + _srcOffsets.at( plane );
 		_dstData.at( plane ) = (uint8_t*) dst.getPtr() + _dstOffsets.at( plane );
 	}
 	
-	if( !_imageConvertContext )
+	if( ! _imageConvertContext )
 	{
 		throw std::runtime_error( "unknown color convert context" );
 	}
@@ -168,7 +168,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
`@@ -6,6 +6,8 @@ namespace avtranscoder`
`6`	`6`	`DummyVideo::DummyVideo( )`
`7`	`7`	`: InputEssence( )`
`8`	`8`	`, _inputFrame( NULL )`
	`9`	`+ , _videoDesc()`
	`10`	`+ , _videoFrameDesc()`
`9`	`11`	`, _numberOfView( 1 )`
`10`	`12`	`{`
`11`	`13`	`}`
`@@ -32,12 +34,13 @@ void DummyVideo::setFrame( Frame& inputFrame )`
`32`	`34`
`33`	`35`	`bool DummyVideo::readNextFrame( Frame& frameBuffer )`
`34`	`36`	`{`
`35`		`- frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );`
`36`		`-`
`37`	`37`	`if( ! _inputFrame )`
`38`	`38`	`{`
`39`	`39`	`int fillChar = 0; // fill images with black`
`40`		`- 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() );`
`41`	`44`	`return true;`
`42`	`45`	`}`
`43`	`46`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,7 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame`
`80`	`80`	`if( ( codecContext->coded_frame ) &&`
`81`	`81`	`( codecContext->coded_frame->pts != (int)AV_NOPTS_VALUE ) )`
`82`	`82`	`{`
`83`		`- // why need to do that ?`
`84`		`- //packet.pts = av_rescale_q( codecContext->coded_frame->pts, codecContext->time_base, codecContext->time_base );`
`85`		`-`
`86`		`- //std::cout << "pts with rescale " << (int)packet.pts << std::endl;`
`87`	`83`	`packet.pts = codecContext->coded_frame->pts;`
`88`		`- //std::cout << "pts without rescale " << (int)packet.pts << std::endl;`
`89`	`84`	`}`
`90`	`85`
`91`	`86`	`if( codecContext->coded_frame &&`
`@@ -94,7 +89,6 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame`
`94`	`89`	`packet.flags \|= AV_PKT_FLAG_KEY;`
`95`	`90`	`}`
`96`	`91`
`97`		`-`
`98`	`92`	`#if LIBAVCODEC_VERSION_MAJOR > 53`
`99`	`93`	`int gotPacket = 0;`
`100`	`94`	`int ret = avcodec_encode_video2( codecContext, &packet, frame, &gotPacket );`
`@@ -145,7 +139,6 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame`
`145`	`139`	`return ret == 0;`
`146`	`140`	`}`
`147`	`141`
`148`		`-`
`149`	`142`	`bool OutputVideo::encodeFrame( DataStream& codedFrame )`
`150`	`143`	`{`
`151`	`144`	`AVCodecContext* codecContext = _videoDesc.getCodecContext();`
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,6 @@ class AvExport VideoFrame : public Frame`
`97`	`97`	`m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );`
`98`	`98`	`}`
`99`	`99`
`100`		`- virtual ~VideoFrame()`
`101`		`- {};`
`102`		`-`
`103`	`100`	`const VideoFrameDesc& desc() const { return m_videoFrameDesc; }`
`104`	`101`
`105`	`102`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,11 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`128`	`128`
`129`	`129`	`for( size_t plane = 0; plane < MAX_SWS_PLANE; ++plane )`
`130`	`130`	`{`
`131`		`- _srcData.at( plane ) = (uint8_t) const_cast< unsigned char >( src.getPtr() + _srcOffsets.at( plane ) );`
	`131`	`+ _srcData.at( plane ) = (uint8_t*) src.getPtr() + _srcOffsets.at( plane );`
`132`	`132`	`_dstData.at( plane ) = (uint8_t*) dst.getPtr() + _dstOffsets.at( plane );`
`133`	`133`	`}`
`134`	`134`
`135`		`- if( !_imageConvertContext )`
	`135`	`+ if( ! _imageConvertContext )`
`136`	`136`	`{`
`137`	`137`	`throw std::runtime_error( "unknown color convert context" );`
`138`	`138`	`}`
`@@ -168,7 +168,7 @@ void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )`
`168`	`168`	`&_srcData[0], &_srcLineSize[0], 0, src.desc().getHeight(),`
`169`	`169`	`&_dstData[0], &_dstLineSize[0] );`
`170`	`170`
`171`		`- if( ret != (int) src.desc().getHeight() )`
	`171`	`+ if( ret != (int) dst.desc().getHeight() )`
`172`	`172`	`throw std::runtime_error( "error in color converter" );`
`173`	`173`	`}`
`174`	`174`