Video/AudioDecoder: fixed decoding if the reading process failed

Clement Champetier · Clement Champetier · commit 66102e3617d6 · 2016-04-07T17:45:37.000+02:00
It could be possible to have no more data to read from the input,
but to have data stored in the decoder.
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -87,13 +87,8 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
     {
         CodedData data;
 
+        // reading
         const bool nextPacketRead = _inputStream->readNextPacket(data);
-        // if error or end of file
-        if(!nextPacketRead && !decodeNextFrame)
-        {
-            data.clear();
-            return false;
-        }
 
         // decoding
         // @note could be called several times to return the remaining frames (last call with an empty packet)
@@ -110,6 +105,13 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
             decodeNextFrame = false;
         else
             decodeNextFrame = true;
+
+        // if no frame read and decompressed
+        if(!nextPacketRead && !decodeNextFrame)
+        {
+            data.clear();
+            return false;
+        }
     }
     return decodeNextFrame;
 }
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -85,13 +85,8 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)
     {
         CodedData data;
 
+        // reading
         const bool nextPacketRead = _inputStream->readNextPacket(data);
-        // if error or end of file
-        if(!nextPacketRead && !decodeNextFrame)
-        {
-            data.clear();
-            return false;
-        }
 
         // decoding
         // @note could be called several times to return the remaining frames (last call with an empty packet)
@@ -108,6 +103,13 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)
             decodeNextFrame = false;
         else
             decodeNextFrame = true;
+
+        // if no frame read and decompressed
+        if(!nextPacketRead && !decodeNextFrame)
+        {
+            data.clear();
+            return false;
+        }
     }
     return decodeNextFrame;
 }
