X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264.c;h=18a3e3695a2f6f738239abb6ec264f3ef31283b0;hb=de7af9185e172122cd9b800845e1988a52ad7cc3;hp=f1c758ac2bea5ac475b82d2fad064ea12bdbd91a;hpb=dd6a303498d1f55c73037ed925a6ece8e28a95bc;p=x264 diff --git a/x264.c b/x264.c index f1c758ac..18a3e369 100644 --- a/x264.c +++ b/x264.c @@ -1,7 +1,7 @@ /***************************************************************************** * x264: top-level x264cli functions ***************************************************************************** - * Copyright (C) 2003-2014 x264 project + * Copyright (C) 2003-2016 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -209,6 +209,13 @@ static const char * const output_csp_names[] = #endif 0 }; +static const char * const chroma_format_names[] = +{ + [0] = "all", + [X264_CSP_I420] = "i420", + [X264_CSP_I422] = "i422", + [X264_CSP_I444] = "i444" +}; static const char * const range_names[] = { "auto", "tv", "pc", 0 }; @@ -320,10 +327,13 @@ static void print_version_info( void ) printf( "intel: %.2f (%d)\n", __INTEL_COMPILER / 100.f, __INTEL_COMPILER_BUILD_DATE ); #elif defined(__GNUC__) printf( "gcc: " __VERSION__ "\n" ); +#elif defined(_MSC_FULL_VER) + printf( "msvc: %.2f (%u)\n", _MSC_VER / 100.f, _MSC_FULL_VER ); #else printf( "using an unknown compiler\n" ); #endif - printf( "configuration: --bit-depth=%d --chroma-format=%s\n", x264_bit_depth, X264_CHROMA_FORMAT ? (output_csp_names[0]+1) : "all" ); + printf( "x264 configuration: --bit-depth=%d --chroma-format=%s\n", X264_BIT_DEPTH, chroma_format_names[X264_CHROMA_FORMAT] ); + printf( "libx264 configuration: --bit-depth=%d --chroma-format=%s\n", x264_bit_depth, chroma_format_names[x264_chroma_format] ); printf( "x264 license: " ); #if HAVE_GPL printf( "GPL version 2 or later\n" ); @@ -432,7 +442,7 @@ static void print_csp_names( int longhelp ) printf( " - valid csps for `lavf' demuxer:\n" ); printf( INDENT ); size_t line_len = strlen( INDENT ); - for( enum PixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ ) + for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ ) { const char *pfname = av_get_pix_fmt_name( i ); if( pfname ) @@ -531,7 +541,7 @@ static void help( x264_param_t *defaults, int longhelp ) " Overrides all settings.\n" ); H2( #if X264_CHROMA_FORMAT <= X264_CSP_I420 -#if BIT_DEPTH==8 +#if X264_BIT_DEPTH==8 " - baseline:\n" " --no-8x8dct --bframes 0 --no-cabac\n" " --cqm flat --weightp 0\n" @@ -559,7 +569,7 @@ static void help( x264_param_t *defaults, int longhelp ) else H0( " - " #if X264_CHROMA_FORMAT <= X264_CSP_I420 -#if BIT_DEPTH==8 +#if X264_BIT_DEPTH==8 "baseline,main,high," #endif "high10," @@ -701,7 +711,9 @@ static void help( x264_param_t *defaults, int longhelp ) " - 2: row alternation - L and R are interlaced by row\n" " - 3: side by side - L is on the left, R on the right\n" " - 4: top bottom - L is on top, R on bottom\n" - " - 5: frame alternation - one view per frame\n" ); + " - 5: frame alternation - one view per frame\n" + " - 6: mono - 2D frame without any frame packing\n" + " - 7: tile format - L is on top-left, R split across\n" ); H0( "\n" ); H0( "Ratecontrol:\n" ); H0( "\n" ); @@ -724,7 +736,8 @@ static void help( x264_param_t *defaults, int longhelp ) H2( " --aq-mode AQ method [%d]\n" " - 0: Disabled\n" " - 1: Variance AQ (complexity mask)\n" - " - 2: Auto-variance AQ (experimental)\n", defaults->rc.i_aq_mode ); + " - 2: Auto-variance AQ\n" + " - 3: Auto-variance AQ with bias to dark scenes\n", defaults->rc.i_aq_mode ); H1( " --aq-strength Reduces blocking and blurring in flat and\n" " textured areas. [%.1f]\n", defaults->rc.f_aq_strength ); H1( "\n" ); @@ -1284,11 +1297,11 @@ static int init_vid_filters( char *sequence, hnd_t *handle, video_info_t *info, /* force the output csp to what the user specified (or the default) */ param->i_csp = info->csp; int csp = info->csp & X264_CSP_MASK; - if( output_csp == X264_CSP_I420 && (csp < X264_CSP_I420 || csp > X264_CSP_NV12) ) + if( output_csp == X264_CSP_I420 && (csp < X264_CSP_I420 || csp >= X264_CSP_I422) ) param->i_csp = X264_CSP_I420; - else if( output_csp == X264_CSP_I422 && (csp < X264_CSP_I422 || csp > X264_CSP_V210) ) + else if( output_csp == X264_CSP_I422 && (csp < X264_CSP_I422 || csp >= X264_CSP_I444) ) param->i_csp = X264_CSP_I422; - else if( output_csp == X264_CSP_I444 && (csp < X264_CSP_I444 || csp > X264_CSP_YV24) ) + else if( output_csp == X264_CSP_I444 && (csp < X264_CSP_I444 || csp >= X264_CSP_BGR) ) param->i_csp = X264_CSP_I444; else if( output_csp == X264_CSP_RGB && (csp < X264_CSP_BGR || csp > X264_CSP_RGB) ) param->i_csp = X264_CSP_RGB; @@ -1728,19 +1741,23 @@ generic_option: static void parse_qpfile( cli_opt_t *opt, x264_picture_t *pic, int i_frame ) { - int num = -1, qp, ret; + int num = -1; char type; - uint64_t file_pos; while( num < i_frame ) { - file_pos = ftell( opt->qpfile ); - qp = -1; - ret = fscanf( opt->qpfile, "%d %c%*[ \t]%d\n", &num, &type, &qp ); + int64_t file_pos = ftell( opt->qpfile ); + int qp = -1; + int ret = fscanf( opt->qpfile, "%d %c%*[ \t]%d\n", &num, &type, &qp ); pic->i_type = X264_TYPE_AUTO; pic->i_qpplus1 = X264_QP_AUTO; if( num > i_frame || ret == EOF ) { - fseek( opt->qpfile, file_pos, SEEK_SET ); + if( file_pos < 0 || fseek( opt->qpfile, file_pos, SEEK_SET ) ) + { + x264_cli_log( "x264", X264_LOG_ERROR, "qpfile seeking failed\n" ); + fclose( opt->qpfile ); + opt->qpfile = NULL; + } break; } if( num < i_frame && ret >= 2 )