Commit 553b8295 authored by Loren Merritt's avatar Loren Merritt

167 broke psnr calculation for non-mod-32 inputs


git-svn-id: svn://svn.videolan.org/x264/trunk@169 df754926-b1dd-0310-bc7b-ec298dee348c
parent 70da43b2
......@@ -69,11 +69,19 @@ static int64_t x264_sqe( x264_t *h, uint8_t *pix1, int i_pix_stride, uint8_t *pi
int64_t i_sqe = 0;
int x, y;
for( y = 0; y < i_height; y += 16 )
for( x = 0; x < i_width; x += 16 )
i_sqe += h->pixf.ssd[PIXEL_16x16]( pix1+y*i_pix_stride+x, i_pix_stride,
pix2+y*i_pix2_stride+x, i_pix2_stride );
#define SSD(size) i_sqe += h->pixf.ssd[size]( pix1+y*i_pix_stride+x, i_pix_stride, \
pix2+y*i_pix2_stride+x, i_pix2_stride );
for( y = 0; y < i_height-15; y += 16 )
{
for( x = 0; x < i_width-15; x += 16 )
SSD(PIXEL_16x16);
if( x < i_width-7 )
SSD(PIXEL_8x16);
}
if( y < i_height-7 )
for( x = 0; x < i_width-7; x += 8 )
SSD(PIXEL_8x8);
#undef SSD
x264_cpu_restore( h->param.cpu );
return i_sqe;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment