| @@ -417,7 +417,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 416 unmodified lines |
| 417 | 417 | |
| 418 | 418 | /* scale predictors if needed */ |
| 419 | 419 | q1 = FFABS(s->cur_pic.qscale_table[mb_pos]); |
| 420 | | − dqscale_index = s->y_dc_scale_table[q1] - 1; |
| 420 | + dqscale_index = ff_wmv3_dc_scale_table[q1] - 1; |
| 421 | 421 | if (dqscale_index < 0) |
| 422 | 422 | return 0; |
| 423 | 423 | |
| @@ -434,12 +434,12 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 10 unmodified lines |
| 434 | 434 | if (c_avail && (n != 1 && n != 3)) { |
| 435 | 435 | q2 = FFABS(s->cur_pic.qscale_table[mb_pos - 1]); |
| 436 | 436 | if (q2 && q2 != q1) |
| 437 | | − c = (int)((unsigned)c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 437 | + c = (int)((unsigned)c * ff_wmv3_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 438 | 438 | } |
| 439 | 439 | if (a_avail && (n != 2 && n != 3)) { |
| 440 | 440 | q2 = FFABS(s->cur_pic.qscale_table[mb_pos - s->mb_stride]); |
| 441 | 441 | if (q2 && q2 != q1) |
| 442 | | − a = (int)((unsigned)a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 442 | + a = (int)((unsigned)a * ff_wmv3_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 443 | 443 | } |
| 444 | 444 | if (a_avail && c_avail && (n != 3)) { |
| 445 | 445 | int off = mb_pos; |
| @@ -449,7 +449,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 3 unmodified lines |
| 449 | 449 | off -= s->mb_stride; |
| 450 | 450 | q2 = FFABS(s->cur_pic.qscale_table[off]); |
| 451 | 451 | if (q2 && q2 != q1) |
| 452 | | − b = (int)((unsigned)b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 452 | + b = (int)((unsigned)b * ff_wmv3_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | if (c_avail && (!a_avail || abs(a - b) <= abs(b - c))) { |
| @@ -917,7 +917,7 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n, · 461 unmodified lines |
| 917 | 917 | quant = av_clip_uintp2(quant, 5); |
| 918 | 918 | |
| 919 | 919 | /* Set DC scale - y and c use the same so we only set y */ |
| 920 | | − s->y_dc_scale = s->y_dc_scale_table[quant]; |
| 920 | + s->y_dc_scale = ff_wmv3_dc_scale_table[quant]; |
| 921 | 921 | |
| 922 | 922 | /* Get DC differential */ |
| 923 | 923 | dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_vlc[s->dc_table_index][n >= 4], |
| @@ -1579,7 +1579,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 655 unmodified lines |
| 1579 | 1579 | GET_MQUANT(); |
| 1580 | 1580 | s->cur_pic.qscale_table[mb_pos] = mquant; |
| 1581 | 1581 | /* Set DC scale - y and c use the same so we only set y */ |
| 1582 | | − s->y_dc_scale = s->y_dc_scale_table[FFABS(mquant)]; |
| 1582 | + s->y_dc_scale = ff_wmv3_dc_scale_table[FFABS(mquant)]; |
| 1583 | 1583 | dst_idx = 0; |
| 1584 | 1584 | for (i = 0; i < 6; i++) { |
| 1585 | 1585 | v->a_avail = v->c_avail = 0; |
| @@ -1741,7 +1741,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) · 155 unmodified lines |
| 1741 | 1741 | GET_MQUANT(); |
| 1742 | 1742 | s->cur_pic.qscale_table[mb_pos] = mquant; |
| 1743 | 1743 | /* Set DC scale - y and c use the same so we only set y */ |
| 1744 | | − s->y_dc_scale = s->y_dc_scale_table[FFABS(mquant)]; |
| 1744 | + s->y_dc_scale = ff_wmv3_dc_scale_table[FFABS(mquant)]; |
| 1745 | 1745 | v->s.ac_pred = v->acpred_plane[mb_pos] = get_bits1(gb); |
| 1746 | 1746 | mb_has_coeffs = idx_mbmode & 1; |
| 1747 | 1747 | if (mb_has_coeffs) |
| @@ -2028,7 +2028,7 @@ static int vc1_decode_b_mb_intfi(VC1Context *v) · 280 unmodified lines |
| 2028 | 2028 | GET_MQUANT(); |
| 2029 | 2029 | s->cur_pic.qscale_table[mb_pos] = mquant; |
| 2030 | 2030 | /* Set DC scale - y and c use the same so we only set y */ |
| 2031 | | − s->y_dc_scale = s->y_dc_scale_table[FFABS(mquant)]; |
| 2031 | + s->y_dc_scale = ff_wmv3_dc_scale_table[FFABS(mquant)]; |
| 2032 | 2032 | v->s.ac_pred = v->acpred_plane[mb_pos] = get_bits1(gb); |
| 2033 | 2033 | mb_has_coeffs = idx_mbmode & 1; |
| 2034 | 2034 | if (mb_has_coeffs) |
| @@ -2228,7 +2228,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 193 unmodified lines |
| 2228 | 2228 | GET_MQUANT(); |
| 2229 | 2229 | s->cur_pic.qscale_table[mb_pos] = mquant; |
| 2230 | 2230 | /* Set DC scale - y and c use the same so we only set y */ |
| 2231 | | − s->y_dc_scale = s->y_dc_scale_table[FFABS(mquant)]; |
| 2231 | + s->y_dc_scale = ff_wmv3_dc_scale_table[FFABS(mquant)]; |
| 2232 | 2232 | dst_idx = 0; |
| 2233 | 2233 | for (i = 0; i < 6; i++) { |
| 2234 | 2234 | v->a_avail = v->c_avail = 0; |
| @@ -2550,7 +2550,7 @@ static void vc1_decode_i_blocks(VC1Context *v) · 315 unmodified lines |
| 2550 | 2550 | } |
| 2551 | 2551 | |
| 2552 | 2552 | /* Set DC scale - y and c use the same so we only set y */ |
| 2553 | | − s->y_dc_scale = s->y_dc_scale_table[v->pq]; |
| 2553 | + s->y_dc_scale = ff_wmv3_dc_scale_table[v->pq]; |
| 2554 | 2554 | |
| 2555 | 2555 | //do frame decode |
| 2556 | 2556 | s->mb_x = s->mb_y = 0; |
| @@ -2719,7 +2719,7 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) · 162 unmodified lines |
| 2719 | 2719 | |
| 2720 | 2720 | s->cur_pic.qscale_table[mb_pos] = mquant; |
| 2721 | 2721 | /* Set DC scale - y and c use the same so we only set y */ |
| 2722 | | − s->y_dc_scale = s->y_dc_scale_table[FFABS(mquant)]; |
| 2722 | + s->y_dc_scale = ff_wmv3_dc_scale_table[FFABS(mquant)]; |
| 2723 | 2723 | |
| 2724 | 2724 | for (k = 0; k < 6; k++) { |
| 2725 | 2725 | v->mb_type[0][s->block_index[k]] = 1; |