Video/AudioEncoder: refactored returned value when encode data

Clement Champetier · Clement Champetier · commit dea73eeef430 · 2016-04-22T14:51:39.000+02:00
Unecessary to check returned value of avcodec encode method twice.
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -128,15 +128,15 @@ bool AudioEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)
         throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
-    return ret == 0 && gotPacket == 1;
+    return gotPacket == 1;
 #else
     const int ret = avcodec_encode_audio(&avCodecContext, encodedData.data, encodedData.size, decodedData);
     if(ret < 0)
     {
         throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
-    return ret == 0;
+    return true;
 #endif
 }
 
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -141,15 +141,15 @@ bool VideoEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)
         throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +
                                  getDescriptionFromErrorCode(ret));
     }
-    return ret == 0 && gotPacket == 1;
+    return gotPacket == 1;
 #else
     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 - " +
                                  getDescriptionFromErrorCode(ret));
     }
-    return ret == 0;
+    return true;
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,15 +128,15 @@ bool AudioEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)`
`128`	`128`	`throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +`
`129`	`129`	`getDescriptionFromErrorCode(ret));`
`130`	`130`	`}`
`131`		`- return ret == 0 && gotPacket == 1;`
	`131`	`+ return gotPacket == 1;`
`132`	`132`	`#else`
`133`	`133`	`const int ret = avcodec_encode_audio(&avCodecContext, encodedData.data, encodedData.size, decodedData);`
`134`	`134`	`if(ret < 0)`
`135`	`135`	`{`
`136`	`136`	`throw std::runtime_error("Encode audio frame error: avcodec encode audio frame - " +`
`137`	`137`	`getDescriptionFromErrorCode(ret));`
`138`	`138`	`}`
`139`		`- return ret == 0;`
	`139`	`+ return true;`
`140`	`140`	`#endif`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -141,15 +141,15 @@ bool VideoEncoder::encode(const AVFrame* decodedData, AVPacket& encodedData)`
`141`	`141`	`throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +`
`142`	`142`	`getDescriptionFromErrorCode(ret));`
`143`	`143`	`}`
`144`		`- return ret == 0 && gotPacket == 1;`
	`144`	`+ return gotPacket == 1;`
`145`	`145`	`#else`
`146`	`146`	`const int ret = avcodec_encode_video(&avCodecContext, encodedData.data, encodedData.size, decodedData);`
`147`	`147`	`if(ret < 0)`
`148`	`148`	`{`
`149`	`149`	`throw std::runtime_error("Encode video frame error: avcodec encode video frame - " +`
`150`	`150`	`getDescriptionFromErrorCode(ret));`
`151`	`151`	`}`
`152`		`- return ret == 0;`
	`152`	`+ return true;`
`153`	`153`	`#endif`
`154`	`154`	`}`
`155`	`155`