X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264.c;h=414252c9b890badb4ce1cac440fc6c296f58d81c;hb=refs%2Fheads%2Fspeedcontrol;hp=7e93809d2e888f87915cf8c29d050df9d7ba6057;hpb=dd713cae59c062440b046fe75d60af83d049de3c;p=x264 diff --git a/x264.c b/x264.c index 7e93809d..414252c9 100644 --- a/x264.c +++ b/x264.c @@ -1,13 +1,14 @@ /***************************************************************************** * x264: top-level x264cli functions ***************************************************************************** - * Copyright (C) 2003-2011 x264 project + * Copyright (C) 2003-2016 x264 project * * Authors: Loren Merritt * Laurent Aimar * Steven Walters * Fiona Glaser * Kieran Kunhya + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,8 +28,16 @@ * For more information, contact us at licensing@x264.com. *****************************************************************************/ +#ifdef _WIN32 +/* The following two defines must be located before the inclusion of any system header files. */ +#define WINVER 0x0500 +#define _WIN32_WINNT 0x0500 +#include +#include /* _setmode() */ +#include /* _O_BINARY */ +#endif + #include -#define _GNU_SOURCE #include #include "common/common.h" #include "x264cli.h" @@ -38,13 +47,6 @@ #define FAIL_IF_ERROR( cond, ... ) FAIL_IF_ERR( cond, "x264", __VA_ARGS__ ) -#ifdef _WIN32 -#include -#else -#define GetConsoleTitle(t,n) -#define SetConsoleTitle(t) -#endif - #if HAVE_LAVF #undef DECLARE_ALIGNED #include @@ -53,6 +55,7 @@ #endif #if HAVE_SWSCALE +#undef DECLARE_ALIGNED #include #endif @@ -60,18 +63,89 @@ #include #endif +#ifdef _WIN32 +#define CONSOLE_TITLE_SIZE 200 +static wchar_t org_console_title[CONSOLE_TITLE_SIZE] = L""; + +void x264_cli_set_console_title( const char *title ) +{ + wchar_t title_utf16[CONSOLE_TITLE_SIZE]; + if( utf8_to_utf16( title, title_utf16 ) ) + SetConsoleTitleW( title_utf16 ); +} + +static int utf16_to_ansi( const wchar_t *utf16, char *ansi, int size ) +{ + int invalid; + return WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, utf16, -1, ansi, size, NULL, &invalid ) && !invalid; +} + +/* Some external libraries doesn't support Unicode in filenames, + * as a workaround we can try to get an ANSI filename instead. */ +int x264_ansi_filename( const char *filename, char *ansi_filename, int size, int create_file ) +{ + wchar_t filename_utf16[MAX_PATH]; + if( utf8_to_utf16( filename, filename_utf16 ) ) + { + if( create_file ) + { + /* Create the file using the Unicode filename if it doesn't already exist. */ + FILE *fh = _wfopen( filename_utf16, L"ab" ); + if( fh ) + fclose( fh ); + } + + /* Check if the filename already is valid ANSI. */ + if( utf16_to_ansi( filename_utf16, ansi_filename, size ) ) + return 1; + + /* Check for a legacy 8.3 short filename. */ + int short_length = GetShortPathNameW( filename_utf16, filename_utf16, MAX_PATH ); + if( short_length > 0 && short_length < MAX_PATH ) + if( utf16_to_ansi( filename_utf16, ansi_filename, size ) ) + return 1; + } + return 0; +} + +/* Retrieve command line arguments as UTF-8. */ +static int get_argv_utf8( int *argc_ptr, char ***argv_ptr ) +{ + int ret = 0; + wchar_t **argv_utf16 = CommandLineToArgvW( GetCommandLineW(), argc_ptr ); + if( argv_utf16 ) + { + int argc = *argc_ptr; + int offset = (argc+1) * sizeof(char*); + int size = offset; + + for( int i = 0; i < argc; i++ ) + size += WideCharToMultiByte( CP_UTF8, 0, argv_utf16[i], -1, NULL, 0, NULL, NULL ); + + char **argv = *argv_ptr = malloc( size ); + if( argv ) + { + for( int i = 0; i < argc; i++ ) + { + argv[i] = (char*)argv + offset; + offset += WideCharToMultiByte( CP_UTF8, 0, argv_utf16[i], -1, argv[i], size-offset, NULL, NULL ); + } + argv[argc] = NULL; + ret = 1; + } + LocalFree( argv_utf16 ); + } + return ret; +} +#endif + /* Ctrl-C handler */ static volatile int b_ctrl_c = 0; -static int b_exit_on_ctrl_c = 0; static void sigint_handler( int a ) { - if( b_exit_on_ctrl_c ) - exit(0); b_ctrl_c = 1; } -static char UNUSED originalCTitle[200] = ""; - typedef struct { int b_progress; int i_seek; @@ -113,7 +187,7 @@ static const char * const muxer_names[] = "raw", "mkv", "flv", -#if HAVE_GPAC +#if HAVE_GPAC || HAVE_LSMASH "mp4", #endif 0 @@ -134,6 +208,15 @@ 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 }; typedef struct { @@ -208,7 +291,7 @@ void x264_cli_log( const char *name, int i_level, const char *fmt, ... ) fprintf( stderr, "%s [%s]: ", name, s_level ); va_list arg; va_start( arg, fmt ); - vfprintf( stderr, fmt, arg ); + x264_vfprintf( stderr, fmt, arg ); va_end( arg ); } @@ -218,11 +301,11 @@ void x264_cli_printf( int i_level, const char *fmt, ... ) return; va_list arg; va_start( arg, fmt ); - vfprintf( stderr, fmt, arg ); + x264_vfprintf( stderr, fmt, arg ); va_end( arg ); } -static void print_version_info() +static void print_version_info( void ) { #ifdef X264_POINTVER printf( "x264 "X264_POINTVER"\n" ); @@ -243,10 +326,13 @@ static void print_version_info() 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" ); @@ -272,18 +358,22 @@ int main( int argc, char **argv ) FAIL_IF_ERROR( x264_threading_init(), "unable to initialize threading\n" ) #ifdef _WIN32 - _setmode(_fileno(stdin), _O_BINARY); - _setmode(_fileno(stdout), _O_BINARY); -#endif + FAIL_IF_ERROR( !get_argv_utf8( &argc, &argv ), "unable to convert command line to UTF-8\n" ) - GetConsoleTitle( originalCTitle, sizeof(originalCTitle) ); + GetConsoleTitleW( org_console_title, CONSOLE_TITLE_SIZE ); + _setmode( _fileno( stdin ), _O_BINARY ); + _setmode( _fileno( stdout ), _O_BINARY ); + _setmode( _fileno( stderr ), _O_BINARY ); +#endif /* Parse command line */ if( parse( argc, argv, ¶m, &opt ) < 0 ) ret = -1; +#ifdef _WIN32 /* Restore title; it can be changed by input modules */ - SetConsoleTitle( originalCTitle ); + SetConsoleTitleW( org_console_title ); +#endif /* Control-C handler */ signal( SIGINT, sigint_handler ); @@ -303,7 +393,10 @@ int main( int argc, char **argv ) if( opt.qpfile ) fclose( opt.qpfile ); - SetConsoleTitle( originalCTitle ); +#ifdef _WIN32 + SetConsoleTitleW( org_console_title ); + free( argv ); +#endif return ret; } @@ -336,30 +429,36 @@ static void print_csp_names( int longhelp ) printf( INDENT ); for( int i = X264_CSP_NONE+1; i < X264_CSP_CLI_MAX; i++ ) { - printf( "%s", x264_cli_csps[i].name ); - if( i+1 < X264_CSP_CLI_MAX ) - printf( ", " ); + if( x264_cli_csps[i].name ) + { + printf( "%s", x264_cli_csps[i].name ); + if( i+1 < X264_CSP_CLI_MAX ) + printf( ", " ); + } } #if HAVE_LAVF printf( "\n" ); printf( " - valid csps for `lavf' demuxer:\n" ); printf( INDENT ); size_t line_len = strlen( INDENT ); - for( enum PixelFormat i = PIX_FMT_NONE+1; i < PIX_FMT_NB; i++ ) + for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ ) { - const char *pfname = av_pix_fmt_descriptors[i].name; - size_t name_len = strlen( pfname ); - if( line_len + name_len > (80 - strlen( ", " )) ) + const char *pfname = av_get_pix_fmt_name( i ); + if( pfname ) { - printf( "\n" INDENT ); - line_len = strlen( INDENT ); - } - printf( "%s", pfname ); - line_len += name_len; - if( i+1 < PIX_FMT_NB ) - { - printf( ", " ); - line_len += 2; + size_t name_len = strlen( pfname ); + if( line_len + name_len > (80 - strlen( ", " )) ) + { + printf( "\n" INDENT ); + line_len = strlen( INDENT ); + } + printf( "%s", pfname ); + line_len += name_len; + if( i+1 < AV_PIX_FMT_NB ) + { + printf( ", " ); + line_len += 2; + } } } #endif @@ -383,7 +482,7 @@ static void help( x264_param_t *defaults, int longhelp ) " .264 -> Raw bytestream\n" " .mkv -> Matroska\n" " .flv -> Flash Video\n" - " .mp4 -> MP4 if compiled with GPAC support (%s)\n" + " .mp4 -> MP4 if compiled with GPAC or L-SMASH support (%s)\n" "Output bit depth: %d (configured at compile time)\n" "\n" "Options:\n" @@ -409,7 +508,9 @@ static void help( x264_param_t *defaults, int longhelp ) "no", #endif #if HAVE_GPAC - "yes", + "gpac", +#elif HAVE_LSMASH + "lsmash", #else "no", #endif @@ -439,7 +540,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" @@ -467,7 +568,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," @@ -590,8 +691,11 @@ static void help( x264_param_t *defaults, int longhelp ) H2( " --slices Number of slices per frame; forces rectangular\n" " slices and is overridden by other slicing options\n" ); else H1( " --slices Number of slices per frame\n" ); + H2( " --slices-max Absolute maximum slices per frame; overrides\n" + " slice-max-size/slice-max-mbs when necessary\n" ); H2( " --slice-max-size Limit the size of each slice in bytes\n"); - H2( " --slice-max-mbs Limit the size of each slice in macroblocks\n"); + H2( " --slice-max-mbs Limit the size of each slice in macroblocks (max)\n"); + H2( " --slice-min-mbs Limit the size of each slice in macroblocks (min)\n"); H0( " --tff Enable interlaced mode (top field first)\n" ); H0( " --bff Enable interlaced mode (bottom field first)\n" ); H2( " --constrained-intra Enable constrained intra prediction.\n" ); @@ -606,7 +710,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" ); @@ -629,7 +735,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" ); @@ -654,6 +761,14 @@ static void help( x264_param_t *defaults, int longhelp ) " K= depending on open-gop setting\n" " QPs are restricted by qpmin/qpmax.\n" ); H1( "\n" ); + + H1( "Speedcontrol:\n" ); + H1( "\n" ); + H1( " --speed Automatically adjust other options to achieve this\n" ); + H1( " fraction of realtime.\n" ); + H1( " --speed-bufsize Averaging period for speed. (in frames) [%d]\n", defaults->sc.i_buffer_size ); + H1( "\n" ); + H1( "Analysis:\n" ); H1( "\n" ); H1( " -A, --partitions Partitions to consider [\"p8x8,b8x8,i8x8,i4x4\"]\n" @@ -734,26 +849,29 @@ static void help( x264_param_t *defaults, int longhelp ) H2( " --videoformat Specify video format [\"%s\"]\n" " - component, pal, ntsc, secam, mac, undef\n", strtable_lookup( x264_vidformat_names, defaults->vui.i_vidformat ) ); - H2( " --fullrange Specify full range samples setting [\"%s\"]\n" - " - off, on\n", - strtable_lookup( x264_fullrange_names, defaults->vui.b_fullrange ) ); + H2( " --range Specify color range [\"%s\"]\n" + " - %s\n", range_names[0], stringify_names( buf, range_names ) ); H2( " --colorprim Specify color primaries [\"%s\"]\n" - " - undef, bt709, bt470m, bt470bg\n" - " smpte170m, smpte240m, film\n", + " - undef, bt709, bt470m, bt470bg, smpte170m,\n" + " smpte240m, film, bt2020\n", strtable_lookup( x264_colorprim_names, defaults->vui.i_colorprim ) ); H2( " --transfer Specify transfer characteristics [\"%s\"]\n" - " - undef, bt709, bt470m, bt470bg, linear,\n" - " log100, log316, smpte170m, smpte240m\n", + " - undef, bt709, bt470m, bt470bg, smpte170m,\n" + " smpte240m, linear, log100, log316,\n" + " iec61966-2-4, bt1361e, iec61966-2-1,\n" + " bt2020-10, bt2020-12\n", strtable_lookup( x264_transfer_names, defaults->vui.i_transfer ) ); H2( " --colormatrix Specify color matrix setting [\"%s\"]\n" - " - undef, bt709, fcc, bt470bg\n" - " smpte170m, smpte240m, GBR, YCgCo\n", + " - undef, bt709, fcc, bt470bg, smpte170m,\n" + " smpte240m, GBR, YCgCo, bt2020nc, bt2020c\n", strtable_lookup( x264_colmatrix_names, defaults->vui.i_colmatrix ) ); H2( " --chromaloc Specify chroma sample location (0 to 5) [%d]\n", defaults->vui.i_chroma_loc ); H2( " --nal-hrd Signal HRD information (requires vbv-bufsize)\n" " - none, vbr, cbr (cbr not allowed in .mp4)\n" ); + H2( " --filler Force hard-CBR and generate filler (implied by\n" + " --nal-hrd cbr)\n" ); H2( " --pic-struct Force pic_struct in Picture Timing SEI\n" ); H2( " --crop-rect Add 'left,top,right,bottom' to the bitstream-level\n" " cropping rectangle\n" ); @@ -772,6 +890,8 @@ static void help( x264_param_t *defaults, int longhelp ) H1( " --output-csp Specify output colorspace [\"%s\"]\n" " - %s\n", output_csp_names[0], stringify_names( buf, output_csp_names ) ); H1( " --input-depth Specify input bit depth for raw input\n" ); + H1( " --input-range Specify input color range [\"%s\"]\n" + " - %s\n", range_names[0], stringify_names( buf, range_names ) ); H1( " --input-res Specify input resolution (width x height)\n" ); H1( " --index Filename for input index file\n" ); H0( " --sar width:height Specify Sample Aspect Ratio\n" ); @@ -780,6 +900,10 @@ static void help( x264_param_t *defaults, int longhelp ) H0( " --frames Maximum number of frames to encode\n" ); H0( " --level Specify level (as defined by Annex A)\n" ); H1( " --bluray-compat Enable compatibility hacks for Blu-ray support\n" ); + H1( " --avcintra-class Use compatibility hacks for AVC-Intra class\n" + " - 50, 100, 200\n" ); + H1( " --stitchable Don't optimize headers based on video content\n" + " Ensures ability to recombine a segmented encode\n" ); H1( "\n" ); H1( " -v, --verbose Print stats for each frame\n" ); H1( " --no-progress Don't show the progress indicator while encoding\n" ); @@ -790,6 +914,7 @@ static void help( x264_param_t *defaults, int longhelp ) H1( " --psnr Enable PSNR computation\n" ); H1( " --ssim Enable SSIM computation\n" ); H1( " --threads Force a specific number of threads\n" ); + H2( " --lookahead-threads Force a specific number of lookahead threads\n" ); H2( " --sliced-threads Low-latency but lower-efficiency threading\n" ); H2( " --thread-input Run Avisynth in its own thread\n" ); H2( " --sync-lookahead Number of buffer frames for threaded lookahead\n" ); @@ -798,7 +923,9 @@ static void help( x264_param_t *defaults, int longhelp ) " as opposed to letting them select different algorithms\n" ); H2( " --asm Override CPU detection\n" ); H2( " --no-asm Disable all CPU optimizations\n" ); - H2( " --visualize Show MB types overlayed on the encoded video\n" ); + H2( " --opencl Enable use of OpenCL\n" ); + H2( " --opencl-clbin Specify path of compiled OpenCL kernel cache\n" ); + H2( " --opencl-device Specify OpenCL device ordinal\n" ); H2( " --dump-yuv Save reconstructed frames\n" ); H2( " --sps-id Set SPS and PPS id numbers [%d]\n", defaults->i_sps_id ); H2( " --aud Use access unit delimiters\n" ); @@ -830,7 +957,6 @@ typedef enum OPT_THREAD_INPUT, OPT_QUIET, OPT_NOPROGRESS, - OPT_VISUALIZE, OPT_LONGHELP, OPT_PROFILE, OPT_PRESET, @@ -853,7 +979,9 @@ typedef enum OPT_INPUT_CSP, OPT_INPUT_DEPTH, OPT_DTS_COMPRESSION, - OPT_OUTPUT_CSP + OPT_OUTPUT_CSP, + OPT_INPUT_RANGE, + OPT_RANGE } OptionsOPT; static char short_options[] = "8A:B:b:f:hI:i:m:o:p:q:r:t:Vvw"; @@ -875,6 +1003,7 @@ static struct option long_options[] = { "b-pyramid", required_argument, NULL, 0 }, { "open-gop", no_argument, NULL, 0 }, { "bluray-compat", no_argument, NULL, 0 }, + { "avcintra-class", required_argument, NULL, 0 }, { "min-keyint", required_argument, NULL, 'i' }, { "keyint", required_argument, NULL, 'I' }, { "intra-refresh", no_argument, NULL, 0 }, @@ -900,6 +1029,9 @@ static struct option long_options[] = { "ref", required_argument, NULL, 'r' }, { "asm", required_argument, NULL, 0 }, { "no-asm", no_argument, NULL, 0 }, + { "opencl", no_argument, NULL, 1 }, + { "opencl-clbin",required_argument, NULL, 0 }, + { "opencl-device",required_argument, NULL, 0 }, { "sar", required_argument, NULL, 0 }, { "fps", required_argument, NULL, OPT_FPS }, { "frames", required_argument, NULL, OPT_FRAMES }, @@ -955,12 +1087,17 @@ static struct option long_options[] = { "cplxblur", required_argument, NULL, 0 }, { "zones", required_argument, NULL, 0 }, { "qpfile", required_argument, NULL, OPT_QPFILE }, + { "speed", required_argument, NULL, 0 }, + { "speed-bufsize", required_argument, NULL, 0 }, { "threads", required_argument, NULL, 0 }, + { "lookahead-threads", required_argument, NULL, 0 }, { "sliced-threads", no_argument, NULL, 0 }, { "no-sliced-threads", no_argument, NULL, 0 }, { "slice-max-size", required_argument, NULL, 0 }, { "slice-max-mbs", required_argument, NULL, 0 }, + { "slice-min-mbs", required_argument, NULL, 0 }, { "slices", required_argument, NULL, 0 }, + { "slices-max", required_argument, NULL, 0 }, { "thread-input", no_argument, NULL, OPT_THREAD_INPUT }, { "sync-lookahead", required_argument, NULL, 0 }, { "non-deterministic", no_argument, NULL, 0 }, @@ -971,7 +1108,6 @@ static struct option long_options[] = { "verbose", no_argument, NULL, 'v' }, { "log-level", required_argument, NULL, OPT_LOG_LEVEL }, { "no-progress", no_argument, NULL, OPT_NOPROGRESS }, - { "visualize", no_argument, NULL, OPT_VISUALIZE }, { "dump-yuv", required_argument, NULL, 0 }, { "sps-id", required_argument, NULL, 0 }, { "aud", no_argument, NULL, 0 }, @@ -990,7 +1126,7 @@ static struct option long_options[] = { "cqm8p", required_argument, NULL, 0 }, { "overscan", required_argument, NULL, 0 }, { "videoformat", required_argument, NULL, 0 }, - { "fullrange", required_argument, NULL, 0 }, + { "range", required_argument, NULL, OPT_RANGE }, { "colorprim", required_argument, NULL, 0 }, { "transfer", required_argument, NULL, 0 }, { "colormatrix", required_argument, NULL, 0 }, @@ -1013,6 +1149,9 @@ static struct option long_options[] = { "input-depth", required_argument, NULL, OPT_INPUT_DEPTH }, { "dts-compress", no_argument, NULL, OPT_DTS_COMPRESSION }, { "output-csp", required_argument, NULL, OPT_OUTPUT_CSP }, + { "input-range", required_argument, NULL, OPT_INPUT_RANGE }, + { "stitchable", no_argument, NULL, 0 }, + { "filler", no_argument, NULL, 0 }, {0, 0, 0, 0} }; @@ -1024,7 +1163,7 @@ static int select_output( const char *muxer, char *filename, x264_param_t *param if( !strcasecmp( ext, "mp4" ) ) { -#if HAVE_GPAC +#if HAVE_GPAC || HAVE_LSMASH cli_output = mp4_output; param->b_annexb = 0; param->b_repeat_headers = 0; @@ -1066,7 +1205,7 @@ static int select_input( const char *demuxer, char *used_demuxer, char *filename b_regular = b_regular && x264_is_regular_file_path( filename ); if( b_regular ) { - FILE *f = fopen( filename, "r" ); + FILE *f = x264_fopen( filename, "r" ); if( f ) { b_regular = x264_is_regular_file( f ); @@ -1167,15 +1306,18 @@ 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_NV16) ) + 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; param->i_csp |= info->csp & X264_CSP_HIGH_DEPTH; + /* if the output range is not forced, assign it to the input one now */ + if( param->vui.b_fullrange == RANGE_AUTO ) + param->vui.b_fullrange = info->fullrange; if( x264_init_vid_filter( "resize", handle, &filter, info, param, NULL ) ) return -1; @@ -1237,6 +1379,7 @@ static int parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt ) memset( &input_opt, 0, sizeof(cli_input_opt_t) ); memset( &output_opt, 0, sizeof(cli_output_opt_t) ); input_opt.bit_depth = 8; + input_opt.input_range = input_opt.output_range = param->vui.b_fullrange = RANGE_AUTO; int output_csp = defaults.i_csp; opt->b_progress = 1; @@ -1306,7 +1449,7 @@ static int parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt ) input_opt.index_file = optarg; break; case OPT_QPFILE: - opt->qpfile = fopen( optarg, "rb" ); + opt->qpfile = x264_fopen( optarg, "rb" ); FAIL_IF_ERROR( !opt->qpfile, "can't open qpfile `%s'\n", optarg ) if( !x264_is_regular_file( opt->qpfile ) ) { @@ -1334,14 +1477,6 @@ static int parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt ) case OPT_NOPROGRESS: opt->b_progress = 0; break; - case OPT_VISUALIZE: -#if HAVE_VISUALIZE - param->b_visualize = 1; - b_exit_on_ctrl_c = 1; -#else - x264_cli_log( "x264", X264_LOG_WARNING, "not compiled with visualization support\n" ); -#endif - break; case OPT_TUNE: case OPT_PRESET: break; @@ -1365,7 +1500,7 @@ static int parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt ) tcfile_name = optarg; break; case OPT_TCFILE_OUT: - opt->tcfile_out = fopen( optarg, "wb" ); + opt->tcfile_out = x264_fopen( optarg, "wb" ); FAIL_IF_ERROR( !opt->tcfile_out, "can't open `%s'\n", optarg ) break; case OPT_TIMEBASE: @@ -1402,6 +1537,14 @@ static int parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt ) #endif param->i_csp = output_csp = output_csp_fix[output_csp]; break; + case OPT_INPUT_RANGE: + FAIL_IF_ERROR( parse_enum_value( optarg, range_names, &input_opt.input_range ), "Unknown input range `%s'\n", optarg ) + input_opt.input_range += RANGE_AUTO; + break; + case OPT_RANGE: + FAIL_IF_ERROR( parse_enum_value( optarg, range_names, ¶m->vui.b_fullrange ), "Unknown range `%s'\n", optarg ); + input_opt.output_range = param->vui.b_fullrange += RANGE_AUTO; + break; default: generic_option: { @@ -1452,13 +1595,17 @@ generic_option: video_info_t info = {0}; char demuxername[5]; - /* set info flags to param flags to be overwritten by demuxer as necessary. */ + /* set info flags to be overwritten by demuxer as necessary. */ info.csp = param->i_csp; info.fps_num = param->i_fps_num; info.fps_den = param->i_fps_den; + info.fullrange = input_opt.input_range == RANGE_PC; info.interlaced = param->b_interlaced; - info.sar_width = param->vui.i_sar_width; - info.sar_height = param->vui.i_sar_height; + if( param->vui.i_sar_width > 0 && param->vui.i_sar_height > 0 ) + { + info.sar_width = param->vui.i_sar_width; + info.sar_height = param->vui.i_sar_height; + } info.tff = param->b_tff; info.vfr = param->b_vfr_input; @@ -1474,7 +1621,7 @@ generic_option: x264_reduce_fraction( &info.sar_width, &info.sar_height ); x264_reduce_fraction( &info.fps_num, &info.fps_den ); - x264_cli_log( demuxername, X264_LOG_INFO, "%dx%d%c %d:%d @ %d/%d fps (%cfr)\n", info.width, + x264_cli_log( demuxername, X264_LOG_INFO, "%dx%d%c %u:%u @ %u/%u fps (%cfr)\n", info.width, info.height, info.interlaced ? 'i' : 'p', info.sar_width, info.sar_height, info.fps_num, info.fps_den, info.vfr ? 'v' : 'c' ); @@ -1501,7 +1648,7 @@ generic_option: #endif /* override detected values by those specified by the user */ - if( param->vui.i_sar_width && param->vui.i_sar_height ) + if( param->vui.i_sar_width > 0 && param->vui.i_sar_height > 0 ) { info.sar_width = param->vui.i_sar_width; info.sar_height = param->vui.i_sar_height; @@ -1540,6 +1687,8 @@ generic_option: info.interlaced = param->b_interlaced; info.tff = param->b_tff; } + if( input_opt.input_range != RANGE_AUTO ) + info.fullrange = input_opt.input_range; if( init_vid_filters( vid_filters, &opt->hin, &info, param, output_csp ) ) return -1; @@ -1571,6 +1720,15 @@ generic_option: x264_cli_log( "x264", X264_LOG_WARNING, "input appears to be interlaced, but not compiled with interlaced support\n" ); #endif } + /* if the user never specified the output range and the input is now rgb, default it to pc */ + int csp = param->i_csp & X264_CSP_MASK; + if( csp >= X264_CSP_BGR && csp <= X264_CSP_RGB ) + { + if( input_opt.output_range == RANGE_AUTO ) + param->vui.b_fullrange = RANGE_PC; + /* otherwise fail if they specified tv */ + FAIL_IF_ERROR( !param->vui.b_fullrange, "RGB must be PC range" ) + } /* Automatically reduce reference frame count to match the user's target level * if the user didn't explicitly set a reference frame count. */ @@ -1580,11 +1738,8 @@ generic_option: for( int i = 0; x264_levels[i].level_idc != 0; i++ ) if( param->i_level_idc == x264_levels[i].level_idc ) { - while( mbs * 384 * param->i_frame_reference > x264_levels[i].dpb && - param->i_frame_reference > 1 ) - { + while( mbs * param->i_frame_reference > x264_levels[i].dpb && param->i_frame_reference > 1 ) param->i_frame_reference--; - } break; } } @@ -1595,19 +1750,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 ) @@ -1672,11 +1831,9 @@ static int64_t print_status( int64_t i_start, int64_t i_previous, int i_frame, i eta/3600, (eta/60)%60, eta%60 ); } else - { sprintf( buf, "x264 %d frames: %.2f fps, %.2f kb/s", i_frame, fps, bitrate ); - } fprintf( stderr, "%s \r", buf+5 ); - SetConsoleTitle( buf ); + x264_cli_set_console_title( buf ); fflush( stderr ); // needed in windows return i_time; }