comparison vc1.c @ 8645:ead59531f24a libavcodec

avoid duplication of size_table and offset_table
author stefang
date Sat, 24 Jan 2009 14:28:08 +0000
parents ad979489c6e7
children ed386fa1399e
comparison
equal deleted inserted replaced
8644:0b13b33e175e 8645:ead59531f24a
3101 break; 3101 break;
3102 } 3102 }
3103 return pat; 3103 return pat;
3104 } 3104 }
3105 3105
3106 static const int size_table [6] = { 0, 2, 3, 4, 5, 8 };
3107 static const int offset_table[6] = { 0, 1, 3, 7, 15, 31 };
3106 3108
3107 /** Decode one P-frame MB (in Simple/Main profile) 3109 /** Decode one P-frame MB (in Simple/Main profile)
3108 */ 3110 */
3109 static int vc1_decode_p_mb(VC1Context *v) 3111 static int vc1_decode_p_mb(VC1Context *v)
3110 { 3112 {
3114 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; 3116 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3115 int cbp; /* cbp decoding stuff */ 3117 int cbp; /* cbp decoding stuff */
3116 int mqdiff, mquant; /* MB quantization */ 3118 int mqdiff, mquant; /* MB quantization */
3117 int ttmb = v->ttfrm; /* MB Transform type */ 3119 int ttmb = v->ttfrm; /* MB Transform type */
3118 3120
3119 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
3120 offset_table[6] = { 0, 1, 3, 7, 15, 31 };
3121 int mb_has_coeffs = 1; /* last_flag */ 3121 int mb_has_coeffs = 1; /* last_flag */
3122 int dmv_x, dmv_y; /* Differential MV components */ 3122 int dmv_x, dmv_y; /* Differential MV components */
3123 int index, index1; /* LUT indexes */ 3123 int index, index1; /* LUT indexes */
3124 int val, sign; /* temp values */ 3124 int val, sign; /* temp values */
3125 int first_block = 1; 3125 int first_block = 1;
3409 int i, j; 3409 int i, j;
3410 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; 3410 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3411 int cbp = 0; /* cbp decoding stuff */ 3411 int cbp = 0; /* cbp decoding stuff */
3412 int mqdiff, mquant; /* MB quantization */ 3412 int mqdiff, mquant; /* MB quantization */
3413 int ttmb = v->ttfrm; /* MB Transform type */ 3413 int ttmb = v->ttfrm; /* MB Transform type */
3414
3415 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
3416 offset_table[6] = { 0, 1, 3, 7, 15, 31 };
3417 int mb_has_coeffs = 0; /* last_flag */ 3414 int mb_has_coeffs = 0; /* last_flag */
3418 int index, index1; /* LUT indexes */ 3415 int index, index1; /* LUT indexes */
3419 int val, sign; /* temp values */ 3416 int val, sign; /* temp values */
3420 int first_block = 1; 3417 int first_block = 1;
3421 int dst_idx, off; 3418 int dst_idx, off;