X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fwma.c;h=bed47ec35bdb64cc80cf11bbd87e1e4175544d9c;hb=2467d8d9eaae52eb8e18e276a44a15d1d8fd7f97;hp=00893ab8ee9b9d526f975cd83b0d50308f593567;hpb=cee4bb894d0e9e4a8f9fca1ebdc5aa8330eaa366;p=ffmpeg

diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 00893ab8ee9..bed47ec35bd 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -1,25 +1,26 @@
 /*
  * WMA compatible codec
- * Copyright (c) 2002-2007 The FFmpeg Project
+ * Copyright (c) 2002-2007 The Libav Project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
+#include "sinewin.h"
 #include "wma.h"
 #include "wmadata.h"
 
@@ -29,7 +30,7 @@
 /* XXX: use same run/length optimization as mpeg decoders */
 //FIXME maybe split decode / encode or pass flag
 static void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
-                          uint16_t **plevel_table, uint16_t **pint_table,
+                          float **plevel_table, uint16_t **pint_table,
                           const CoefVLCTable *vlc_table)
 {
     int n = vlc_table->n;
@@ -37,12 +38,14 @@ static void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
     const uint32_t *table_codes  = vlc_table->huffcodes;
     const uint16_t *levels_table = vlc_table->levels;
     uint16_t *run_table, *level_table, *int_table;
+    float *flevel_table;
     int i, l, j, k, level;
 
     init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0);
 
     run_table   = av_malloc(n * sizeof(uint16_t));
     level_table = av_malloc(n * sizeof(uint16_t));
+    flevel_table= av_malloc(n * sizeof(*flevel_table));
     int_table   = av_malloc(n * sizeof(uint16_t));
     i = 2;
     level = 1;
@@ -53,13 +56,15 @@ static void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
         for (j = 0; j < l; j++) {
             run_table[i]   = j;
             level_table[i] = level;
+            flevel_table[i]= level;
             i++;
         }
         level++;
     }
     *prun_table   = run_table;
-    *plevel_table = level_table;
+    *plevel_table = flevel_table;
     *pint_table   = int_table;
+    av_free(level_table);
 }
 
 /**
@@ -75,13 +80,29 @@ int av_cold ff_wma_get_frame_len_bits(int sample_rate, int version,
 
     int frame_len_bits;
 
-    if (sample_rate <= 16000)
+    if (sample_rate <= 16000) {
         frame_len_bits = 9;
-    else if (sample_rate <= 22050 ||
-             (sample_rate <= 32000 && version == 1))
+    } else if (sample_rate <= 22050 ||
+             (sample_rate <= 32000 && version == 1)) {
         frame_len_bits = 10;
-    else
+    } else if (sample_rate <= 48000) {
         frame_len_bits = 11;
+    } else if (sample_rate <= 96000) {
+        frame_len_bits = 12;
+    } else {
+        frame_len_bits = 13;
+    }
+
+    if (version == 3) {
+        int tmp = decode_flags & 0x6;
+        if (tmp == 0x2) {
+            ++frame_len_bits;
+        } else if (tmp == 0x4) {
+            --frame_len_bits;
+        } else if (tmp == 0x6) {
+            frame_len_bits -= 2;
+        }
+    }
 
     return frame_len_bits;
 }
@@ -106,6 +127,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
     s->block_align = avctx->block_align;
 
     dsputil_init(&s->dsp, avctx);
+    ff_fmt_convert_init(&s->fmt_conv, avctx);
 
     if (avctx->codec->id == CODEC_ID_WMAV1) {
         s->version = 1;
@@ -137,16 +159,17 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
     /* if version 2, then the rates are normalized */
     sample_rate1 = s->sample_rate;
     if (s->version == 2) {
-        if (sample_rate1 >= 44100)
+        if (sample_rate1 >= 44100) {
             sample_rate1 = 44100;
-        else if (sample_rate1 >= 22050)
+        } else if (sample_rate1 >= 22050) {
             sample_rate1 = 22050;
-        else if (sample_rate1 >= 16000)
+        } else if (sample_rate1 >= 16000) {
             sample_rate1 = 16000;
-        else if (sample_rate1 >= 11025)
+        } else if (sample_rate1 >= 11025) {
             sample_rate1 = 11025;
-        else if (sample_rate1 >= 8000)
+        } else if (sample_rate1 >= 8000) {
             sample_rate1 = 8000;
+        }
     }
 
     bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate);
@@ -158,22 +181,25 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
     if (s->nb_channels == 2)
         bps1 = bps * 1.6;
     if (sample_rate1 == 44100) {
-        if (bps1 >= 0.61)
+        if (bps1 >= 0.61) {
             s->use_noise_coding = 0;
-        else
+        } else {
             high_freq = high_freq * 0.4;
+        }
     } else if (sample_rate1 == 22050) {
-        if (bps1 >= 1.16)
+        if (bps1 >= 1.16) {
             s->use_noise_coding = 0;
-        else if (bps1 >= 0.72)
+        } else if (bps1 >= 0.72) {
             high_freq = high_freq * 0.7;
-        else
+        } else {
             high_freq = high_freq * 0.6;
+        }
     } else if (sample_rate1 == 16000) {
-        if (bps > 0.5)
+        if (bps > 0.5) {
             high_freq = high_freq * 0.5;
-        else
+        } else {
             high_freq = high_freq * 0.3;
+        }
     } else if (sample_rate1 == 11025) {
         high_freq = high_freq * 0.7;
     } else if (sample_rate1 == 8000) {
@@ -193,13 +219,13 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
             high_freq = high_freq * 0.5;
         }
     }
-    dprintf(s->avctx, "flags2=0x%x\n", flags2);
-    dprintf(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
+    av_dlog(s->avctx, "flags2=0x%x\n", flags2);
+    av_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
             s->version, s->nb_channels, s->sample_rate, s->bit_rate,
             s->block_align);
-    dprintf(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
+    av_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
             bps, bps1, high_freq, s->byte_offset_bits);
-    dprintf(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
+    av_dlog(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
             s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes);
 
     /* compute the scale factor band sizes for each MDCT block size */
@@ -218,7 +244,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
             if (s->version == 1) {
                 lpos = 0;
                 for (i = 0; i < 25; i++) {
-                    a = wma_critical_freqs[i];
+                    a = ff_wma_critical_freqs[i];
                     b = s->sample_rate;
                     pos = ((block_len * 2 * a) + (b >> 1)) / b;
                     if (pos > block_len)
@@ -236,12 +262,13 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
                 table = NULL;
                 a = s->frame_len_bits - BLOCK_MIN_BITS - k;
                 if (a < 3) {
-                    if (s->sample_rate >= 44100)
+                    if (s->sample_rate >= 44100) {
                         table = exponent_band_44100[a];
-                    else if (s->sample_rate >= 32000)
+                    } else if (s->sample_rate >= 32000) {
                         table = exponent_band_32000[a];
-                    else if (s->sample_rate >= 22050)
+                    } else if (s->sample_rate >= 22050) {
                         table = exponent_band_22050[a];
+                    }
                 }
                 if (table) {
                     n = *table++;
@@ -252,7 +279,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
                     j = 0;
                     lpos = 0;
                     for (i = 0; i < 25; i++) {
-                        a = wma_critical_freqs[i];
+                        a = ff_wma_critical_freqs[i];
                         b = s->sample_rate;
                         pos = ((block_len * 2 * a) + (b << 1)) / (4 * b);
                         pos <<= 2;
@@ -318,10 +345,8 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
 
     /* init MDCT windows : simple sinus window */
     for (i = 0; i < s->nb_block_sizes; i++) {
-        int n;
-        n = 1 << (s->frame_len_bits - i);
-        ff_sine_window_init(ff_sine_windows[s->frame_len_bits - i - 7], n);
-        s->windows[i] = ff_sine_windows[s->frame_len_bits - i - 7];
+        ff_init_ff_sine_windows(s->frame_len_bits - i);
+        s->windows[i] = ff_sine_windows[s->frame_len_bits - i];
     }
 
     s->reset_block_lengths = 1;
@@ -329,10 +354,11 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
     if (s->use_noise_coding) {
 
         /* init the noise generator */
-        if (s->use_exp_vlc)
+        if (s->use_exp_vlc) {
             s->noise_mult = 0.02;
-        else
+        } else {
             s->noise_mult = 0.04;
+        }
 
 #ifdef TRACE
         for (i = 0; i < NOISE_TAB_SIZE; i++)
@@ -354,10 +380,11 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
     /* choose the VLC tables for the coefficients */
     coef_vlc_table = 2;
     if (s->sample_rate >= 32000) {
-        if (bps1 < 0.72)
+        if (bps1 < 0.72) {
             coef_vlc_table = 0;
-        else if (bps1 < 1.16)
+        } else if (bps1 < 1.16) {
             coef_vlc_table = 1;
+        }
     }
     s->coef_vlcs[0]= &coef_vlcs[coef_vlc_table * 2    ];
     s->coef_vlcs[1]= &coef_vlcs[coef_vlc_table * 2 + 1];
@@ -401,3 +428,98 @@ int ff_wma_end(AVCodecContext *avctx)
 
     return 0;
 }
+
+/**
+ * Decode an uncompressed coefficient.
+ * @param gb GetBitContext
+ * @return the decoded coefficient
+ */
+unsigned int ff_wma_get_large_val(GetBitContext* gb)
+{
+    /** consumes up to 34 bits */
+    int n_bits = 8;
+    /** decode length */
+    if (get_bits1(gb)) {
+        n_bits += 8;
+        if (get_bits1(gb)) {
+            n_bits += 8;
+            if (get_bits1(gb)) {
+                n_bits += 7;
+            }
+        }
+    }
+    return get_bits_long(gb, n_bits);
+}
+
+/**
+ * Decode run level compressed coefficients.
+ * @param avctx codec context
+ * @param gb bitstream reader context
+ * @param vlc vlc table for get_vlc2
+ * @param level_table level codes
+ * @param run_table run codes
+ * @param version 0 for wma1,2 1 for wmapro
+ * @param ptr output buffer
+ * @param offset offset in the output buffer
+ * @param num_coefs number of input coefficents
+ * @param block_len input buffer length (2^n)
+ * @param frame_len_bits number of bits for escaped run codes
+ * @param coef_nb_bits number of bits for escaped level codes
+ * @return 0 on success, -1 otherwise
+ */
+int ff_wma_run_level_decode(AVCodecContext* avctx, GetBitContext* gb,
+                            VLC *vlc,
+                            const float *level_table, const uint16_t *run_table,
+                            int version, WMACoef *ptr, int offset,
+                            int num_coefs, int block_len, int frame_len_bits,
+                            int coef_nb_bits)
+{
+    int code, level, sign;
+    const uint32_t *ilvl = (const uint32_t*)level_table;
+    uint32_t *iptr = (uint32_t*)ptr;
+    const unsigned int coef_mask = block_len - 1;
+    for (; offset < num_coefs; offset++) {
+        code = get_vlc2(gb, vlc->table, VLCBITS, VLCMAX);
+        if (code > 1) {
+            /** normal code */
+            offset += run_table[code];
+            sign = get_bits1(gb) - 1;
+            iptr[offset & coef_mask] = ilvl[code] ^ sign<<31;
+        } else if (code == 1) {
+            /** EOB */
+            break;
+        } else {
+            /** escape */
+            if (!version) {
+                level = get_bits(gb, coef_nb_bits);
+                /** NOTE: this is rather suboptimal. reading
+                    block_len_bits would be better */
+                offset += get_bits(gb, frame_len_bits);
+            } else {
+                level = ff_wma_get_large_val(gb);
+                /** escape decode */
+                if (get_bits1(gb)) {
+                    if (get_bits1(gb)) {
+                        if (get_bits1(gb)) {
+                            av_log(avctx,AV_LOG_ERROR,
+                                "broken escape sequence\n");
+                            return -1;
+                        } else
+                            offset += get_bits(gb, frame_len_bits) + 4;
+                    } else
+                        offset += get_bits(gb, 2) + 1;
+                }
+            }
+            sign = get_bits1(gb) - 1;
+            ptr[offset & coef_mask] = (level^sign) - sign;
+        }
+    }
+    /** NOTE: EOB can be omitted */
+    if (offset > num_coefs) {
+        av_log(avctx, AV_LOG_ERROR, "overflow in spectral RLE, ignoring\n");
+        return -1;
+    }
+
+    return 0;
+}
+