libavcodec.hg: h263.c comparison

comparison h263.c @ 544:5264fb104700 libavcodec

optimization (get_vlc -> get_vlc2)

author	michaelni
date	Sat, 13 Jul 2002 15:45:52 +0000
parents	d55978a3c369
children	218eb765c987

comparison

equal deleted inserted replaced

-:8f8f4885d874
+:5264fb104700
 //rounded divison & shift
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))
 #define PRINT_MB_TYPE(a) {}
 //#define PRINT_MB_TYPE(a) printf(a)
+#define INTRA_MCBPC_VLC_BITS 6
+#define INTER_MCBPC_VLC_BITS 6
+#define CBPY_VLC_BITS 6
+#define MV_VLC_BITS 9
+#define DC_VLC_BITS 9
+#define SPRITE_TRAJ_VLC_BITS 6
+#define MB_TYPE_B_VLC_BITS 4
+#define TEX_VLC_BITS 9
 static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
 			      int n);
 static void h263_encode_motion(MpegEncContext * s, int val, int fcode);
 static void h263p_encode_umotion(MpegEncContext * s, int val);
 static int done = 0;
 if (!done) {
 done = 1;
-init_vlc(&intra_MCBPC_vlc, 6, 8,
+init_vlc(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 8,
 intra_MCBPC_bits, 1, 1,
 intra_MCBPC_code, 1, 1);
-init_vlc(&inter_MCBPC_vlc, 9, 25,
+init_vlc(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 25,
 inter_MCBPC_bits, 1, 1,
 inter_MCBPC_code, 1, 1);
-init_vlc(&cbpy_vlc, 6, 16,
+init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16,
 &cbpy_tab[0][1], 2, 1,
 &cbpy_tab[0][0], 2, 1);
-init_vlc(&mv_vlc, 9, 33,
+init_vlc(&mv_vlc, MV_VLC_BITS, 33,
 &mvtab[0][1], 2, 1,
 &mvtab[0][0], 2, 1);
 init_rl(&rl_inter);
 init_rl(&rl_intra);
 init_rl(&rl_intra_aic);
 init_vlc_rl(&rl_inter);
 init_vlc_rl(&rl_intra);
 init_vlc_rl(&rl_intra_aic);
-init_vlc(&dc_lum, 9, 13,
+init_vlc(&dc_lum, DC_VLC_BITS, 9 /* 13 */,
 &DCtab_lum[0][1], 2, 1,
 &DCtab_lum[0][0], 2, 1);
-init_vlc(&dc_chrom, 9, 13,
+init_vlc(&dc_chrom, DC_VLC_BITS, 9 /* 13 */,
 &DCtab_chrom[0][1], 2, 1,
 &DCtab_chrom[0][0], 2, 1);
-init_vlc(&sprite_trajectory, 9, 15,
+init_vlc(&sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15,
 &sprite_trajectory_tab[0][1], 4, 2,
 &sprite_trajectory_tab[0][0], 4, 2);
-init_vlc(&mb_type_b_vlc, 4, 4,
+init_vlc(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4,
 &mb_type_b_tab[0][1], 2, 1,
 &mb_type_b_tab[0][0], 2, 1);
 }
 }
 if(s->pict_type==I_TYPE){
 int i;
 PRINT_MB_TYPE("I");
-cbpc = get_vlc(&s->gb, &intra_MCBPC_vlc);
+cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 1);
 if (cbpc < 0){
 fprintf(stderr, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
 return DECODING_DESYNC;
 }
 s->cbp_table[xy]= cbpc & 3;
 if(s->mbintra_table[xy])
 ff_clean_intra_table_entries(s);
 continue;
 }
-cbpc = get_vlc(&s->gb, &inter_MCBPC_vlc);
+cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
 if (cbpc < 0){
 fprintf(stderr, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
 return DECODING_DESYNC;
 }
 if (cbpc > 20)
 mb_num++;
 update_block_index(s);
 if(s->pict_type==I_TYPE){
 int ac_pred= get_bits1(&s->gb);
-int cbpy = get_vlc(&s->gb, &cbpy_vlc);
+int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
 if(cbpy<0){
 fprintf(stderr, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
 return DECODING_AC_LOST;
 }
 s->pred_dir_table[xy]|= ac_pred<<7;
 }else{ /* P || S_TYPE */
 if(s->mb_type[xy]&MB_TYPE_INTRA){
 int dir=0,i;
 int ac_pred = get_bits1(&s->gb);
-int cbpy = get_vlc(&s->gb, &cbpy_vlc);
+int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
 if(cbpy<0){
 fprintf(stderr, "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
 return DECODING_ACDC_LOST;
 }
 s->pred_dir_table[xy]= dir | (ac_pred<<7);
 }else if(s->mb_type[xy]&MB_TYPE_SKIPED){
 s->qscale_table[xy]= s->qscale;
 s->cbp_table[xy]= 0;
 }else{
-int cbpy = get_vlc(&s->gb, &cbpy_vlc);
+int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
 if(cbpy<0){
 fprintf(stderr, "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y);
 return DECODING_ACDC_LOST;
 }
 s->mv[0][0][1] = 0;
 s->mb_skiped = 1;
 }
 return 0;
 }
-cbpc = get_vlc(&s->gb, &inter_MCBPC_vlc);
+cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
 //fprintf(stderr, "\tCBPC: %d", cbpc);
 if (cbpc < 0)
 return -1;
 if (cbpc > 20)
 cbpc+=3;
 if (s->mb_intra) goto intra;
 if(s->pict_type==S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
 s->mcsel= get_bits1(&s->gb);
 else s->mcsel= 0;
-cbpy = get_vlc(&s->gb, &cbpy_vlc);
+cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
 cbp = (cbpc & 3) | ((cbpy ^ 0xf) << 2);
 if (dquant) {
 s->qscale += quant_tab[get_bits(&s->gb, 2)];
 if (s->qscale < 1)
 s->qscale = 1;
 }
 modb1= get_bits1(&s->gb);
 if(modb1==0){
 modb2= get_bits1(&s->gb);
-mb_type= get_vlc(&s->gb, &mb_type_b_vlc);
+mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1);
 if(modb2==0) cbp= get_bits(&s->gb, 6);
 else cbp=0;
 if (mb_type && cbp) {
 if(get_bits1(&s->gb)){
 s->qscale +=get_bits1(&s->gb)*4 - 2;
 default:
 printf("illegal MB_type\n");
 return -1;
 }
 } else { /* I-Frame */
-cbpc = get_vlc(&s->gb, &intra_MCBPC_vlc);
+cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 1);
 if (cbpc < 0)
 return -1;
 dquant = cbpc & 4;
 s->mb_intra = 1;
 intra:
 if (s->h263_pred || s->h263_aic) {
 s->ac_pred = get_bits1(&s->gb);
 if (s->ac_pred && s->h263_aic)
 s->h263_aic_dir = get_bits1(&s->gb);
 }
-cbpy = get_vlc(&s->gb, &cbpy_vlc);
+cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
 if(cbpy<0) return -1;
 cbp = (cbpc & 3) | (cbpy << 2);
 if (dquant) {
 s->qscale += quant_tab[get_bits(&s->gb, 2)];
 if (s->qscale < 1)
 static int h263_decode_motion(MpegEncContext * s, int pred, int f_code)
 {
 int code, val, sign, shift, l, m;
-code = get_vlc(&s->gb, &mv_vlc);
+code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
 if (code < 0)
 return 0xffff;
 if (code == 0)
 return pred;
 s->block_last_index[n] = i - 1;
 return 0;
 }
 for(;;) {
-code = get_vlc(&s->gb, &rl->vlc);
+code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
 if (code < 0)
 return -1;
 if (code == rl->n) {
 /* escape */
 last = get_bits1(&s->gb);
 {
 int level, pred, code;
 UINT16 *dc_val;
 if (n < 4)
-code = get_vlc(&s->gb, &dc_lum);
+code = get_vlc2(&s->gb, dc_lum.table, DC_VLC_BITS, 1);
 else
-code = get_vlc(&s->gb, &dc_chrom);
+code = get_vlc2(&s->gb, dc_chrom.table, DC_VLC_BITS, 1);
 if (code < 0 || code > 9 /* && s->nbit<9 */){
 fprintf(stderr, "illegal dc vlc\n");
 return -1;
 }
 if (code == 0) {
 rl = &rl_inter;
 scan_table = zigzag_direct;
 }
 for(;;) {
-code = get_vlc(&s->gb, &rl->vlc);
+code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
 if (code < 0)
 return DECODING_AC_LOST;
 if (code == rl->n) {
 /* escape */
 if (get_bits1(&s->gb) != 0) {
 }
 }
 #endif
 } else {
 /* second escape */
-code = get_vlc(&s->gb, &rl->vlc);
+code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
 if (code < 0 || code >= rl->n)
 return DECODING_AC_LOST;
 run = rl->table_run[code];
 level = rl->table_level[code];
 last = code >= rl->last;
 if (get_bits1(&s->gb))
 level = -level;
 }
 } else {
 /* first escape */
-code = get_vlc(&s->gb, &rl->vlc);
+code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
 if (code < 0 || code >= rl->n)
 return DECODING_AC_LOST;
 run = rl->table_run[code];
 level = rl->table_level[code];
 last = code >= rl->last;

Mercurial > libavcodec.hg

comparison h263.c @ 544:5264fb104700 libavcodec