Revision 48d1b9a1

View differences:

libavcodec/snow.c
3145 3145
 */
3146 3146
            rate += get_block_bits(s, mb_x + (i&1) - (i>>1), mb_y + (i>>1), 1);
3147 3147
        }
3148
        if(mb_x == b_stride-2)
3149
            rate += get_block_bits(s, mb_x + 1, mb_y + 1, 1);
3148 3150
    }
3149 3151
    return distortion + rate*penalty_factor;
3150 3152
}
......
3389 3391
                    color[i]= get_dc(s, mb_x, mb_y, i);
3390 3392

  
3391 3393
                // get previous score (cant be cached due to OBMC)
3392
                check_block_inter(s, mb_x, mb_y, block->mx, block->my, 0, *obmc_edged, &best_rd);
3394
                if(pass > 0 && (block->type&BLOCK_INTRA)){
3395
                    int color0[3]= {block->color[0], block->color[1], block->color[2]};
3396
                    check_block(s, mb_x, mb_y, color0, 1, *obmc_edged, &best_rd);
3397
                }else
3398
                    check_block_inter(s, mb_x, mb_y, block->mx, block->my, 0, *obmc_edged, &best_rd);
3399

  
3393 3400
                check_block_inter(s, mb_x, mb_y, 0, 0, 0, *obmc_edged, &best_rd);
3394 3401
                check_block_inter(s, mb_x, mb_y, tb->mx, tb->my, 0, *obmc_edged, &best_rd);
3395 3402
                check_block_inter(s, mb_x, mb_y, lb->mx, lb->my, 0, *obmc_edged, &best_rd);
tests/ffmpeg.regression.ref
119 119
2653642 ./data/a-ffv1.avi
120 120
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
121 121
stddev:  0.00 PSNR:99.99 bytes:7602176
122
b7e88c743458e60d59d83554d1e1ace5 *./data/a-snow.avi
123
1191118 ./data/a-snow.avi
124
2e0cda9acd71d339d72372a22591500a *./data/out.yuv
122
9d31a15d72fa93361ebad395033b66c2 *./data/a-snow.avi
123
1198972 ./data/a-snow.avi
124
1a4a23e8171798328db571cce2654df4 *./data/out.yuv
125 125
stddev:  2.90 PSNR:38.87 bytes:7602176
126 126
11fd61ee7e67ef7a7b2a3df973691305 *./data/a-snow53.avi
127 127
3533710 ./data/a-snow53.avi
tests/rotozoom.regression.ref
119 119
3524768 ./data/a-ffv1.avi
120 120
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
121 121
stddev:  0.00 PSNR:99.99 bytes:7602176
122
7345af7da71320bf87d3c950252b4341 *./data/a-snow.avi
123
286798 ./data/a-snow.avi
124
cc5ef1eda02091fbf9a85887bad47bc4 *./data/out.yuv
122
1f3c76fe9ea602f5a70e8fa25a1bafcb *./data/a-snow.avi
123
286446 ./data/a-snow.avi
124
ca9feebced78b9193b8fea6bd4a4ca90 *./data/out.yuv
125 125
stddev:  2.32 PSNR:40.80 bytes:7602176
126 126
3f20642bb789dfb75ae3e8c03f9b425c *./data/a-snow53.avi
127 127
2725570 ./data/a-snow53.avi

Also available in: Unified diff