VideoProperties: get size from AVPacket if not available in AVFrame

Clement Champetier · Clement Champetier · commit bede28c593a7 · 2015-04-09T10:49:30.000+02:00
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -405,7 +405,7 @@ size_t VideoProperties::getBitRate() const
 	
 	if( ! _codecContext->width || ! _codecContext->height )
 		throw std::runtime_error( "cannot compute bit rate: invalid frame size" );
-	
+
 	// discard no frame type when decode
 	_codecContext->skip_frame = AVDISCARD_NONE;
 
@@ -429,7 +429,11 @@ size_t VideoProperties::getBitRate() const
 			avcodec_decode_video2( _codecContext, frame, &gotFrame, &pkt );
 			if( gotFrame )
 			{
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 7, 100 )
 				gopFramesSize += frame->pkt_size;
+#else
+				gopFramesSize += pkt.size;
+#endif
 				++count;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ size_t VideoProperties::getBitRate() const`
`405`	`405`
`406`	`406`	`if( ! _codecContext->width \|\| ! _codecContext->height )`
`407`	`407`	`throw std::runtime_error( "cannot compute bit rate: invalid frame size" );`
`408`		`-`
	`408`	`+`
`409`	`409`	`// discard no frame type when decode`
`410`	`410`	`_codecContext->skip_frame = AVDISCARD_NONE;`
`411`	`411`
`@@ -429,7 +429,11 @@ size_t VideoProperties::getBitRate() const`
`429`	`429`	`avcodec_decode_video2( _codecContext, frame, &gotFrame, &pkt );`
`430`	`430`	`if( gotFrame )`
`431`	`431`	`{`
	`432`	`+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 7, 100 )`
`432`	`433`	`gopFramesSize += frame->pkt_size;`
	`434`	`+#else`
	`435`	`+ gopFramesSize += pkt.size;`
	`436`	`+#endif`
`433`	`437`	`++count;`
`434`	`438`	`}`
`435`	`439`	`}`