Browse Source

vc1dec: Factorize srcU/V offseting

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.0
Michael Niedermayer Martin Storsjö 13 years ago
parent
commit
19673db34a
1 changed files with 11 additions and 8 deletions
  1. +11
    -8
      libavcodec/vc1dec.c

+ 11
- 8
libavcodec/vc1dec.c View File

@@ -846,21 +846,24 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
if (!dir) {
if (v->field_mode) {
if ((v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
srcU = s->current_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcV = s->current_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcU = s->current_picture.f.data[1];
srcV = s->current_picture.f.data[2];
} else {
srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcU = s->last_picture.f.data[1];
srcV = s->last_picture.f.data[2];
}
} else {
srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcU = s->last_picture.f.data[1];
srcV = s->last_picture.f.data[2];
}
} else {
srcU = s->next_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcV = s->next_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcU = s->next_picture.f.data[1];
srcV = s->next_picture.f.data[2];
}

srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
srcV += uvsrc_y * s->uvlinesize + uvsrc_x;

if (v->field_mode) {
if (chroma_ref_type) {
srcU += s->current_picture_ptr->f.linesize[1];


Loading…
Cancel
Save