Mercurial > libavcodec.hg
changeset 1916:f2d134308a70 libavcodec
interlaced chroma MC divx-bug workaround
| author | michael |
|---|---|
| date | Fri, 02 Apr 2004 19:54:33 +0000 |
| parents | 284fb24da44d |
| children | 1c382d137275 |
| files | avcodec.h h263dec.c mpegvideo.c |
| diffstat | 3 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Fri Apr 02 19:48:20 2004 +0000 +++ b/avcodec.h Fri Apr 02 19:54:33 2004 +0000 @@ -840,6 +840,7 @@ #define FF_BUG_QPEL_CHROMA2 256 #define FF_BUG_DIRECT_BLOCKSIZE 512 #define FF_BUG_EDGE 1024 +#define FF_BUG_HPEL_CHROMA 2048 //#define FF_BUG_FAKE_SCALABILITY 16 //autodetection should work 100% /**
--- a/h263dec.c Fri Apr 02 19:48:20 2004 +0000 +++ b/h263dec.c Fri Apr 02 19:54:33 2004 +0000 @@ -551,6 +551,8 @@ s->workaround_bugs|= FF_BUG_EDGE; } + if(s->divx_version) + s->workaround_bugs|= FF_BUG_HPEL_CHROMA; #if 0 if(s->divx_version==500) s->padding_bug_score= 256*256*256*64;
--- a/mpegvideo.c Fri Apr 02 19:48:20 2004 +0000 +++ b/mpegvideo.c Fri Apr 02 19:54:33 2004 +0000 @@ -2430,9 +2430,17 @@ src_y = s->mb_y*(16>>field_based) + (motion_y >> 1); if (s->out_format == FMT_H263) { - uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); - uvsrc_x = src_x>>1; - uvsrc_y = src_y>>1; + if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ + mx = (motion_x>>1)|(motion_x&1); + my = motion_y >>1; + uvdxy = ((my & 1) << 1) | (mx & 1); + uvsrc_x = s->mb_x* 8 + (mx >> 1); + uvsrc_y = s->mb_y*(8>>field_based) + (my >> 1); + }else{ + uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); + uvsrc_x = src_x>>1; + uvsrc_y = src_y>>1; + } } else { mx = motion_x / 2; my = motion_y / 2;