From 197a94a8cfff879ef3691eb178b5b617bda03ffb Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Fri, 13 Oct 2006 23:50:57 +0000 Subject: [PATCH] cosmetics git-svn-id: svn://svn.videolan.org/x264/trunk@592 df754926-b1dd-0310-bc7b-ec298dee348c --- common/pixel.c | 6 ++++++ encoder/analyse.c | 2 +- encoder/{slicetype_decision.c => slicetype.c} | 2 +- x264.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) rename encoder/{slicetype_decision.c => slicetype.c} (99%) diff --git a/common/pixel.c b/common/pixel.c index 6477e974..365266a0 100644 --- a/common/pixel.c +++ b/common/pixel.c @@ -292,6 +292,9 @@ PIXEL_SA8D_C( 16, 8 ) PIXEL_SA8D_C( 8, 16 ) PIXEL_SA8D_C( 8, 8 ) +/**************************************************************************** + * pixel_sad_x4 + ****************************************************************************/ #define SAD_X( size ) \ static void x264_pixel_sad_x3_##size( uint8_t *fenc, uint8_t *pix0, uint8_t *pix1, uint8_t *pix2, int i_stride, int scores[3] )\ {\ @@ -322,6 +325,9 @@ SAD_X( 8x16_vis ) SAD_X( 8x8_vis ) #endif +/**************************************************************************** + * structural similarity metric + ****************************************************************************/ static void ssim_4x4x2_core( const uint8_t *pix1, int stride1, const uint8_t *pix2, int stride2, int sums[2][4]) diff --git a/encoder/analyse.c b/encoder/analyse.c index c3d3c261..fcf3a66d 100644 --- a/encoder/analyse.c +++ b/encoder/analyse.c @@ -2619,5 +2619,5 @@ static void x264_analyse_update_cache( x264_t *h, x264_mb_analysis_t *a ) } } -#include "slicetype_decision.c" +#include "slicetype.c" diff --git a/encoder/slicetype_decision.c b/encoder/slicetype.c similarity index 99% rename from encoder/slicetype_decision.c rename to encoder/slicetype.c index e3411b5e..dd1c5770 100644 --- a/encoder/slicetype_decision.c +++ b/encoder/slicetype.c @@ -1,5 +1,5 @@ /***************************************************************************** - * slicetype_decision.c: h264 encoder library + * slicetype.c: h264 encoder library ***************************************************************************** * Copyright (C) 2005 Loren Merritt * diff --git a/x264.c b/x264.c index 6168a3e5..74d5e264 100644 --- a/x264.c +++ b/x264.c @@ -171,7 +171,7 @@ static void Help( x264_param_t *defaults, int b_longhelp ) H0( "\n" ); H0( " -q, --qp Set QP (0=lossless) [%d]\n", defaults->rc.i_qp_constant ); H0( " -B, --bitrate Set bitrate (kbit/s)\n" ); - H0( " --crf Quality-based VBR (nominal QP)\n" ); + H0( " --crf Quality-based VBR (nominal QP)\n" ); H1( " --vbv-maxrate Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate ); H0( " --vbv-bufsize Enable CBR and set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size ); H1( " --vbv-init Initial VBV buffer occupancy [%.1f]\n", defaults->rc.f_vbv_buffer_init ); -- 2.49.0