mmaldec: correct package buffering accounting
authorwm4 <nfxjfg@googlemail.com>
Fri, 6 Nov 2015 12:02:16 +0000 (13:02 +0100)
committerwm4 <nfxjfg@googlemail.com>
Sat, 7 Nov 2015 18:24:49 +0000 (19:24 +0100)
The assert in ffmmal_stop_decoder() could trigger sometimes. The
packets_buffered counter was indeed not correctly maintained, and
packets were not subtracted from it if they were still in the waiting
queue.

For some reason, this happened especially with VC-1.

libavcodec/mmaldec.c

index 8d74b3f..d419096 100644 (file)
@@ -160,6 +160,9 @@ static void ffmmal_stop_decoder(AVCodecContext *avctx)
 
         ctx->waiting_buffers = buffer->next;
 
+        if (buffer->flags & MMAL_BUFFER_HEADER_FLAG_FRAME_END)
+            avpriv_atomic_int_add_and_fetch(&ctx->packets_buffered, -1);
+
         av_buffer_unref(&buffer->ref);
         av_free(buffer);
     }