History

bugs found by valgrind

Originally committed as revision 4841 to svn://svn.ffmpeg.org/ffmpeg/trunk

Michael Niedermayer committed 20 years ago

Commit c8a596d1 parent 517840c3 files · +17 −16Browse files

Unified · Split

3 files
  1. libavcodec/snow.c +11 −10
  2. tests/ffmpeg.regression.ref +3 −3
  3. tests/rotozoom.regression.ref +3 −3
libavcodec/snow.c+11−10
@@ -3116,13 +3116,14 @@ static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, con · 3115 unmodified lines
3116 BlockNode *top = y ? &s->block[index-b_stride] : &null_block;3116 BlockNode *top = y ? &s->block[index-b_stride] : &null_block;
3117 BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;3117 BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;
3118 BlockNode *tr = y && x+1<b_stride ? &s->block[index-b_stride+1] : tl;3118 BlockNode *tr = y && x+1<b_stride ? &s->block[index-b_stride+1] : tl;
3119 int dmx= b->mx - mid_pred(left->mx, top->mx, tr->mx);3119 int dmx, dmy;
3120 int dmy= b->my - mid_pred(left->my, top->my, tr->my);
3121// int mx_context= av_log2(2*ABS(left->mx - top->mx));3120// int mx_context= av_log2(2*ABS(left->mx - top->mx));
3122// int my_context= av_log2(2*ABS(left->my - top->my));3121// int my_context= av_log2(2*ABS(left->my - top->my));
3123 3122
3124 if(x<0 || x>=b_stride || y>=b_height)3123 if(x<0 || x>=b_stride || y>=b_height)
3125 continue;3124 continue;
3125 dmx= b->mx - mid_pred(left->mx, top->mx, tr->mx);
3126 dmy= b->my - mid_pred(left->my, top->my, tr->my);
3126/*3127/*
31271 0 031281 0 0
312801X 1-2 1312901X 1-2 1
@@ -3206,14 +3207,14 @@ static void iterative_me(SnowContext *s){ · 77 unmodified lines
3206 BlockNode backup;3207 BlockNode backup;
3207 const int index= mb_x + mb_y * b_stride;3208 const int index= mb_x + mb_y * b_stride;
3208 BlockNode *block= &s->block[index];3209 BlockNode *block= &s->block[index];
3209 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : &null_block;3210 BlockNode *tb = mb_y ? &s->block[index-b_stride ] : &null_block;
3210 BlockNode *lb = mb_x ? &s->block[index -1] : &null_block;3211 BlockNode *lb = mb_x ? &s->block[index -1] : &null_block;
3211 BlockNode *rb = mb_x<b_width ? &s->block[index +1] : &null_block;3212 BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : &null_block;
3212 BlockNode *bb = mb_y<b_height ? &s->block[index+b_stride ] : &null_block;3213 BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : &null_block;
3213 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : &null_block;3214 BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : &null_block;
3214 BlockNode *trb= mb_x<b_width && mb_y ? &s->block[index-b_stride+1] : &null_block;3215 BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : &null_block;
3215 BlockNode *blb= mb_x && mb_y<b_height ? &s->block[index+b_stride-1] : &null_block;3216 BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : &null_block;
3216 BlockNode *brb= mb_x<b_width && mb_y<b_height ? &s->block[index+b_stride+1] : &null_block;3217 BlockNode *brb= mb_x+1<b_width && mb_y+1<b_height ? &s->block[index+b_stride+1] : &null_block;
3217 const int b_w= (MB_SIZE >> s->block_max_depth);3218 const int b_w= (MB_SIZE >> s->block_max_depth);
3218 uint8_t obmc_edged[b_w*2][b_w*2];3219 uint8_t obmc_edged[b_w*2][b_w*2];
3219 3220
tests/ffmpeg.regression.ref+3−3
@@ -119,9 +119,9 @@ a7ef4746f27be309138c188e327d3ebe *./data/a-ffv1.avi · 118 unmodified lines
1192653642 ./data/a-ffv1.avi1192653642 ./data/a-ffv1.avi
120799d3db687f6cdd7a837ec156efc171f *./data/out.yuv120799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
121stddev: 0.00 PSNR:99.99 bytes:7602176121stddev: 0.00 PSNR:99.99 bytes:7602176
12214fa515bf25a47fc2ad3d18b726e8e31 *./data/a-snow.avi12297c7066617d9e6c86a43a2736b3e9f16 *./data/a-snow.avi
1231197138 ./data/a-snow.avi1231190760 ./data/a-snow.avi
124e7c746171b092266b0cf55bb5de2a40a *./data/out.yuv1247e4d9c61252ff22b1a0d4e892cc1d957 *./data/out.yuv
125stddev: 2.89 PSNR:38.87 bytes:7602176125stddev: 2.89 PSNR:38.87 bytes:7602176
12611fd61ee7e67ef7a7b2a3df973691305 *./data/a-snow53.avi12611fd61ee7e67ef7a7b2a3df973691305 *./data/a-snow53.avi
1273533710 ./data/a-snow53.avi1273533710 ./data/a-snow53.avi
tests/rotozoom.regression.ref+3−3
@@ -119,9 +119,9 @@ d0831a8339491fd680b650f05262e5d9 *./data/a-ffv1.avi · 118 unmodified lines
1193524768 ./data/a-ffv1.avi1193524768 ./data/a-ffv1.avi
120dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv120dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
121stddev: 0.00 PSNR:99.99 bytes:7602176121stddev: 0.00 PSNR:99.99 bytes:7602176
122b926518ac399c7af0f218a7115315b4f *./data/a-snow.avi1227345af7da71320bf87d3c950252b4341 *./data/a-snow.avi
123286800 ./data/a-snow.avi123286798 ./data/a-snow.avi
1246c59db71d950610f854d05e2cef18609 *./data/out.yuv124cc5ef1eda02091fbf9a85887bad47bc4 *./data/out.yuv
125stddev: 2.32 PSNR:40.80 bytes:7602176125stddev: 2.32 PSNR:40.80 bytes:7602176
1263f20642bb789dfb75ae3e8c03f9b425c *./data/a-snow53.avi1263f20642bb789dfb75ae3e8c03f9b425c *./data/a-snow53.avi
1272725570 ./data/a-snow53.avi1272725570 ./data/a-snow53.avi

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t