# HG changeset patch # User kostya # Date 1201940809 0 # Node ID e0601aa8ebef7fb09d2f0515069dd4080ce2ebbe # Parent 23c0704067f677de930eb50140a47de0dfd8417f IMC decoder always operates on 64-byte blocks diff -r 23c0704067f6 -r e0601aa8ebef imc.c --- a/imc.c Fri Feb 01 23:49:56 2008 +0000 +++ b/imc.c Sat Feb 02 08:26:49 2008 +0000 @@ -41,6 +41,7 @@ #include "imcdata.h" +#define IMC_BLOCK_SIZE 64 #define IMC_FRAME_ID 0x21 #define BANDS 32 #define COEFFS 256 @@ -637,11 +638,10 @@ int counter, bitscount; uint16_t *buf16 = (uint16_t *) buf; - /* FIXME: input should not be modified */ - for(i = 0; i < FFMIN(buf_size, avctx->block_align) / 2; i++) + for(i = 0; i < IMC_BLOCK_SIZE / 2; i++) buf16[i] = bswap_16(buf16[i]); - init_get_bits(&q->gb, buf, 512); + init_get_bits(&q->gb, buf, IMC_BLOCK_SIZE * 8); /* Check the frame header */ imc_hdr = get_bits(&q->gb, 9); @@ -788,7 +788,7 @@ *data_size = COEFFS * sizeof(int16_t); - return avctx->block_align; + return IMC_BLOCK_SIZE; }