pass the buffer size to init_get_bits() in bytes.

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 401dfd2535955681c1085edce795ba59dbed79d0..c181fdf68e189dcaa9616858083c3c0d7e6f9875 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1157,7 +1157,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                return 0;
        buf_size = pwd->ahi.block_align;
        samples = data;
                return 0;
        buf_size = pwd->ahi.block_align;
        samples = data;

-       init_get_bits(&pwd->gb, buf, buf_size * 8);
+       init_get_bits(&pwd->gb, buf, buf_size);

        if (pwd->use_bit_reservoir) {
                /* read super frame header */
                skip_bits(&pwd->gb, 4); /* super frame index */
        if (pwd->use_bit_reservoir) {
                /* read super frame header */
                skip_bits(&pwd->gb, 4); /* super frame index */


@@ -1187,7 +1187,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 
                        /* XXX: bit_offset bits into last frame */
                        init_get_bits(&pwd->gb, pwd->last_superframe,
 
                        /* XXX: bit_offset bits into last frame */
                        init_get_bits(&pwd->gb, pwd->last_superframe,

-                               MAX_CODED_SUPERFRAME_SIZE * 8);
+                               MAX_CODED_SUPERFRAME_SIZE);

                        /* skip unused bits */
                        if (pwd->last_bitoffset > 0)
                                skip_bits(&pwd->gb, pwd->last_bitoffset);
                        /* skip unused bits */
                        if (pwd->last_bitoffset > 0)
                                skip_bits(&pwd->gb, pwd->last_bitoffset);


@@ -1205,7 +1205,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                /* read each frame starting from bit_offset */
                pos = bit_offset + 4 + 4 + pwd->byte_offset_bits + 3;
                init_get_bits(&pwd->gb, buf + (pos >> 3),
                /* read each frame starting from bit_offset */
                pos = bit_offset + 4 + 4 + pwd->byte_offset_bits + 3;
                init_get_bits(&pwd->gb, buf + (pos >> 3),

-                       (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)) * 8);
+                       (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)));

                len = pos & 7;
                if (len > 0)
                        skip_bits(&pwd->gb, len);
                len = pos & 7;
                if (len > 0)
                        skip_bits(&pwd->gb, len);