har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugs found by valgrind

Browse Source 
Originally committed as revision 4841 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-01-12 21:37:57 +00:00
parent 517840c654
commit c8a596d210
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/snow.c
View File

@ -3116,13 +3116,14 @@ static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, con
BlockNode *top = y ? &s->block[index-b_stride] : &null_block; BlockNode *top = y ? &s->block[index-b_stride] : &null_block;
BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left; BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;
BlockNode *tr = y && x+1<b_stride ? &s->block[index-b_stride+1] : tl; BlockNode *tr = y && x+1<b_stride ? &s->block[index-b_stride+1] : tl;
int dmx= b->mx - mid_pred(left->mx, top->mx, tr->mx); int dmx, dmy;
int dmy= b->my - mid_pred(left->my, top->my, tr->my);
// int mx_context= av_log2(2*ABS(left->mx - top->mx)); // int mx_context= av_log2(2*ABS(left->mx - top->mx));
// int my_context= av_log2(2*ABS(left->my - top->my)); // int my_context= av_log2(2*ABS(left->my - top->my));
if(x<0 || x>=b_stride || y>=b_height) if(x<0 || x>=b_stride || y>=b_height)
continue; continue;
dmx= b->mx - mid_pred(left->mx, top->mx, tr->mx);
dmy= b->my - mid_pred(left->my, top->my, tr->my);
/* /*
1 0 0 1 0 0
01X 1-2 1 01X 1-2 1
@ -3206,14 +3207,14 @@ static void iterative_me(SnowContext *s){
BlockNode backup; BlockNode backup;
const int index= mb_x + mb_y * b_stride; const int index= mb_x + mb_y * b_stride;
BlockNode *block= &s->block[index]; BlockNode *block= &s->block[index];
BlockNode *tb = mb_y ? &s->block[index-b_stride ] : &null_block; BlockNode *tb = mb_y ? &s->block[index-b_stride ] : &null_block;
BlockNode *lb = mb_x ? &s->block[index -1] : &null_block; BlockNode *lb = mb_x ? &s->block[index -1] : &null_block;
BlockNode *rb = mb_x<b_width ? &s->block[index +1] : &null_block; BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : &null_block;
BlockNode *bb = mb_y<b_height ? &s->block[index+b_stride ] : &null_block; BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : &null_block;
BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : &null_block; BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : &null_block;
BlockNode *trb= mb_x<b_width && mb_y ? &s->block[index-b_stride+1] : &null_block; BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : &null_block;
BlockNode *blb= mb_x && mb_y<b_height ? &s->block[index+b_stride-1] : &null_block; BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : &null_block;
BlockNode *brb= mb_x<b_width && mb_y<b_height ? &s->block[index+b_stride+1] : &null_block; BlockNode *brb= mb_x+1<b_width && mb_y+1<b_height ? &s->block[index+b_stride+1] : &null_block;
const int b_w= (MB_SIZE >> s->block_max_depth); const int b_w= (MB_SIZE >> s->block_max_depth);
uint8_t obmc_edged[b_w*2][b_w*2]; uint8_t obmc_edged[b_w*2][b_w*2];

6
tests/ffmpeg.regression.ref
View File

@ -119,9 +119,9 @@ a7ef4746f27be309138c188e327d3ebe *./data/a-ffv1.avi
2653642 ./data/a-ffv1.avi 2653642 ./data/a-ffv1.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
14fa515bf25a47fc2ad3d18b726e8e31 *./data/a-snow.avi 97c7066617d9e6c86a43a2736b3e9f16 *./data/a-snow.avi
1197138 ./data/a-snow.avi 1190760 ./data/a-snow.avi
e7c746171b092266b0cf55bb5de2a40a *./data/out.yuv 7e4d9c61252ff22b1a0d4e892cc1d957 *./data/out.yuv
stddev: 2.89 PSNR:38.87 bytes:7602176 stddev: 2.89 PSNR:38.87 bytes:7602176
11fd61ee7e67ef7a7b2a3df973691305 *./data/a-snow53.avi 11fd61ee7e67ef7a7b2a3df973691305 *./data/a-snow53.avi
3533710 ./data/a-snow53.avi 3533710 ./data/a-snow53.avi

6
tests/rotozoom.regression.ref
View File

@ -119,9 +119,9 @@ d0831a8339491fd680b650f05262e5d9 *./data/a-ffv1.avi
3524768 ./data/a-ffv1.avi 3524768 ./data/a-ffv1.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
b926518ac399c7af0f218a7115315b4f *./data/a-snow.avi 7345af7da71320bf87d3c950252b4341 *./data/a-snow.avi
286800 ./data/a-snow.avi 286798 ./data/a-snow.avi
6c59db71d950610f854d05e2cef18609 *./data/out.yuv cc5ef1eda02091fbf9a85887bad47bc4 *./data/out.yuv
stddev: 2.32 PSNR:40.80 bytes:7602176 stddev: 2.32 PSNR:40.80 bytes:7602176
3f20642bb789dfb75ae3e8c03f9b425c *./data/a-snow53.avi 3f20642bb789dfb75ae3e8c03f9b425c *./data/a-snow53.avi
2725570 ./data/a-snow53.avi 2725570 ./data/a-snow53.avi