diff options
| author | Sascha Sommer <saschasommer@freenet.de> | 2011-01-14 16:36:57 +0000 |
|---|---|---|
| committer | Sascha Sommer <saschasommer@freenet.de> | 2011-01-14 16:36:57 +0000 |
| commit | 75e4efd2a7fc93d6aaa09d6a896146f40c5d102d (patch) | |
| tree | bdc17240b1087d6230e85009dd96a4b774564c6b | |
| parent | b070bcfe8a305ab7fb550092f01a728b60b2ca5b (diff) | |
| download | ffmpeg-75e4efd2a7fc93d6aaa09d6a896146f40c5d102d.tar.gz | |
add support for blocksize 64
fixes issue 2537 and 2538
Originally committed as revision 26328 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/wmaprodec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 5f2375b104..d705cc725c 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -100,9 +100,10 @@ #define MAX_BANDS 29 ///< max number of scale factor bands #define MAX_FRAMESIZE 32768 ///< maximum compressed frame size +#define WMAPRO_BLOCK_MIN_BITS 6 ///< log2 of min block size #define WMAPRO_BLOCK_MAX_BITS 12 ///< log2 of max block size #define WMAPRO_BLOCK_MAX_SIZE (1 << WMAPRO_BLOCK_MAX_BITS) ///< maximum block size -#define WMAPRO_BLOCK_SIZES (WMAPRO_BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) ///< possible block sizes +#define WMAPRO_BLOCK_SIZES (WMAPRO_BLOCK_MAX_BITS - WMAPRO_BLOCK_MIN_BITS + 1) ///< possible block sizes #define VLCBITS 9 @@ -417,8 +418,8 @@ static av_cold int decode_init(AVCodecContext *avctx) /** init MDCT, FIXME: only init needed sizes */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) - ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1, - 1.0 / (1 << (BLOCK_MIN_BITS + i - 1)) + ff_mdct_init(&s->mdct_ctx[i], WMAPRO_BLOCK_MIN_BITS+1+i, 1, + 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1)) / (1 << (s->bits_per_sample - 1))); /** init MDCT windows: simple sinus window */ @@ -1021,7 +1022,7 @@ static void wmapro_window(WMAProDecodeCtx *s) winlen = s->subframe_len; } - window = s->windows[av_log2(winlen) - BLOCK_MIN_BITS]; + window = s->windows[av_log2(winlen) - WMAPRO_BLOCK_MIN_BITS]; winlen >>= 1; @@ -1233,7 +1234,7 @@ static int decode_subframe(WMAProDecodeCtx *s) } /** apply imdct (ff_imdct_half == DCTIV with reverse) */ - ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len) - BLOCK_MIN_BITS], + ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len) - WMAPRO_BLOCK_MIN_BITS], s->channel[c].coeffs, s->tmp); } } |