* For more information, contact us at licensing@x264.com.
*****************************************************************************/
-#include <stdlib.h>
-#include <math.h>
-
#include <signal.h>
#define _GNU_SOURCE
#include <getopt.h>
-
#include "common/common.h"
#include "x264cli.h"
#include "input/input.h"
#ifdef _WIN32
#include <windows.h>
#else
+#define GetConsoleTitle(t,n)
#define SetConsoleTitle(t)
#endif
b_ctrl_c = 1;
}
+static char UNUSED originalCTitle[200] = "";
+
typedef struct {
int b_progress;
int i_seek;
static const char * const pulldown_names[] = { "none", "22", "32", "64", "double", "triple", "euro", 0 };
static const char * const log_level_names[] = { "none", "error", "warning", "info", "debug", 0 };
-typedef struct{
+typedef struct
+{
int mod;
uint8_t pattern[24];
float fps_factor;
printf( "(ffmpegsource %d.%d.%d.%d)\n", FFMS_VERSION >> 24, (FFMS_VERSION & 0xff0000) >> 16, (FFMS_VERSION & 0xff00) >> 8, FFMS_VERSION & 0xff );
#endif
printf( "built on " __DATE__ ", " );
-#ifdef __GNUC__
+#ifdef __INTEL_COMPILER
+ printf( "intel: %.2f (%d)\n", __INTEL_COMPILER / 100.f, __INTEL_COMPILER_BUILD_DATE );
+#elif defined(__GNUC__)
printf( "gcc: " __VERSION__ "\n" );
#else
- printf( "using a non-gcc compiler\n" );
+ printf( "using an unknown compiler\n" );
#endif
printf( "configuration: --bit-depth=%d\n", x264_bit_depth );
printf( "x264 license: " );
_setmode(_fileno(stdout), _O_BINARY);
#endif
+ GetConsoleTitle( originalCTitle, sizeof(originalCTitle) );
+
/* Parse command line */
if( parse( argc, argv, ¶m, &opt ) < 0 )
ret = -1;
+ /* Restore title; it can be changed by input modules */
+ SetConsoleTitle( originalCTitle );
+
/* Control-C handler */
signal( SIGINT, sigint_handler );
if( opt.qpfile )
fclose( opt.qpfile );
+ SetConsoleTitle( originalCTitle );
+
return ret;
}
printf( "\n" );
printf( " - valid csps for `lavf' demuxer:\n" );
printf( INDENT );
- int line_len = strlen( INDENT );
+ size_t line_len = strlen( INDENT );
for( enum PixelFormat i = PIX_FMT_NONE+1; i < PIX_FMT_NB; i++ )
{
const char *pfname = av_pix_fmt_descriptors[i].name;
- int name_len = strlen( pfname );
+ size_t name_len = strlen( pfname );
if( line_len + name_len > (80 - strlen( ", " )) )
{
printf( "\n" INDENT );
H0( "\n" );
H0( "Presets:\n" );
H0( "\n" );
- H0( " --profile Force the limits of an H.264 profile\n"
+ H0( " --profile <string> Force the limits of an H.264 profile\n"
" Overrides all settings.\n" );
H2( " - baseline:\n"
" --no-8x8dct --bframes 0 --no-cabac\n"
" No lossless.\n"
" Support for bit depth 8-10.\n" );
else H0( " - baseline,main,high,high10\n" );
- H0( " --preset Use a preset to select encoding settings [medium]\n"
+ H0( " --preset <string> Use a preset to select encoding settings [medium]\n"
" Overridden by user settings.\n" );
H2( " - ultrafast:\n"
" --no-8x8dct --aq-mode 0 --b-adapt 0\n"
" --trellis 2\n" );
else H0( " - ultrafast,superfast,veryfast,faster,fast\n"
" - medium,slow,slower,veryslow,placebo\n" );
- H0( " --tune Tune the settings for a particular type of source\n"
+ H0( " --tune <string> Tune the settings for a particular type of source\n"
" or situation\n"
" Overridden by user settings.\n"
" Multiple tunings are separated by commas.\n"
" - strict: Strictly hierarchical pyramid\n"
" - normal: Non-strict (not Blu-ray compatible)\n",
strtable_lookup( x264_b_pyramid_names, defaults->i_bframe_pyramid ) );
- H1( " --open-gop <string> Use recovery points to close GOPs [none]\n"
- " - none: closed GOPs only\n"
- " - normal: standard open GOPs\n"
- " (not Blu-ray compatible)\n"
- " - bluray: Blu-ray-compatible open GOPs\n"
+ H1( " --open-gop Use recovery points to close GOPs\n"
" Only available with b-frames\n" );
H1( " --no-cabac Disable CABAC\n" );
H1( " -r, --ref <integer> Number of reference frames [%d]\n", defaults->i_frame_reference );
H0( "\n" );
H1( " -q, --qp <integer> Force constant QP (0-%d, 0=lossless)\n", QP_MAX );
H0( " -B, --bitrate <integer> Set bitrate (kbit/s)\n" );
- H0( " --crf <float> Quality-based VBR (%d-51) [%.1f]\n", 51 - QP_MAX, defaults->rc.f_rf_constant );
+ H0( " --crf <float> Quality-based VBR (%d-51) [%.1f]\n", 51 - QP_MAX_SPEC, defaults->rc.f_rf_constant );
H1( " --rc-lookahead <integer> Number of frames for frametype lookahead [%d]\n", defaults->rc.i_lookahead );
H0( " --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
H0( " --vbv-bufsize <integer> Set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size );
" - 9: RD refinement for all frames\n"
" - 10: QP-RD - requires trellis=2, aq-mode>0\n" );
else H1( " decision quality: 1=fast, 10=best.\n" );
- H1( " --psy-rd Strength of psychovisual optimization [\"%.1f:%.1f\"]\n"
+ H1( " --psy-rd <float:float> Strength of psychovisual optimization [\"%.1f:%.1f\"]\n"
" #1: RD (requires subme>=6)\n"
" #2: Trellis (requires trellis, experimental)\n",
defaults->analyse.f_psy_rd, defaults->analyse.f_psy_trellis );
" Takes a comma-separated list of 16 integers.\n" );
H2( " --cqm8 <list> Set all 8x8 quant matrices\n"
" Takes a comma-separated list of 64 integers.\n" );
- H2( " --cqm4i, --cqm4p, --cqm8i, --cqm8p\n"
+ H2( " --cqm4i, --cqm4p, --cqm8i, --cqm8p <list>\n"
" Set both luma and chroma quant matrices\n" );
- H2( " --cqm4iy, --cqm4ic, --cqm4py, --cqm4pc\n"
+ H2( " --cqm4iy, --cqm4ic, --cqm4py, --cqm4pc <list>\n"
" Set individual quant matrices\n" );
H2( "\n" );
H2( "Video Usability Info (Annex E):\n" );
H0( "\n" );
H0( "Input/Output:\n" );
H0( "\n" );
- H0( " -o, --output Specify output file\n" );
+ H0( " -o, --output <string> Specify output file\n" );
H1( " --muxer <string> Specify output container format [\"%s\"]\n"
" - %s\n", muxer_names[0], stringify_names( buf, muxer_names ) );
H1( " --demuxer <string> Specify input container format [\"%s\"]\n"
" - %s\n", demuxer_names[0], stringify_names( buf, demuxer_names ) );
+ H1( " --input-fmt <string> Specify input file format (requires lavf support)\n" );
H1( " --input-csp <string> Specify input colorspace format for raw input\n" );
print_csp_names( longhelp );
H1( " --input-depth <integer> Specify input bit depth for raw input\n" );
H0( " --seek <integer> First frame to encode\n" );
H0( " --frames <integer> Maximum number of frames to encode\n" );
H0( " --level <string> Specify level (as defined by Annex A)\n" );
+ H1( " --bluray-compat Enable compatibility hacks for Blu-ray support\n" );
H1( "\n" );
H1( " -v, --verbose Print stats for each frame\n" );
H1( " --no-progress Don't show the progress indicator while encoding\n" );
OPT_PULLDOWN,
OPT_LOG_LEVEL,
OPT_VIDEO_FILTER,
+ OPT_INPUT_FMT,
OPT_INPUT_RES,
OPT_INPUT_CSP,
OPT_INPUT_DEPTH,
{ "no-b-adapt", no_argument, NULL, 0 },
{ "b-bias", required_argument, NULL, 0 },
{ "b-pyramid", required_argument, NULL, 0 },
- { "open-gop", required_argument, NULL, 0 },
+ { "open-gop", no_argument, NULL, 0 },
+ { "bluray-compat", no_argument, NULL, 0 },
{ "min-keyint", required_argument, NULL, 'i' },
{ "keyint", required_argument, NULL, 'I' },
{ "intra-refresh", no_argument, NULL, 0 },
{ "frame-packing", required_argument, NULL, 0 },
{ "vf", required_argument, NULL, OPT_VIDEO_FILTER },
{ "video-filter", required_argument, NULL, OPT_VIDEO_FILTER },
+ { "input-fmt", required_argument, NULL, OPT_INPUT_FMT },
{ "input-res", required_argument, NULL, OPT_INPUT_RES },
{ "input-csp", required_argument, NULL, OPT_INPUT_CSP },
{ "input-depth", required_argument, NULL, OPT_INPUT_DEPTH },
case OPT_VIDEO_FILTER:
vid_filters = optarg;
break;
+ case OPT_INPUT_FMT:
+ input_opt.format = optarg;
+ break;
case OPT_INPUT_RES:
input_opt.resolution = optarg;
break;
info.tff = param->b_tff;
info.vfr = param->b_vfr_input;
+ input_opt.progress = opt->b_progress;
+
if( select_input( demuxer, demuxername, input_filename, &opt->hin, &info, &input_opt ) )
return -1;
if( !b_user_interlaced && info.interlaced )
{
+#if HAVE_INTERLACED
x264_cli_log( "x264", X264_LOG_WARNING, "input appears to be interlaced, enabling %cff interlaced mode.\n"
" If you want otherwise, use --no-interlaced or --%cff\n",
info.tff ? 't' : 'b', info.tff ? 'b' : 't' );
param->b_interlaced = 1;
param->b_tff = !!info.tff;
+#else
+ x264_cli_log( "x264", X264_LOG_WARNING, "input appears to be interlaced, but not compiled with interlaced support\n" );
+#endif
}
/* Automatically reduce reference frame count to match the user's target level
return i_frame_size;
}
-static void print_status( int64_t i_start, int i_frame, int i_frame_total, int64_t i_file, x264_param_t *param, int64_t last_ts )
+static int64_t print_status( int64_t i_start, int64_t i_previous, int i_frame, int i_frame_total, int64_t i_file, x264_param_t *param, int64_t last_ts )
{
char buf[200];
- int64_t i_elapsed = x264_mdate() - i_start;
+ int64_t i_time = x264_mdate();
+ if( i_previous && i_time - i_previous < UPDATE_INTERVAL )
+ return i_previous;
+ int64_t i_elapsed = i_time - i_start;
double fps = i_elapsed > 0 ? i_frame * 1000000. / i_elapsed : 0;
double bitrate;
if( last_ts )
fprintf( stderr, "%s \r", buf+5 );
SetConsoleTitle( buf );
fflush( stderr ); // needed in windows
+ return i_time;
}
static void convert_cli_to_lib_pic( x264_picture_t *lib, cli_pic_t *cli )
int i_frame = 0;
int i_frame_output = 0;
- int64_t i_end, i_start = 0;
+ int64_t i_end, i_previous = 0, i_start = 0;
int64_t i_file = 0;
int i_frame_size;
- int i_update_interval;
int64_t last_dts = 0;
int64_t prev_dts = 0;
int64_t first_dts = 0;
int retval = 0;
opt->b_progress &= param->i_log_level < X264_LOG_DEBUG;
- i_update_interval = param->i_frame_total ? x264_clip3( param->i_frame_total / 1000, 1, 10 ) : 10;
/* set up pulldown */
if( opt->i_pulldown && !param->b_vfr_input )
FAIL_IF_ERROR2( output.set_param( opt->hout, param ), "can't set outfile param\n" );
i_start = x264_mdate();
+
/* ticks/frame = ticks/second / frames/second */
ticks_per_frame = (int64_t)param->i_timebase_den * param->i_fps_den / param->i_timebase_num / param->i_fps_num;
FAIL_IF_ERROR2( ticks_per_frame < 1 && !param->b_vfr_input, "ticks_per_frame invalid: %"PRId64"\n", ticks_per_frame )
break;
/* update status line (up to 1000 times per input file) */
- if( opt->b_progress && i_frame_output % i_update_interval == 0 && i_frame_output )
- print_status( i_start, i_frame_output, param->i_frame_total, i_file, param, 2 * last_dts - prev_dts - first_dts );
+ if( opt->b_progress && i_frame_output )
+ i_previous = print_status( i_start, i_previous, i_frame_output, param->i_frame_total, i_file, param, 2 * last_dts - prev_dts - first_dts );
}
/* Flush delayed frames */
while( !b_ctrl_c && x264_encoder_delayed_frames( h ) )
if( i_frame_output == 1 )
first_dts = prev_dts = last_dts;
}
- if( opt->b_progress && i_frame_output % i_update_interval == 0 && i_frame_output )
- print_status( i_start, i_frame_output, param->i_frame_total, i_file, param, 2 * last_dts - prev_dts - first_dts );
+ if( opt->b_progress && i_frame_output )
+ i_previous = print_status( i_start, i_previous, i_frame_output, param->i_frame_total, i_file, param, 2 * last_dts - prev_dts - first_dts );
}
fail:
if( pts_warning_cnt >= MAX_PTS_WARNING && cli_log_level < X264_LOG_DEBUG )
projects / x264 / blobdiff