Commit e06dfd4a authored by Loren Merritt's avatar Loren Merritt

Makefile: strip x264cli.

tweak stats summary.


git-svn-id: svn://svn.videolan.org/x264/trunk@203 df754926-b1dd-0310-bc7b-ec298dee348c
parent 29facf8b
......@@ -33,7 +33,7 @@ libx264.a: $(OBJS) $(OBJASM)
ranlib libx264.a
x264: libx264.a x264.o
$(CC) -o $@ x264.o libx264.a $(LDFLAGS)
$(CC) -o $@ x264.o libx264.a $(CFLAGS) $(LDFLAGS)
checkasm: testing/checkasm.o libx264.a
$(CC) -o $@ $< libx264.a $(LDFLAGS)
......@@ -58,6 +58,7 @@ clean:
rm -f $(OBJS) $(OBJASM) config.h *.a x264.o .depend x264 TAGS
distclean: clean
rm -f config.mak
DIR_INSTALL="/usr/local"
install: x264
......
......@@ -87,11 +87,6 @@ static int64_t x264_sqe( x264_t *h, uint8_t *pix1, int i_pix_stride, uint8_t *pi
return i_sqe;
}
static float x264_mse( int64_t i_sqe, int64_t i_size )
{
return (double)i_sqe / ((double)65025.0 * (double)i_size);
}
static float x264_psnr( int64_t i_sqe, int64_t i_size )
{
double f_mse = (double)i_sqe / ((double)65025.0 * (double)i_size);
......@@ -1475,15 +1470,14 @@ void x264_encoder_close ( x264_t *h )
if( h->param.analyse.b_psnr )
{
x264_log( h, X264_LOG_INFO,
"slice %s:%-4d Avg QP:%5.2f Avg size:%6.0f PSNR Mean Y:%5.2f U:%5.2f V:%5.2f Avg:%5.2f Global:%5.2f MSE*Size:%5.3f\n",
"slice %s:%-4d Avg QP:%5.2f Avg size:%6.0f PSNR Mean Y:%5.2f U:%5.2f V:%5.2f Avg:%5.2f Global:%5.2f\n",
slice_name[i_slice],
i_count,
(double)h->stat.i_slice_qp[i_slice] / i_count,
(double)h->stat.i_slice_size[i_slice] / i_count,
h->stat.f_psnr_mean_y[i_slice] / i_count, h->stat.f_psnr_mean_u[i_slice] / i_count, h->stat.f_psnr_mean_v[i_slice] / i_count,
h->stat.f_psnr_average[i_slice] / i_count,
x264_psnr( h->stat.i_sqe_global[i_slice], i_count * i_yuv_size ),
x264_mse( h->stat.i_sqe_global[i_slice], i_count * i_yuv_size ) * h->stat.i_slice_size[i_slice] / i_count );
x264_psnr( h->stat.i_sqe_global[i_slice], i_count * i_yuv_size ) );
}
else
{
......
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