openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-12-03 16:51:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace code for clipping MV vectors (which is wrong to use here) with clipping source coords.

Browse Source 
Originally committed as revision 5811 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-07-22 03:57:53 +00:00
parent 4b94465927
commit 230e9d4ca7
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/vc1.c
View File

@ -894,11 +894,6 @@ static void vc1_put_block(VC1Context *v, DCTELEM block[6][64])
dsp->put_pixels_clamped(block[5], v->s.dest[2], vs); dsp->put_pixels_clamped(block[5], v->s.dest[2], vs);
} }
/* clip motion vector as specified in 8.3.6.5 */
#define CLIP_RANGE(mv, src, lim, bs) \
if(mv < -bs) mv = -bs - src * bs; \
if(mv > lim) mv = lim - src * bs;
/** Do motion compensation over 1 macroblock /** Do motion compensation over 1 macroblock
* Mostly adapted hpel_motion and qpel_motion from mpegvideo.c * Mostly adapted hpel_motion and qpel_motion from mpegvideo.c
*/ */
@ -924,10 +919,10 @@ static void vc1_mc_1mv(VC1Context *v)
uvsrc_x = s->mb_x * 8 + (uvmx >> 2); uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
uvsrc_y = s->mb_y * 8 + (uvmy >> 2); uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
CLIP_RANGE( src_x, s->mb_x, s->mb_width * 16, 16); src_x = clip( src_x, -16, s->mb_width * 16);
CLIP_RANGE( src_y, s->mb_y, s->mb_height * 16, 16); src_y = clip( src_y, -16, s->mb_height * 16);
CLIP_RANGE(uvsrc_x, s->mb_x, s->mb_width * 8, 8); uvsrc_x = clip(uvsrc_x, -8, s->mb_width * 8);
CLIP_RANGE(uvsrc_y, s->mb_y, s->mb_height * 8, 8); uvsrc_y = clip(uvsrc_y, -8, s->mb_height * 8);
srcY += src_y * s->linesize + src_x; srcY += src_y * s->linesize + src_x;
srcU += uvsrc_y * s->uvlinesize + uvsrc_x; srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
@ -1022,8 +1017,8 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n)
src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2); src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2);
src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2); src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2);
CLIP_RANGE(src_x, s->mb_x, s->mb_width * 16, 16); src_x = clip( src_x, -16, s->mb_width * 16);
CLIP_RANGE(src_y, s->mb_y, s->mb_height * 16, 16); src_y = clip( src_y, -16, s->mb_height * 16);
srcY += src_y * s->linesize + src_x; srcY += src_y * s->linesize + src_x;
@ -1124,8 +1119,8 @@ static void vc1_mc_4mv_chroma(VC1Context *v)
uvsrc_x = s->mb_x * 8 + (uvmx >> 2); uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
uvsrc_y = s->mb_y * 8 + (uvmy >> 2); uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
CLIP_RANGE(uvsrc_x, s->mb_x, s->mb_width * 8, 8); uvsrc_x = clip(uvsrc_x, -8, s->mb_width * 8);
CLIP_RANGE(uvsrc_y, s->mb_y, s->mb_height * 8, 8); uvsrc_y = clip(uvsrc_y, -8, s->mb_height * 8);
srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x; srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
srcV = s->last_picture.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x; srcV = s->last_picture.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
if((unsigned)uvsrc_x > (s->h_edge_pos >> 1) - ((uvmx >> 1)&1) - 8 if((unsigned)uvsrc_x > (s->h_edge_pos >> 1) - ((uvmx >> 1)&1) - 8