Write-only since 9cc74c9f6e8b645e67d45b2070db004caca09af7.
Unified · Split
| @@ -724,7 +724,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) · 723 unmodified lines | |||
| 724 | INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1); | 724 | INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1); |
| 725 | INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1); | 725 | INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1); |
| 726 | } | 726 | } |
| 727 | v->qs_last = v->s.quarter_sample; | ||
| 728 | if (v->mv_mode == MV_PMODE_INTENSITY_COMP) { | 727 | if (v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
| 729 | v->s.quarter_sample = (v->mv_mode2 != MV_PMODE_1MV_HPEL && | 728 | v->s.quarter_sample = (v->mv_mode2 != MV_PMODE_1MV_HPEL && |
| 730 | v->mv_mode2 != MV_PMODE_1MV_HPEL_BILIN); | 729 | v->mv_mode2 != MV_PMODE_1MV_HPEL_BILIN); |
| @@ -781,7 +780,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) · 50 unmodified lines | |||
| 781 | v->tt_index = (v->pq > 4) + (v->pq > 12); | 780 | v->tt_index = (v->pq > 4) + (v->pq > 12); |
| 782 | 781 | ||
| 783 | v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; | 782 | v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; |
| 784 | v->qs_last = v->s.quarter_sample; | ||
| 785 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); | 783 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); |
| 786 | v->s.mspel = v->s.quarter_sample; | 784 | v->s.mspel = v->s.quarter_sample; |
| 787 | 785 | ||
| @@ -1119,7 +1117,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) · 331 unmodified lines | |||
| 1119 | } | 1117 | } |
| 1120 | v->last_use_ic = 1; | 1118 | v->last_use_ic = 1; |
| 1121 | } | 1119 | } |
| 1122 | v->qs_last = v->s.quarter_sample; | ||
| 1123 | if (v->mv_mode == MV_PMODE_INTENSITY_COMP) { | 1120 | if (v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
| 1124 | v->s.quarter_sample = (v->mv_mode2 != MV_PMODE_1MV_HPEL && | 1121 | v->s.quarter_sample = (v->mv_mode2 != MV_PMODE_1MV_HPEL && |
| 1125 | v->mv_mode2 != MV_PMODE_1MV_HPEL_BILIN); | 1122 | v->mv_mode2 != MV_PMODE_1MV_HPEL_BILIN); |
| @@ -1154,7 +1151,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) · 28 unmodified lines | |||
| 1154 | v->cbptab = get_bits(gb, 2); | 1151 | v->cbptab = get_bits(gb, 2); |
| 1155 | v->cbpcy_vlc = ff_vc1_cbpcy_p_vlc[v->cbptab]; | 1152 | v->cbpcy_vlc = ff_vc1_cbpcy_p_vlc[v->cbptab]; |
| 1156 | } else if (v->fcm == ILACE_FRAME) { // frame interlaced | 1153 | } else if (v->fcm == ILACE_FRAME) { // frame interlaced |
| 1157 | v->qs_last = v->s.quarter_sample; | ||
| 1158 | v->s.quarter_sample = 1; | 1154 | v->s.quarter_sample = 1; |
| 1159 | v->s.mspel = 1; | 1155 | v->s.mspel = 1; |
| 1160 | } else { // field interlaced | 1156 | } else { // field interlaced |
| @@ -1218,7 +1214,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) · 57 unmodified lines | |||
| 1218 | mvmode = get_unary(gb, 1, 3); | 1214 | mvmode = get_unary(gb, 1, 3); |
| 1219 | lowquant = (v->pq > 12) ? 0 : 1; | 1215 | lowquant = (v->pq > 12) ? 0 : 1; |
| 1220 | v->mv_mode = ff_vc1_mv_pmode_table2[lowquant][mvmode]; | 1216 | v->mv_mode = ff_vc1_mv_pmode_table2[lowquant][mvmode]; |
| 1221 | v->qs_last = v->s.quarter_sample; | ||
| 1222 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV || v->mv_mode == MV_PMODE_MIXED_MV); | 1217 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV || v->mv_mode == MV_PMODE_MIXED_MV); |
| 1223 | v->s.mspel = (v->mv_mode != MV_PMODE_1MV_HPEL_BILIN); | 1218 | v->s.mspel = (v->mv_mode != MV_PMODE_1MV_HPEL_BILIN); |
| 1224 | status = bitplane_decoding(v->forward_mb_plane, &v->fmb_is_raw, v); | 1219 | status = bitplane_decoding(v->forward_mb_plane, &v->fmb_is_raw, v); |
| @@ -1248,7 +1243,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) · 23 unmodified lines | |||
| 1248 | v->intcomp = 0; | 1243 | v->intcomp = 0; |
| 1249 | v->mv_mode = MV_PMODE_1MV; | 1244 | v->mv_mode = MV_PMODE_1MV; |
| 1250 | v->fourmvswitch = 0; | 1245 | v->fourmvswitch = 0; |
| 1251 | v->qs_last = v->s.quarter_sample; | ||
| 1252 | v->s.quarter_sample = 1; | 1246 | v->s.quarter_sample = 1; |
| 1253 | v->s.mspel = 1; | 1247 | v->s.mspel = 1; |
| 1254 | status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); | 1248 | status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); |
| @@ -1274,7 +1268,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) · 19 unmodified lines | |||
| 1274 | v->fourmvbp_vlc = ff_vc1_4mv_block_pattern_vlc[v->fourmvbptab]; | 1268 | v->fourmvbp_vlc = ff_vc1_4mv_block_pattern_vlc[v->fourmvbptab]; |
| 1275 | } else { | 1269 | } else { |
| 1276 | v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; | 1270 | v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; |
| 1277 | v->qs_last = v->s.quarter_sample; | ||
| 1278 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); | 1271 | v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); |
| 1279 | v->s.mspel = v->s.quarter_sample; | 1272 | v->s.mspel = v->s.quarter_sample; |
| 1280 | status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); | 1273 | status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); |
| @@ -365,7 +365,6 @@ typedef struct VC1Context{ · 364 unmodified lines | |||
| 365 | int cur_field_type; ///< 0: top, 1: bottom | 365 | int cur_field_type; ///< 0: top, 1: bottom |
| 366 | int ref_field_type[2]; ///< forward and backward reference field type (top or bottom) | 366 | int ref_field_type[2]; ///< forward and backward reference field type (top or bottom) |
| 367 | int blocks_off, mb_off; | 367 | int blocks_off, mb_off; |
| 368 | int qs_last; ///< if qpel has been used in the previous (tr.) picture | ||
| 369 | int bmvtype; | 368 | int bmvtype; |
| 370 | int frfd, brfd; ///< reference frame distance (forward or backward) | 369 | int frfd, brfd; ///< reference frame distance (forward or backward) |
| 371 | int first_pic_header_flag; | 370 | int first_pic_header_flag; |