} cli_opt_t;
/* file i/o operation structs */
-cli_input_t input;
-static cli_output_t output;
+cli_input_t cli_input;
+static cli_output_t cli_output;
/* video filter operation struct */
static cli_vid_filter_t filter;
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 };
+static const char * const output_csp_names[] = { "i420", "i444", "rgb", 0 };
typedef struct
{
if( filter.free )
filter.free( opt.hin );
else if( opt.hin )
- input.close_file( opt.hin );
+ cli_input.close_file( opt.hin );
if( opt.hout )
- output.close_file( opt.hout, 0, 0 );
+ cli_output.close_file( opt.hout, 0, 0 );
if( opt.tcfile_out )
fclose( opt.tcfile_out );
if( opt.qpfile )
" --bframes 16 --b-adapt 2 --direct auto\n"
" --slow-firstpass --no-fast-pskip\n"
" --me tesa --merange 24 --partitions all\n"
- " --rc-lookahead 60 --ref 16 --subme 10\n"
+ " --rc-lookahead 60 --ref 16 --subme 11\n"
" --trellis 2\n" );
else H0( " - ultrafast,superfast,veryfast,faster,fast\n"
" - medium,slow,slower,veryslow,placebo\n" );
" - 7: RD mode decision for all frames\n"
" - 8: RD refinement for I/P-frames\n"
" - 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" );
+ " - 10: QP-RD - requires trellis=2, aq-mode>0\n"
+ " - 11: Full RD: disable all early terminations\n" );
+ else H1( " decision quality: 1=fast, 11=best\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",
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( " --output-csp <string> Specify output colorspace [\"%s\"]\n"
+ " - %s\n", output_csp_names[0], stringify_names( buf, output_csp_names ) );
H1( " --input-depth <integer> Specify input bit depth for raw input\n" );
H1( " --input-res <intxint> Specify input resolution (width x height)\n" );
H1( " --index <string> Filename for input index file\n" );
H0( "\n" );
}
-enum
+typedef enum
{
OPT_FRAMES = 256,
OPT_SEEK,
OPT_INPUT_RES,
OPT_INPUT_CSP,
OPT_INPUT_DEPTH,
- OPT_DTS_COMPRESSION
+ OPT_DTS_COMPRESSION,
+ OPT_OUTPUT_CSP
} OptionsOPT;
static char short_options[] = "8A:B:b:f:hI:i:m:o:p:q:r:t:Vvw";
{ "input-csp", required_argument, NULL, OPT_INPUT_CSP },
{ "input-depth", required_argument, NULL, OPT_INPUT_DEPTH },
{ "dts-compress", no_argument, NULL, OPT_DTS_COMPRESSION },
+ { "output-csp", required_argument, NULL, OPT_OUTPUT_CSP },
{0, 0, 0, 0}
};
if( !strcasecmp( ext, "mp4" ) )
{
#if HAVE_GPAC
- output = mp4_output;
+ cli_output = mp4_output;
param->b_annexb = 0;
param->b_repeat_headers = 0;
if( param->i_nal_hrd == X264_NAL_HRD_CBR )
}
else if( !strcasecmp( ext, "mkv" ) )
{
- output = mkv_output;
+ cli_output = mkv_output;
param->b_annexb = 0;
param->b_repeat_headers = 0;
}
else if( !strcasecmp( ext, "flv" ) )
{
- output = flv_output;
+ cli_output = flv_output;
param->b_annexb = 0;
param->b_repeat_headers = 0;
}
else
- output = raw_output;
+ cli_output = raw_output;
return 0;
}
if( !strcasecmp( module, "avs" ) || !strcasecmp( ext, "d2v" ) || !strcasecmp( ext, "dga" ) )
{
#if HAVE_AVS
- input = avs_input;
+ cli_input = avs_input;
module = "avs";
#else
x264_cli_log( "x264", X264_LOG_ERROR, "not compiled with AVS input support\n" );
#endif
}
else if( !strcasecmp( module, "y4m" ) )
- input = y4m_input;
+ cli_input = y4m_input;
else if( !strcasecmp( module, "raw" ) || !strcasecmp( ext, "yuv" ) )
- input = raw_input;
+ cli_input = raw_input;
else
{
#if HAVE_FFMS
{
module = "ffms";
b_auto = 0;
- input = ffms_input;
+ cli_input = ffms_input;
}
#endif
#if HAVE_LAVF
{
module = "lavf";
b_auto = 0;
- input = lavf_input;
+ cli_input = lavf_input;
}
#endif
#if HAVE_AVS
{
module = "avs";
b_auto = 0;
- input = avs_input;
+ cli_input = avs_input;
}
#endif
if( b_auto && !raw_input.open_file( filename, p_handle, info, opt ) )
{
module = "raw";
b_auto = 0;
- input = raw_input;
+ cli_input = raw_input;
}
FAIL_IF_ERROR( !(*p_handle), "could not open input file `%s' via any method!\n", filename )
return 0;
}
-static int init_vid_filters( char *sequence, hnd_t *handle, video_info_t *info, x264_param_t *param )
+static int init_vid_filters( char *sequence, hnd_t *handle, video_info_t *info, x264_param_t *param, int output_csp )
{
x264_register_vid_filters();
param->i_height = info->height;
param->i_width = info->width;
}
- /* if the current csp is supported by libx264, have libx264 use this csp.
- * otherwise change the csp to I420 and have libx264 use this.
- * when more colorspaces are supported, this decision will need to be updated. */
+ /* 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( csp > X264_CSP_NONE && csp < X264_CSP_MAX )
- param->i_csp = info->csp;
- else
- param->i_csp = X264_CSP_I420 | ( info->csp & X264_CSP_HIGH_DEPTH );
+ if( output_csp == X264_CSP_I420 && (csp < X264_CSP_I420 || csp > X264_CSP_NV12) )
+ param->i_csp = X264_CSP_I420;
+ else if( output_csp == X264_CSP_I444 && (csp < X264_CSP_I444 || csp > X264_CSP_YV24) )
+ 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( x264_init_vid_filter( "resize", handle, &filter, info, param, NULL ) )
return -1;
memset( &input_opt, 0, sizeof(cli_input_opt_t) );
memset( &output_opt, 0, sizeof(cli_output_opt_t) );
input_opt.bit_depth = 8;
+ int output_csp = defaults.i_csp;
opt->b_progress = 1;
/* Presets are applied before all other options. */
param->i_frame_total = X264_MAX( atoi( optarg ), 0 );
break;
case OPT_SEEK:
- opt->i_seek = input_opt.seek = X264_MAX( atoi( optarg ), 0 );
+ opt->i_seek = X264_MAX( atoi( optarg ), 0 );
break;
case 'o':
output_filename = optarg;
case OPT_DTS_COMPRESSION:
output_opt.use_dts_compress = 1;
break;
+ case OPT_OUTPUT_CSP:
+ FAIL_IF_ERROR( parse_enum_value( optarg, output_csp_names, &output_csp ), "Unknown output csp `%s'\n", optarg )
+ // correct the parsed value to the libx264 csp value
+ output_csp = !output_csp ? X264_CSP_I420 : (output_csp == 1 ? X264_CSP_I444 : X264_CSP_RGB);
+ break;
default:
generic_option:
{
if( select_output( muxer, output_filename, param ) )
return -1;
- FAIL_IF_ERROR( output.open_file( output_filename, &opt->hout, &output_opt ), "could not open output file `%s'\n", output_filename )
+ FAIL_IF_ERROR( cli_output.open_file( output_filename, &opt->hout, &output_opt ), "could not open output file `%s'\n", output_filename )
input_filename = argv[optind++];
video_info_t info = {0};
info.tff = param->b_tff;
info.vfr = param->b_vfr_input;
+ input_opt.seek = opt->i_seek;
input_opt.progress = opt->b_progress;
+ input_opt.output_csp = output_csp;
if( select_input( demuxer, demuxername, input_filename, &opt->hin, &info, &input_opt ) )
return -1;
- FAIL_IF_ERROR( !opt->hin && input.open_file( input_filename, &opt->hin, &info, &input_opt ),
+ FAIL_IF_ERROR( !opt->hin && cli_input.open_file( input_filename, &opt->hin, &info, &input_opt ),
"could not open input file `%s'\n", input_filename )
x264_reduce_fraction( &info.sar_width, &info.sar_height );
{
FAIL_IF_ERROR( b_user_fps, "--fps + --tcfile-in is incompatible.\n" )
FAIL_IF_ERROR( timecode_input.open_file( tcfile_name, &opt->hin, &info, &input_opt ), "timecode input failed\n" )
- input = timecode_input;
+ cli_input = timecode_input;
}
else FAIL_IF_ERROR( !info.vfr && input_opt.timebase, "--timebase is incompatible with cfr input\n" )
fprintf( stderr, "x264 [error]: threaded input failed\n" );
return -1;
}
- input = thread_input;
+ cli_input = thread_input;
}
#endif
info.tff = param->b_tff;
}
- if( init_vid_filters( vid_filters, &opt->hin, &info, param ) )
+ if( init_vid_filters( vid_filters, &opt->hin, &info, param, output_csp ) )
return -1;
/* set param flags from the post-filtered video */
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
if( i_frame_size )
{
- i_frame_size = output.write_frame( hout, nal[0].p_payload, i_frame_size, &pic_out );
+ i_frame_size = cli_output.write_frame( hout, nal[0].p_payload, i_frame_size, &pic_out );
*last_dts = pic_out.i_dts;
}
x264_encoder_parameters( h, param );
- FAIL_IF_ERROR2( output.set_param( opt->hout, param ), "can't set outfile param\n" );
+ FAIL_IF_ERROR2( cli_output.set_param( opt->hout, param ), "can't set outfile param\n" );
i_start = x264_mdate();
int i_nal;
FAIL_IF_ERROR2( x264_encoder_headers( h, &headers, &i_nal ) < 0, "x264_encoder_headers failed\n" )
- FAIL_IF_ERROR2( (i_file = output.write_headers( opt->hout, headers )) < 0, "error writing headers to output file\n" );
+ FAIL_IF_ERROR2( (i_file = cli_output.write_headers( opt->hout, headers )) < 0, "error writing headers to output file\n" );
}
if( opt->tcfile_out )
if( b_ctrl_c )
fprintf( stderr, "aborted at input frame %d, output frame %d\n", opt->i_seek + i_frame, i_frame_output );
- output.close_file( opt->hout, largest_pts, second_largest_pts );
+ cli_output.close_file( opt->hout, largest_pts, second_largest_pts );
opt->hout = NULL;
if( i_frame_output > 0 )
projects / x264 / blobdiff