Mercurial > libavcodec.hg
comparison vc1.c @ 4724:ea97803884e1 libavcodec
1000l to myself - get correct quantization for blocks 1 and 2
P.S. This condition could be also written as if(n==3 || n==(2-dc_pred_dir))
author | kostya |
---|---|
date | Sun, 25 Mar 2007 06:00:06 +0000 |
parents | b4dd7005d807 |
children | 17f982d0141b |
comparison
equal
deleted
inserted
replaced
4723:b62a3a46856c | 4724:ea97803884e1 |
---|---|
2952 ac_val -= 16 * s->block_wrap[n]; | 2952 ac_val -= 16 * s->block_wrap[n]; |
2953 | 2953 |
2954 q1 = s->current_picture.qscale_table[mb_pos]; | 2954 q1 = s->current_picture.qscale_table[mb_pos]; |
2955 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; | 2955 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
2956 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; | 2956 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; |
2957 if(n && n<4) q2 = q1; | 2957 if(dc_pred_dir && n==1) q2 = q1; |
2958 if(!dc_pred_dir && n==2) q2 = q1; | |
2959 if(n==3) q2 = q1; | |
2958 | 2960 |
2959 if(coded) { | 2961 if(coded) { |
2960 int last = 0, skip, value; | 2962 int last = 0, skip, value; |
2961 const int8_t *zz_table; | 2963 const int8_t *zz_table; |
2962 int k; | 2964 int k; |
3157 ac_val -= 16 * s->block_wrap[n]; | 3159 ac_val -= 16 * s->block_wrap[n]; |
3158 | 3160 |
3159 q1 = s->current_picture.qscale_table[mb_pos]; | 3161 q1 = s->current_picture.qscale_table[mb_pos]; |
3160 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; | 3162 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
3161 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; | 3163 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; |
3162 if(n && n<4) q2 = q1; | 3164 if(dc_pred_dir && n==1) q2 = q1; |
3165 if(!dc_pred_dir && n==2) q2 = q1; | |
3166 if(n==3) q2 = q1; | |
3163 | 3167 |
3164 if(coded) { | 3168 if(coded) { |
3165 int last = 0, skip, value; | 3169 int last = 0, skip, value; |
3166 const int8_t *zz_table; | 3170 const int8_t *zz_table; |
3167 int k; | 3171 int k; |