|
|
|
@ -4938,15 +4938,17 @@ static void vc1_draw_sprites(VC1Context *v, SpriteData* sd) |
|
|
|
|
int iline = s->current_picture.f.linesize[plane]; |
|
|
|
|
int ycoord = yoff[sprite] + yadv[sprite] * row; |
|
|
|
|
int yline = ycoord >> 16; |
|
|
|
|
int next_line; |
|
|
|
|
ysub[sprite] = ycoord & 0xFFFF; |
|
|
|
|
if (sprite) { |
|
|
|
|
iplane = s->last_picture.f.data[plane]; |
|
|
|
|
iline = s->last_picture.f.linesize[plane]; |
|
|
|
|
} |
|
|
|
|
next_line = FFMIN(yline + 1, (v->sprite_height >> !!plane) - 1) * iline; |
|
|
|
|
if (!(xoff[sprite] & 0xFFFF) && xadv[sprite] == 1 << 16) { |
|
|
|
|
src_h[sprite][0] = iplane + (xoff[sprite] >> 16) + yline * iline; |
|
|
|
|
if (ysub[sprite]) |
|
|
|
|
src_h[sprite][1] = iplane + (xoff[sprite] >> 16) + (yline + 1) * iline; |
|
|
|
|
src_h[sprite][1] = iplane + (xoff[sprite] >> 16) + next_line; |
|
|
|
|
} else { |
|
|
|
|
if (sr_cache[sprite][0] != yline) { |
|
|
|
|
if (sr_cache[sprite][1] == yline) { |
|
|
|
@ -4958,7 +4960,9 @@ static void vc1_draw_sprites(VC1Context *v, SpriteData* sd) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (ysub[sprite] && sr_cache[sprite][1] != yline + 1) { |
|
|
|
|
v->vc1dsp.sprite_h(v->sr_rows[sprite][1], iplane + (yline + 1) * iline, xoff[sprite], xadv[sprite], width); |
|
|
|
|
v->vc1dsp.sprite_h(v->sr_rows[sprite][1], |
|
|
|
|
iplane + next_line, xoff[sprite], |
|
|
|
|
xadv[sprite], width); |
|
|
|
|
sr_cache[sprite][1] = yline + 1; |
|
|
|
|
} |
|
|
|
|
src_h[sprite][0] = v->sr_rows[sprite][0]; |
|
|
|
|