Video/AudioEncoder: fixed how to detect an error in the encoded process

Clement Champetier · Clement Champetier · commit af03c26cc639 · 2016-04-21T14:26:08.000+02:00
* Only the returned value of the avcodec function is needed.
* Indeed, the encoded process could be a success, without any data
encoded (end of process).
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -112,24 +112,21 @@ bool AudioEncoder::encodeFrame(const Frame& sourceFrame, CodedData& codedFrame)
 #if LIBAVCODEC_VERSION_MAJOR > 53
     int gotPacket = 0;
     int ret = avcodec_encode_audio2(&avCodecContext, &packet, &sourceFrame.getAVFrame(), &gotPacket);
-    if(ret != 0 && gotPacket == 0)
+    if(ret != 0)
     {
         throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
+    return ret == 0 && gotPacket == 1;
 #else
     int ret = avcodec_encode_audio(&avCodecContext, packet.data, packet.size, &sourceFrame.getAVFrame());
     if(ret < 0)
     {
         throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
-#endif
-
-#if LIBAVCODEC_VERSION_MAJOR > 53
-    return ret == 0 && gotPacket == 1;
-#endif
     return ret == 0;
+#endif
 }
 
 bool AudioEncoder::encodeFrame(CodedData& codedFrame)
@@ -143,7 +140,7 @@ bool AudioEncoder::encodeFrame(CodedData& codedFrame)
 #if LIBAVCODEC_VERSION_MAJOR > 53
     int gotPacket = 0;
     int ret = avcodec_encode_audio2(&avCodecContext, &packet, NULL, &gotPacket);
-    if(ret != 0 && gotPacket == 0)
+    if(ret != 0)
     {
         throw std::runtime_error("Encode audio frame error: avcodec encode last audio frame - " +
                                  getDescriptionFromErrorCode(ret));
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -125,24 +125,21 @@ bool VideoEncoder::encodeFrame(const Frame& sourceFrame, CodedData& codedFrame)
 #if LIBAVCODEC_VERSION_MAJOR > 53
     int gotPacket = 0;
     int ret = avcodec_encode_video2(&avCodecContext, &packet, &sourceFrame.getAVFrame(), &gotPacket);
-    if(ret != 0 && gotPacket == 0)
+    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, packet.data, packet.size, &sourceFrame.getAVFrame());
     if(ret < 0)
     {
         throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
-#endif
-
-#if LIBAVCODEC_VERSION_MAJOR > 53
-    return ret == 0 && gotPacket == 1;
-#endif
     return ret == 0;
+#endif
 }
 
 bool VideoEncoder::encodeFrame(CodedData& codedFrame)
@@ -156,7 +153,7 @@ bool VideoEncoder::encodeFrame(CodedData& codedFrame)
 #if LIBAVCODEC_VERSION_MAJOR > 53
     int gotPacket = 0;
     int ret = avcodec_encode_video2(&avCodecContext, &packet, NULL, &gotPacket);
-    if(ret != 0 && gotPacket == 0)
+    if(ret != 0)
     {
         throw std::runtime_error("Encode video frame error: avcodec encode last video frame - " +
                                  getDescriptionFromErrorCode(ret));
