VideoEncoder: refactored private method encode

Clement Champetier · Clement Champetier · commit 5828fe317fbe · 2016-04-21T14:54:47.000+02:00
* Add a comment.
* Add const keyword.
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -129,21 +129,22 @@ bool VideoEncoder::encodeFrame(CodedData& codedFrame)
 
 bool VideoEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)
 {
+    // Be sure that data of AVPacket is NULL so that the encoder will allocate it
     encodedData.data = NULL;
     encodedData.stream_index = 0;
 
     AVCodecContext& avCodecContext = _codec.getAVCodecContext();
 #if LIBAVCODEC_VERSION_MAJOR > 53
     int gotPacket = 0;
-    int ret = avcodec_encode_video2(&avCodecContext, &encodedData, decodedData, &gotPacket);
+    const int ret = avcodec_encode_video2(&avCodecContext, &encodedData, decodedData, &gotPacket);
     if(ret != 0)
     {
         throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
     return ret == 0 && gotPacket == 1;
 #else
-    int ret = avcodec_encode_video(&avCodecContext, encodedData.data, encodedData.size, decodedData);
+    const int ret = avcodec_encode_video(&avCodecContext, encodedData.data, encodedData.size, decodedData);
     if(ret < 0)
     {
         throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +

Original file line number	Diff line number	Diff line change
`@@ -129,21 +129,22 @@ bool VideoEncoder::encodeFrame(CodedData& codedFrame)`
`129`	`129`
`130`	`130`	`bool VideoEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)`
`131`	`131`	`{`
	`132`	`+ // Be sure that data of AVPacket is NULL so that the encoder will allocate it`
`132`	`133`	`encodedData.data = NULL;`
`133`	`134`	`encodedData.stream_index = 0;`
`134`	`135`
`135`	`136`	`AVCodecContext& avCodecContext = _codec.getAVCodecContext();`
`136`	`137`	`#if LIBAVCODEC_VERSION_MAJOR > 53`
`137`	`138`	`int gotPacket = 0;`
`138`		`- int ret = avcodec_encode_video2(&avCodecContext, &encodedData, decodedData, &gotPacket);`
	`139`	`+ const int ret = avcodec_encode_video2(&avCodecContext, &encodedData, decodedData, &gotPacket);`
`139`	`140`	`if(ret != 0)`
`140`	`141`	`{`
`141`	`142`	`throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +`
`142`	`143`	`getDescriptionFromErrorCode(ret));`
`143`	`144`	`}`
`144`	`145`	`return ret == 0 && gotPacket == 1;`
`145`	`146`	`#else`
`146`		`- int ret = avcodec_encode_video(&avCodecContext, encodedData.data, encodedData.size, decodedData);`
	`147`	`+ const int ret = avcodec_encode_video(&avCodecContext, encodedData.data, encodedData.size, decodedData);`
`147`	`148`	`if(ret < 0)`
`148`	`149`	`{`
`149`	`150`	`throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +`