|
|
|
@ -2640,15 +2640,9 @@ static void vc1_decode_i_blocks(VC1Context *v) |
|
|
|
|
v->left_blk_idx = (v->left_blk_idx + 1) % (v->end_mb_x + 2); |
|
|
|
|
v->cur_blk_idx = (v->cur_blk_idx + 1) % (v->end_mb_x + 2); |
|
|
|
|
} |
|
|
|
|
if (!v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); |
|
|
|
|
else if (s->mb_y) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); |
|
|
|
|
|
|
|
|
|
s->first_slice_line = 0; |
|
|
|
|
} |
|
|
|
|
if (v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); |
|
|
|
|
|
|
|
|
|
/* This is intentionally mb_height and not end_mb_y - unlike in advanced
|
|
|
|
|
* profile, these only differ are when decoding MSS2 rectangles. */ |
|
|
|
@ -2786,15 +2780,9 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) |
|
|
|
|
inc_blk_idx(v->left_blk_idx); |
|
|
|
|
inc_blk_idx(v->cur_blk_idx); |
|
|
|
|
} |
|
|
|
|
if (!v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); |
|
|
|
|
else if (s->mb_y) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->mb_y-1) * 16, 16); |
|
|
|
|
s->first_slice_line = 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); |
|
|
|
|
ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, |
|
|
|
|
(s->end_mb_y << v->field_mode) - 1, ER_MB_END); |
|
|
|
|
return 0; |
|
|
|
@ -2882,12 +2870,8 @@ static void vc1_decode_p_blocks(VC1Context *v) |
|
|
|
|
memmove(v->luma_mv_base, |
|
|
|
|
v->luma_mv - s->mb_stride, |
|
|
|
|
sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride); |
|
|
|
|
if (s->mb_y != s->start_mb_y) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); |
|
|
|
|
s->first_slice_line = 0; |
|
|
|
|
} |
|
|
|
|
if (s->end_mb_y >= s->start_mb_y) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); |
|
|
|
|
ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, |
|
|
|
|
(s->end_mb_y << v->field_mode) - 1, ER_MB_END); |
|
|
|
|
} |
|
|
|
@ -2964,14 +2948,8 @@ static void vc1_decode_b_blocks(VC1Context *v) |
|
|
|
|
memmove(v->is_intra_base, |
|
|
|
|
v->is_intra - s->mb_stride, |
|
|
|
|
sizeof(v->is_intra_base[0]) * 2 * s->mb_stride); |
|
|
|
|
if (!v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); |
|
|
|
|
else if (s->mb_y) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); |
|
|
|
|
s->first_slice_line = 0; |
|
|
|
|
} |
|
|
|
|
if (v->s.loop_filter) |
|
|
|
|
ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); |
|
|
|
|
ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, |
|
|
|
|
(s->end_mb_y << v->field_mode) - 1, ER_MB_END); |
|
|
|
|
} |
|
|
|
@ -2992,7 +2970,6 @@ static void vc1_decode_skip_blocks(VC1Context *v) |
|
|
|
|
memcpy(s->dest[0], s->last_picture.f->data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16); |
|
|
|
|
memcpy(s->dest[1], s->last_picture.f->data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); |
|
|
|
|
memcpy(s->dest[2], s->last_picture.f->data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); |
|
|
|
|
ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); |
|
|
|
|
s->first_slice_line = 0; |
|
|
|
|
} |
|
|
|
|
s->pict_type = AV_PICTURE_TYPE_P; |
|
|
|
|