summaryrefslogtreecommitdiff
path: root/libavcodec/mpc7.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-04-17 14:09:56 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-04-17 14:09:56 +0000
commitbd4110f99b6c4ce3a7fc134206404489dc8e41a6 (patch)
tree95f65ac0ae35b2dd652f1e6c3608a855b369b84c /libavcodec/mpc7.c
parent1d0036b01f1860fdead35a6efcdc1d0beb4c3269 (diff)
downloadffmpeg-bd4110f99b6c4ce3a7fc134206404489dc8e41a6.tar.gz
Use new static VLC scheme in Indeo2, Musepack and WNV1 decoders
Originally committed as revision 18553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpc7.c')
-rw-r--r--libavcodec/mpc7.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 2c4083fb73..75f65163ea 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -40,6 +40,13 @@
static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
+static uint16_t quant_offsets[MPC7_QUANT_VLC_TABLES*2 + 1] =
+{
+ 0, 512, 1024, 1536, 2052, 2564, 3076, 3588, 4100, 4612, 5124,
+ 5636, 6164, 6676, 7224
+};
+
+
static av_cold int mpc7_decode_init(AVCodecContext * avctx)
{
int i, j;
@@ -48,6 +55,11 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
uint8_t buf[16];
static int vlc_initialized = 0;
+ static VLC_TYPE scfi_table[1 << MPC7_SCFI_BITS][2];
+ static VLC_TYPE dscf_table[1 << MPC7_DSCF_BITS][2];
+ static VLC_TYPE hdr_table[1 << MPC7_HDR_BITS][2];
+ static VLC_TYPE quant_tables[7224][2];
+
if(avctx->extradata_size < 16){
av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
return -1;
@@ -75,29 +87,37 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
if(vlc_initialized) return 0;
av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
+ scfi_vlc.table = scfi_table;
+ scfi_vlc.table_allocated = 1 << MPC7_SCFI_BITS;
if(init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
&mpc7_scfi[1], 2, 1,
- &mpc7_scfi[0], 2, 1, INIT_VLC_USE_STATIC)){
+ &mpc7_scfi[0], 2, 1, INIT_VLC_USE_NEW_STATIC)){
av_log(avctx, AV_LOG_ERROR, "Cannot init SCFI VLC\n");
return -1;
}
+ dscf_vlc.table = dscf_table;
+ dscf_vlc.table_allocated = 1 << MPC7_DSCF_BITS;
if(init_vlc(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
&mpc7_dscf[1], 2, 1,
- &mpc7_dscf[0], 2, 1, INIT_VLC_USE_STATIC)){
+ &mpc7_dscf[0], 2, 1, INIT_VLC_USE_NEW_STATIC)){
av_log(avctx, AV_LOG_ERROR, "Cannot init DSCF VLC\n");
return -1;
}
+ hdr_vlc.table = hdr_table;
+ hdr_vlc.table_allocated = 1 << MPC7_HDR_BITS;
if(init_vlc(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
&mpc7_hdr[1], 2, 1,
- &mpc7_hdr[0], 2, 1, INIT_VLC_USE_STATIC)){
+ &mpc7_hdr[0], 2, 1, INIT_VLC_USE_NEW_STATIC)){
av_log(avctx, AV_LOG_ERROR, "Cannot init HDR VLC\n");
return -1;
}
for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
for(j = 0; j < 2; j++){
+ quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]];
+ quant_vlc[i][j].table_allocated = quant_offsets[i*2 + j + 1] - quant_offsets[i*2 + j];
if(init_vlc(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
&mpc7_quant_vlc[i][j][1], 4, 2,
- &mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_STATIC)){
+ &mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_NEW_STATIC)){
av_log(avctx, AV_LOG_ERROR, "Cannot init QUANT VLC %i,%i\n",i,j);
return -1;
}