OutpuVideo: clean encodeFrame

Clement Champetier · Clement Champetier · commit 7e70cade9a75 · 2014-08-05T10:40:03.000+02:00
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();

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();`