# HG changeset patch # User stefang # Date 1183790960 0 # Node ID deb5b8213d4e730ccc968c109df16d8f5203ba05 # Parent 74b6423a5a0d4f6f33ece6748fcdf1964ddba829 cosmetic: rename VLC tables to make clear they are for decoding diff -r 74b6423a5a0d -r deb5b8213d4e cavs.c --- a/cavs.c Sat Jul 07 06:34:30 2007 +0000 +++ b/cavs.c Sat Jul 07 06:49:20 2007 +0000 @@ -497,7 +497,7 @@ * @param stride line stride in frame buffer */ static int decode_residual_block(AVSContext *h, GetBitContext *gb, - const residual_vlc_t *r, int esc_golomb_order, + const dec_2dvlc_t *r, int esc_golomb_order, int qp, uint8_t *dst, int stride) { int i,pos = -1; int level_code, esc_code, level, run, mask; @@ -547,10 +547,10 @@ static inline void decode_residual_chroma(AVSContext *h) { if(h->cbp & (1<<4)) - decode_residual_block(h,&h->s.gb,chroma_2dvlc,0, chroma_qp[h->qp], + decode_residual_block(h,&h->s.gb,chroma_dec,0, chroma_qp[h->qp], h->cu,h->c_stride); if(h->cbp & (1<<5)) - decode_residual_block(h,&h->s.gb,chroma_2dvlc,0, chroma_qp[h->qp], + decode_residual_block(h,&h->s.gb,chroma_dec,0, chroma_qp[h->qp], h->cv,h->c_stride); } @@ -570,7 +570,7 @@ h->qp = (h->qp + get_se_golomb(&h->s.gb)) & 63; for(block=0;block<4;block++) if(h->cbp & (1<s.gb,inter_2dvlc,0,h->qp, + decode_residual_block(h,&h->s.gb,inter_dec,0,h->qp, h->cy + h->luma_scan[block], h->l_stride); decode_residual_chroma(h); @@ -633,7 +633,7 @@ h->intra_pred_l[h->pred_mode_Y[scan3x3[block]]] (d, top, left, h->l_stride); if(h->cbp & (1<qp,d,h->l_stride); + decode_residual_block(h,gb,intra_dec,1,h->qp,d,h->l_stride); } /* chroma intra prediction */ diff -r 74b6423a5a0d -r deb5b8213d4e cavs.h --- a/cavs.h Sat Jul 07 06:34:30 2007 +0000 +++ b/cavs.h Sat Jul 07 06:49:20 2007 +0000 @@ -144,13 +144,13 @@ int16_t ref; } vector_t; -typedef struct residual_vlc_t { +typedef struct dec_2dvlc_t { int8_t rltab[59][3]; int8_t level_add[27]; int8_t golomb_order; int inc_limit; int8_t max_run; -} residual_vlc_t; +} dec_2dvlc_t; typedef struct { MpegEncContext s; diff -r 74b6423a5a0d -r deb5b8213d4e cavsdata.h --- a/cavsdata.h Sat Jul 07 06:34:30 2007 +0000 +++ b/cavsdata.h Sat Jul 07 06:49:20 2007 +0000 @@ -117,7 +117,7 @@ #define EOB 0,0,0 -static const residual_vlc_t intra_2dvlc[7] = { +static const dec_2dvlc_t intra_dec[7] = { { { //level / run / table_inc { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, @@ -254,7 +254,7 @@ } }; -static const residual_vlc_t inter_2dvlc[7] = { +static const dec_2dvlc_t inter_dec[7] = { { { //level / run { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, @@ -391,7 +391,7 @@ } }; -static const residual_vlc_t chroma_2dvlc[5] = { +static const dec_2dvlc_t chroma_dec[5] = { { { //level / run { 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1},