har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc1dec: Factorize srcU/V offseting

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2012-11-12 01:34:44 +01:00 committed by Martin Storsjö
parent 012b319d91
commit 19673db34a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/vc1dec.c
View File

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