RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 01:25:25 +00:00
Code Issues Projects Releases Wiki Activity

motion_est: avoid generating motion vectors that point between widthxheight and mb_widthxmb_height.

Browse Source 
No difference in PSNR or bitrate in the printed precission with the matrix lobby scene at 322x242

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-17 19:55:47 +01:00
parent c0bea18411
commit 56bf2c2a19
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/motion_est.c
View File

@ -536,8 +536,8 @@ static inline void get_limits(MpegEncContext *s, int x, int y)
if (s->unrestricted_mv) { if (s->unrestricted_mv) {
c->xmin = - x - 16; c->xmin = - x - 16;
c->ymin = - y - 16; c->ymin = - y - 16;
c->xmax = - x + s->mb_width *16; c->xmax = - x + s->width;
c->ymax = - y + s->mb_height*16; c->ymax = - y + s->height;
} else if (s->out_format == FMT_H261){ } else if (s->out_format == FMT_H261){
// Search range of H261 is different from other codec standards // Search range of H261 is different from other codec standards
c->xmin = (x > 15) ? - 15 : 0; c->xmin = (x > 15) ? - 15 : 0;
@ -576,10 +576,11 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
const int h=8; const int h=8;
int block; int block;
int P[10][2]; int P[10][2];
int dmin_sum=0, mx4_sum=0, my4_sum=0; int dmin_sum=0, mx4_sum=0, my4_sum=0, i;
int same=1; int same=1;
const int stride= c->stride; const int stride= c->stride;
uint8_t *mv_penalty= c->current_mv_penalty; uint8_t *mv_penalty= c->current_mv_penalty;
int saftey_cliping= s->unrestricted_mv && (s->width&15) && (s->height&15);
init_mv4_ref(c); init_mv4_ref(c);
@ -591,6 +592,11 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
const int mot_stride = s->b8_stride; const int mot_stride = s->b8_stride;
const int mot_xy = s->block_index[block]; const int mot_xy = s->block_index[block];
if(saftey_cliping){
c->xmax = - 16*s->mb_x + s->width - 8*(block &1);
c->ymax = - 16*s->mb_y + s->height - 8*(block>>1);
}
P_LEFT[0] = s->current_picture.f.motion_val[0][mot_xy - 1][0]; P_LEFT[0] = s->current_picture.f.motion_val[0][mot_xy - 1][0];
P_LEFT[1] = s->current_picture.f.motion_val[0][mot_xy - 1][1]; P_LEFT[1] = s->current_picture.f.motion_val[0][mot_xy - 1][1];
@ -618,6 +624,11 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
} }
P_MV1[0]= mx; P_MV1[0]= mx;
P_MV1[1]= my; P_MV1[1]= my;
if(saftey_cliping)
for(i=0; i<10; i++){
if(P[i][0] > (c->xmax<<shift)) P[i][0]= (c->xmax<<shift);
if(P[i][1] > (c->ymax<<shift)) P[i][1]= (c->ymax<<shift);
}
dmin4 = epzs_motion_search4(s, &mx4, &my4, P, block, block, s->p_mv_table, (1<<16)>>shift); dmin4 = epzs_motion_search4(s, &mx4, &my4, P, block, block, s->p_mv_table, (1<<16)>>shift);