Video/Audio decoders: fixed decoding when codec capabilities has CODEC_CAP_DELAY

Clement Champetier · Clement Champetier · commit 06ec0b693a49 · 2016-02-29T17:22:54.000+01:00
Fix #231
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -89,13 +89,15 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
 
         const bool nextPacketRead = _inputStream->readNextPacket(data);
         // if error or end of file
-        if(!nextPacketRead)
+        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)
+        // @see CODEC_CAP_DELAY
         int ret = avcodec_decode_audio4(&_inputStream->getAudioCodec().getAVCodecContext(), &frameBuffer.getAVFrame(),
                                         &got_frame, &data.getAVPacket());
         if(ret < 0)
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -87,13 +87,15 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)
 
         const bool nextPacketRead = _inputStream->readNextPacket(data);
         // if error or end of file
-        if(!nextPacketRead)
+        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)
+        // @see CODEC_CAP_DELAY
         const int ret = avcodec_decode_video2(&_inputStream->getVideoCodec().getAVCodecContext(), &frameBuffer.getAVFrame(),
                                               &got_frame, &data.getAVPacket());
         if(ret < 0)
