wma: Drop unused argument from wma_decode_superframe().

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 31a13c5094a239fca2ebd519553821933b838ba7..0c96dc6c986db4a4a00e3f43c613218a4f2e13db 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -24,11 +24,11 @@
 #include "para.h"
 #include "error.h"
 #include "list.h"
 #include "para.h"
 #include "error.h"
 #include "list.h"

-#include "ggo.h"

 #include "string.h"
 #include "sched.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "sched.h"
 #include "buffer_tree.h"
 #include "filter.h"

+#include "portable_io.h"

 #include "bitstream.h"
 #include "imdct.h"
 #include "wma.h"
 #include "bitstream.h"
 #include "imdct.h"
 #include "wma.h"


@@ -159,23 +159,6 @@ static void sine_window_init(float *window, int n)
                window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n)));
 }
 
                window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n)));
 }
 

-static void wmadec_cleanup(struct private_wmadec_data *pwd)
-{
-       int i;
-
-       for (i = 0; i < pwd->nb_block_sizes; i++)
-               imdct_end(pwd->mdct_ctx[i]);
-       if (pwd->ahi.use_exp_vlc)
-               free_vlc(&pwd->exp_vlc);
-       if (pwd->use_noise_coding)
-               free_vlc(&pwd->hgain_vlc);
-       for (i = 0; i < 2; i++) {
-               free_vlc(&pwd->coef_vlc[i]);
-               free(pwd->run_table[i]);
-               free(pwd->level_table[i]);
-       }
-}
-

 static void init_coef_vlc(struct vlc *vlc, uint16_t **prun_table,
                uint16_t **plevel_table, const struct coef_vlc_table *vlc_table)
 {
 static void init_coef_vlc(struct vlc *vlc, uint16_t **prun_table,
                uint16_t **plevel_table, const struct coef_vlc_table *vlc_table)
 {


@@ -371,8 +354,8 @@ static int wma_init(struct private_wmadec_data *pwd)
                else
                        high_freq = high_freq * 0.5;
        }
                else
                        high_freq = high_freq * 0.5;
        }

-       PARA_INFO_LOG("channels=%d sample_rate=%d "
-               "bitrate=%d block_align=%d\n",
+       PARA_INFO_LOG("channels=%u sample_rate=%u "
+               "bitrate=%u block_align=%d\n",

                ahi->channels, ahi->sample_rate,
                ahi->bit_rate, ahi->block_align);
        PARA_INFO_LOG("frame_len=%d, bps=%f bps1=%f "
                ahi->channels, ahi->sample_rate,
                ahi->bit_rate, ahi->block_align);
        PARA_INFO_LOG("frame_len=%d, bps=%f bps1=%f "


@@ -581,7 +564,7 @@ static int decode_exp_vlc(struct private_wmadec_data *pwd, int ch)
        last_exp = 36;
 
        while (q < q_end) {
        last_exp = 36;
 
        while (q < q_end) {

-               code = get_vlc(&pwd->gb, pwd->exp_vlc.table, EXPVLCBITS);
+               code = get_vlc(&pwd->gb, &pwd->exp_vlc);

                if (code < 0)
                        return code;
                /* NOTE: this offset is the same as MPEG4 AAC ! */
                if (code < 0)
                        return code;
                /* NOTE: this offset is the same as MPEG4 AAC ! */


@@ -708,8 +691,7 @@ static int compute_high_band_values(struct private_wmadec_data *pwd,
                        if (val == (int)0x80000000)
                                val = get_bits(&pwd->gb, 7) - 19;
                        else {
                        if (val == (int)0x80000000)
                                val = get_bits(&pwd->gb, 7) - 19;
                        else {

-                               int code = get_vlc(&pwd->gb,
-                                       pwd->hgain_vlc.table, HGAINVLCBITS);
+                               int code = get_vlc(&pwd->gb, &pwd->hgain_vlc);

                                if (code < 0)
                                        return code;
                                val += code - 18;
                                if (code < 0)
                                        return code;
                                val += code - 18;


@@ -940,7 +922,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
                eptr = ptr + nb_coefs[ch];
                memset(ptr, 0, pwd->block_len * sizeof(int16_t));
                for (;;) {
                eptr = ptr + nb_coefs[ch];
                memset(ptr, 0, pwd->block_len * sizeof(int16_t));
                for (;;) {

-                       code = get_vlc(&pwd->gb, coef_vlc->table, VLCBITS);
+                       code = get_vlc(&pwd->gb, coef_vlc);

                        if (code < 0)
                                return code;
                        if (code == 1) /* EOB */
                        if (code < 0)
                                return code;
                        if (code == 1) /* EOB */


@@ -1059,21 +1041,11 @@ static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
 }
 
 static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 }
 
 static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,

-               int *data_size, const uint8_t *buf, int buf_size)
+               int *data_size, const uint8_t *buf)

 {
 {

-       int ret;
+       int ret, buf_size = pwd->ahi.packet_size - WMA_FRAME_SKIP;

        int16_t *samples;
 
        int16_t *samples;
 

-       if (buf_size == 0) {
-               pwd->last_superframe_len = 0;
-               *data_size = 0;
-               return 0;
-       }
-       if (buf_size < pwd->ahi.block_align) {
-               *data_size = 0;
-               return 0;
-       }
-       buf_size = pwd->ahi.block_align;

        samples = data;
        init_get_bits(&pwd->gb, buf, buf_size);
        if (pwd->ahi.use_bit_reservoir) {
        samples = data;
        init_get_bits(&pwd->gb, buf, buf_size);
        if (pwd->ahi.use_bit_reservoir) {


@@ -1174,10 +1146,21 @@ fail:
 static void wmadec_close(struct filter_node *fn)
 {
        struct private_wmadec_data *pwd = fn->private_data;
 static void wmadec_close(struct filter_node *fn)
 {
        struct private_wmadec_data *pwd = fn->private_data;

+       int i;

 
        if (!pwd)
                return;
 
        if (!pwd)
                return;

-       wmadec_cleanup(pwd);
+       for (i = 0; i < pwd->nb_block_sizes; i++)
+               imdct_end(pwd->mdct_ctx[i]);
+       if (pwd->ahi.use_exp_vlc)
+               free_vlc(&pwd->exp_vlc);
+       if (pwd->use_noise_coding)
+               free_vlc(&pwd->hgain_vlc);
+       for (i = 0; i < 2; i++) {
+               free_vlc(&pwd->coef_vlc[i]);
+               free(pwd->run_table[i]);
+               free(pwd->level_table[i]);
+       }

        free(fn->private_data);
        fn->private_data = NULL;
 }
        free(fn->private_data);
        fn->private_data = NULL;
 }


@@ -1233,7 +1216,7 @@ next_buffer:
        out_size = WMA_OUTPUT_BUFFER_SIZE;
        out = para_malloc(out_size);
        ret = wma_decode_superframe(pwd, out, &out_size,
        out_size = WMA_OUTPUT_BUFFER_SIZE;
        out = para_malloc(out_size);
        ret = wma_decode_superframe(pwd, out, &out_size,

-               (uint8_t *)in + WMA_FRAME_SKIP, len - WMA_FRAME_SKIP);
+               (uint8_t *)in + WMA_FRAME_SKIP);

        if (ret < 0) {
                free(out);
                goto err;
        if (ret < 0) {
                free(out);
                goto err;


@@ -1259,16 +1242,10 @@ static void wmadec_open(struct filter_node *fn)
        fn->min_iqs = 4096;
 }
 
        fn->min_iqs = 4096;
 }
 

-/**
- * The init function of the wma decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void wmadec_filter_init(struct filter *f)
-{
-       f->open = wmadec_open;
-       f->close = wmadec_close;
-       f->execute = wmadec_execute;
-       f->pre_select = generic_filter_pre_select;
-       f->post_select = wmadec_post_select;
-}
+const struct filter lsg_filter_cmd_com_wmadec_user_data = {
+       .open = wmadec_open,
+       .close = wmadec_close,
+       .execute = wmadec_execute,
+       .pre_select = generic_filter_pre_select,
+       .post_select = wmadec_post_select,
+};