wma: Defer decoding until two data blocks are available.

This avoids buffer underruns caused by frames that span two blocks.

diff --git a/wmadec_filter.c b/wmadec_filter.c
index d78c72bd54724cd58a446dd859deba156672b541..96fb50082d2bff52ba082904341851048c66c6ef 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1255,11 +1255,12 @@ next_buffer:
                        fn->min_iqs += 4096;
                        goto next_buffer;
                }
                        fn->min_iqs += 4096;
                        goto next_buffer;
                }

-               fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+               fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);

                fn->private_data = pwd;
                converted = pwd->ahi.header_len;
                goto success;
        }
                fn->private_data = pwd;
                converted = pwd->ahi.header_len;
                goto success;
        }

+       fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;

        for (;;) {
                char *out;
                int out_size = WMA_OUTPUT_BUFFER_SIZE;
        for (;;) {
                char *out;
                int out_size = WMA_OUTPUT_BUFFER_SIZE;