diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 14:49:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 14:50:41 +0200 |
| commit | 72e5d9190843b4da113477877d69a9f72f319410 (patch) | |
| tree | e016f324540c387a3781533b82b7b7ee1b658b2c /libavcodec | |
| parent | 3fdd0979acd384f1c006aa5ca097e39a7b735983 (diff) | |
vc1dec: factorize picture pointer selection code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index fc2614696d..a21bdbae20 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -384,32 +384,20 @@ static void vc1_mc_1mv(VC1Context *v, int dir) uvmx = uvmx + ((uvmx < 0) ? (uvmx & 1) : -(uvmx & 1)); uvmy = uvmy + ((uvmy < 0) ? (uvmy & 1) : -(uvmy & 1)); } - if (v->field_mode) { // interlaced field picture - if (!dir) { - if ((v->cur_field_type != v->ref_field_type[dir]) && v->second_field) { - srcY = s->current_picture.f.data[0]; - srcU = s->current_picture.f.data[1]; - srcV = s->current_picture.f.data[2]; - } else { - srcY = s->last_picture.f.data[0]; - srcU = s->last_picture.f.data[1]; - srcV = s->last_picture.f.data[2]; - } + if (!dir) { + if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) { + srcY = s->current_picture.f.data[0]; + srcU = s->current_picture.f.data[1]; + srcV = s->current_picture.f.data[2]; } else { - srcY = s->next_picture.f.data[0]; - srcU = s->next_picture.f.data[1]; - srcV = s->next_picture.f.data[2]; - } - } else { - if (!dir) { srcY = s->last_picture.f.data[0]; srcU = s->last_picture.f.data[1]; srcV = s->last_picture.f.data[2]; - } else { - srcY = s->next_picture.f.data[0]; - srcU = s->next_picture.f.data[1]; - srcV = s->next_picture.f.data[2]; } + } else { + srcY = s->next_picture.f.data[0]; + srcU = s->next_picture.f.data[1]; + srcV = s->next_picture.f.data[2]; } if(!srcY) @@ -574,11 +562,8 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg) my = s->mv[dir][n][1]; if (!dir) { - if (v->field_mode) { - if ((v->cur_field_type != v->ref_field_type[dir]) && v->second_field) - srcY = s->current_picture.f.data[0]; - else - srcY = s->last_picture.f.data[0]; + if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) { + srcY = s->current_picture.f.data[0]; } else srcY = s->last_picture.f.data[0]; } else |