virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

vc1dec: take ME precision into account while scaling MV predictors.

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
shahriman AMS 2011-11-08 08:47:30 +00:00 committed by Anton Khirnov
parent 055a141e44
commit 6475a6e1ca
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/vc1dec.c
View File

@ -1422,29 +1422,36 @@ static av_always_inline int scaleforsame(VC1Context *v, int i, int n /* MV */,
int dim, int dir) int dim, int dir)
{ {
int brfd, scalesame; int brfd, scalesame;
int hpel = 1 - v->s.quarter_sample;
n >>= hpel;
if (v->s.pict_type != AV_PICTURE_TYPE_B || v->second_field || !dir) { if (v->s.pict_type != AV_PICTURE_TYPE_B || v->second_field || !dir) {
if (dim) if (dim)
return scaleforsame_y(v, i, n, dir); n = scaleforsame_y(v, i, n, dir) << hpel;
else else
return scaleforsame_x(v, n, dir); n = scaleforsame_x(v, n, dir) << hpel;
return n;
} }
brfd = FFMIN(v->brfd, 3); brfd = FFMIN(v->brfd, 3);
scalesame = vc1_b_field_mvpred_scales[0][brfd]; scalesame = vc1_b_field_mvpred_scales[0][brfd];
return n * scalesame >> 8; n = (n * scalesame >> 8) << hpel;
return n;
} }
static av_always_inline int scaleforopp(VC1Context *v, int n /* MV */, static av_always_inline int scaleforopp(VC1Context *v, int n /* MV */,
int dim, int dir) int dim, int dir)
{ {
int refdist, scaleopp; int refdist, scaleopp;
int hpel = 1 - v->s.quarter_sample;
n >>= hpel;
if (v->s.pict_type == AV_PICTURE_TYPE_B && !v->second_field && dir == 1) { if (v->s.pict_type == AV_PICTURE_TYPE_B && !v->second_field && dir == 1) {
if (dim) if (dim)
return scaleforopp_y(v, n, dir); n = scaleforopp_y(v, n, dir) << hpel;
else else
return scaleforopp_x(v, n); n = scaleforopp_x(v, n) << hpel;
return n;
} }
if (v->s.pict_type != AV_PICTURE_TYPE_B) if (v->s.pict_type != AV_PICTURE_TYPE_B)
refdist = FFMIN(v->refdist, 3); refdist = FFMIN(v->refdist, 3);
@ -1452,7 +1459,8 @@ static av_always_inline int scaleforopp(VC1Context *v, int n /* MV */,
refdist = dir ? v->brfd : v->frfd; refdist = dir ? v->brfd : v->frfd;
scaleopp = vc1_field_mvpred_scales[dir ^ v->second_field][0][refdist]; scaleopp = vc1_field_mvpred_scales[dir ^ v->second_field][0][refdist];
return n * scaleopp >> 8; n = (n * scaleopp >> 8) << hpel;
return n;
} }
/** Predict and set motion vector /** Predict and set motion vector