[x264-devel] [PATCH 12/29] common: Move parameter functions to a separate file
Vittorio Giovara
vittorio.giovara at gmail.com
Fri Feb 10 22:18:47 CET 2017
---
Makefile | 1 +
common/common.c | 1165 ------------------------------------------
common/{common.c => param.c} | 31 +-
3 files changed, 9 insertions(+), 1188 deletions(-)
copy common/{common.c => param.c} (98%)
diff --git a/Makefile b/Makefile
index a2e9404..6d578cb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/set.c common/quant.c common/deblock.c common/vlc.c \
common/mvpred.c common/bitstream.c \
common/log.c common/mem.c common/picture.c common/mathematics.c \
+ common/param.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c \
encoder/cavlc.c encoder/encoder.c encoder/lookahead.c
diff --git a/common/common.c b/common/common.c
index d1caba8..6fd8dc9 100644
--- a/common/common.c
+++ b/common/common.c
@@ -26,1040 +26,10 @@
#include "common.h"
-#include <ctype.h>
-
const int x264_bit_depth = BIT_DEPTH;
const int x264_chroma_format = X264_CHROMA_FORMAT;
-/****************************************************************************
- * x264_param_default:
- ****************************************************************************/
-void x264_param_default( x264_param_t *param )
-{
- /* */
- memset( param, 0, sizeof( x264_param_t ) );
-
- /* CPU autodetect */
- param->cpu = x264_cpu_detect();
- param->i_threads = X264_THREADS_AUTO;
- param->i_lookahead_threads = X264_THREADS_AUTO;
- param->b_deterministic = 1;
- param->i_sync_lookahead = X264_SYNC_LOOKAHEAD_AUTO;
-
- /* Video properties */
- param->i_csp = X264_CHROMA_FORMAT ? X264_CHROMA_FORMAT : X264_CSP_I420;
- param->i_width = 0;
- param->i_height = 0;
- param->vui.i_sar_width = 0;
- param->vui.i_sar_height= 0;
- param->vui.i_overscan = 0; /* undef */
- param->vui.i_vidformat = 5; /* undef */
- param->vui.b_fullrange = -1; /* default depends on input */
- param->vui.i_colorprim = 2; /* undef */
- param->vui.i_transfer = 2; /* undef */
- param->vui.i_colmatrix = -1; /* default depends on input */
- param->vui.i_chroma_loc= 0; /* left center */
- param->i_fps_num = 25;
- param->i_fps_den = 1;
- param->i_level_idc = -1;
- param->i_slice_max_size = 0;
- param->i_slice_max_mbs = 0;
- param->i_slice_count = 0;
-
- /* Encoder parameters */
- param->i_frame_reference = 3;
- param->i_keyint_max = 250;
- param->i_keyint_min = X264_KEYINT_MIN_AUTO;
- param->i_bframe = 3;
- param->i_scenecut_threshold = 40;
- param->i_bframe_adaptive = X264_B_ADAPT_FAST;
- param->i_bframe_bias = 0;
- param->i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
- param->b_interlaced = 0;
- param->b_constrained_intra = 0;
-
- param->b_deblocking_filter = 1;
- param->i_deblocking_filter_alphac0 = 0;
- param->i_deblocking_filter_beta = 0;
-
- param->b_cabac = 1;
- param->i_cabac_init_idc = 0;
-
- param->rc.i_rc_method = X264_RC_CRF;
- param->rc.i_bitrate = 0;
- param->rc.f_rate_tolerance = 1.0;
- param->rc.i_vbv_max_bitrate = 0;
- param->rc.i_vbv_buffer_size = 0;
- param->rc.f_vbv_buffer_init = 0.9;
- param->rc.i_qp_constant = 23 + QP_BD_OFFSET;
- param->rc.f_rf_constant = 23;
- param->rc.i_qp_min = 0;
- param->rc.i_qp_max = QP_MAX;
- param->rc.i_qp_step = 4;
- param->rc.f_ip_factor = 1.4;
- param->rc.f_pb_factor = 1.3;
- param->rc.i_aq_mode = X264_AQ_VARIANCE;
- param->rc.f_aq_strength = 1.0;
- param->rc.i_lookahead = 40;
-
- param->rc.b_stat_write = 0;
- param->rc.psz_stat_out = "x264_2pass.log";
- param->rc.b_stat_read = 0;
- param->rc.psz_stat_in = "x264_2pass.log";
- param->rc.f_qcompress = 0.6;
- param->rc.f_qblur = 0.5;
- param->rc.f_complexity_blur = 20;
- param->rc.i_zones = 0;
- param->rc.b_mb_tree = 1;
-
- /* Log */
- param->pf_log = x264_log_default;
- param->p_log_private = NULL;
- param->i_log_level = X264_LOG_INFO;
-
- /* */
- param->analyse.intra = X264_ANALYSE_I4x4 | X264_ANALYSE_I8x8;
- param->analyse.inter = X264_ANALYSE_I4x4 | X264_ANALYSE_I8x8
- | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_BSUB16x16;
- param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL;
- param->analyse.i_me_method = X264_ME_HEX;
- param->analyse.f_psy_rd = 1.0;
- param->analyse.b_psy = 1;
- param->analyse.f_psy_trellis = 0;
- param->analyse.i_me_range = 16;
- param->analyse.i_subpel_refine = 7;
- param->analyse.b_mixed_references = 1;
- param->analyse.b_chroma_me = 1;
- param->analyse.i_mv_range_thread = -1;
- param->analyse.i_mv_range = -1; // set from level_idc
- param->analyse.i_chroma_qp_offset = 0;
- param->analyse.b_fast_pskip = 1;
- param->analyse.b_weighted_bipred = 1;
- param->analyse.i_weighted_pred = X264_WEIGHTP_SMART;
- param->analyse.b_dct_decimate = 1;
- param->analyse.b_transform_8x8 = 1;
- param->analyse.i_trellis = 1;
- param->analyse.i_luma_deadzone[0] = 21;
- param->analyse.i_luma_deadzone[1] = 11;
- param->analyse.b_psnr = 0;
- param->analyse.b_ssim = 0;
-
- param->i_cqm_preset = X264_CQM_FLAT;
- memset( param->cqm_4iy, 16, sizeof( param->cqm_4iy ) );
- memset( param->cqm_4py, 16, sizeof( param->cqm_4py ) );
- memset( param->cqm_4ic, 16, sizeof( param->cqm_4ic ) );
- memset( param->cqm_4pc, 16, sizeof( param->cqm_4pc ) );
- memset( param->cqm_8iy, 16, sizeof( param->cqm_8iy ) );
- memset( param->cqm_8py, 16, sizeof( param->cqm_8py ) );
- memset( param->cqm_8ic, 16, sizeof( param->cqm_8ic ) );
- memset( param->cqm_8pc, 16, sizeof( param->cqm_8pc ) );
-
- param->b_repeat_headers = 1;
- param->b_annexb = 1;
- param->b_aud = 0;
- param->b_vfr_input = 1;
- param->i_nal_hrd = X264_NAL_HRD_NONE;
- param->b_tff = 1;
- param->b_pic_struct = 0;
- param->b_fake_interlaced = 0;
- param->i_frame_packing = -1;
- param->b_opencl = 0;
- param->i_opencl_device = 0;
- param->opencl_device_id = NULL;
- param->psz_clbin_file = NULL;
-}
-
-static int param_apply_preset( x264_param_t *param, const char *preset )
-{
- char *end;
- int i = strtol( preset, &end, 10 );
- if( *end == 0 && i >= 0 && i < sizeof(x264_preset_names)/sizeof(*x264_preset_names)-1 )
- preset = x264_preset_names[i];
-
- if( !strcasecmp( preset, "ultrafast" ) )
- {
- param->i_frame_reference = 1;
- param->i_scenecut_threshold = 0;
- param->b_deblocking_filter = 0;
- param->b_cabac = 0;
- param->i_bframe = 0;
- param->analyse.intra = 0;
- param->analyse.inter = 0;
- param->analyse.b_transform_8x8 = 0;
- param->analyse.i_me_method = X264_ME_DIA;
- param->analyse.i_subpel_refine = 0;
- param->rc.i_aq_mode = 0;
- param->analyse.b_mixed_references = 0;
- param->analyse.i_trellis = 0;
- param->i_bframe_adaptive = X264_B_ADAPT_NONE;
- param->rc.b_mb_tree = 0;
- param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
- param->analyse.b_weighted_bipred = 0;
- param->rc.i_lookahead = 0;
- }
- else if( !strcasecmp( preset, "superfast" ) )
- {
- param->analyse.inter = X264_ANALYSE_I8x8|X264_ANALYSE_I4x4;
- param->analyse.i_me_method = X264_ME_DIA;
- param->analyse.i_subpel_refine = 1;
- param->i_frame_reference = 1;
- param->analyse.b_mixed_references = 0;
- param->analyse.i_trellis = 0;
- param->rc.b_mb_tree = 0;
- param->analyse.i_weighted_pred = X264_WEIGHTP_SIMPLE;
- param->rc.i_lookahead = 0;
- }
- else if( !strcasecmp( preset, "veryfast" ) )
- {
- param->analyse.i_subpel_refine = 2;
- param->i_frame_reference = 1;
- param->analyse.b_mixed_references = 0;
- param->analyse.i_trellis = 0;
- param->analyse.i_weighted_pred = X264_WEIGHTP_SIMPLE;
- param->rc.i_lookahead = 10;
- }
- else if( !strcasecmp( preset, "faster" ) )
- {
- param->analyse.b_mixed_references = 0;
- param->i_frame_reference = 2;
- param->analyse.i_subpel_refine = 4;
- param->analyse.i_weighted_pred = X264_WEIGHTP_SIMPLE;
- param->rc.i_lookahead = 20;
- }
- else if( !strcasecmp( preset, "fast" ) )
- {
- param->i_frame_reference = 2;
- param->analyse.i_subpel_refine = 6;
- param->analyse.i_weighted_pred = X264_WEIGHTP_SIMPLE;
- param->rc.i_lookahead = 30;
- }
- else if( !strcasecmp( preset, "medium" ) )
- {
- /* Default is medium */
- }
- else if( !strcasecmp( preset, "slow" ) )
- {
- param->analyse.i_subpel_refine = 8;
- param->i_frame_reference = 5;
- param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
- param->analyse.i_trellis = 2;
- param->rc.i_lookahead = 50;
- }
- else if( !strcasecmp( preset, "slower" ) )
- {
- param->analyse.i_me_method = X264_ME_UMH;
- param->analyse.i_subpel_refine = 9;
- param->i_frame_reference = 8;
- param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
- param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
- param->analyse.inter |= X264_ANALYSE_PSUB8x8;
- param->analyse.i_trellis = 2;
- param->rc.i_lookahead = 60;
- }
- else if( !strcasecmp( preset, "veryslow" ) )
- {
- param->analyse.i_me_method = X264_ME_UMH;
- param->analyse.i_subpel_refine = 10;
- param->analyse.i_me_range = 24;
- param->i_frame_reference = 16;
- param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
- param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
- param->analyse.inter |= X264_ANALYSE_PSUB8x8;
- param->analyse.i_trellis = 2;
- param->i_bframe = 8;
- param->rc.i_lookahead = 60;
- }
- else if( !strcasecmp( preset, "placebo" ) )
- {
- param->analyse.i_me_method = X264_ME_TESA;
- param->analyse.i_subpel_refine = 11;
- param->analyse.i_me_range = 24;
- param->i_frame_reference = 16;
- param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
- param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
- param->analyse.inter |= X264_ANALYSE_PSUB8x8;
- param->analyse.b_fast_pskip = 0;
- param->analyse.i_trellis = 2;
- param->i_bframe = 16;
- param->rc.i_lookahead = 60;
- }
- else
- {
- x264_log_internal( X264_LOG_ERROR, "invalid preset '%s'\n", preset );
- return -1;
- }
- return 0;
-}
-
-static int param_apply_tune( x264_param_t *param, const char *tune )
-{
- char *tmp = x264_malloc( strlen( tune ) + 1 );
- if( !tmp )
- return -1;
- tmp = strcpy( tmp, tune );
- char *s = strtok( tmp, ",./-+" );
- int psy_tuning_used = 0;
- while( s )
- {
- if( !strncasecmp( s, "film", 4 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->i_deblocking_filter_alphac0 = -1;
- param->i_deblocking_filter_beta = -1;
- param->analyse.f_psy_trellis = 0.15;
- }
- else if( !strncasecmp( s, "animation", 9 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->i_frame_reference = param->i_frame_reference > 1 ? param->i_frame_reference*2 : 1;
- param->i_deblocking_filter_alphac0 = 1;
- param->i_deblocking_filter_beta = 1;
- param->analyse.f_psy_rd = 0.4;
- param->rc.f_aq_strength = 0.6;
- param->i_bframe += 2;
- }
- else if( !strncasecmp( s, "grain", 5 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->i_deblocking_filter_alphac0 = -2;
- param->i_deblocking_filter_beta = -2;
- param->analyse.f_psy_trellis = 0.25;
- param->analyse.b_dct_decimate = 0;
- param->rc.f_pb_factor = 1.1;
- param->rc.f_ip_factor = 1.1;
- param->rc.f_aq_strength = 0.5;
- param->analyse.i_luma_deadzone[0] = 6;
- param->analyse.i_luma_deadzone[1] = 6;
- param->rc.f_qcompress = 0.8;
- }
- else if( !strncasecmp( s, "stillimage", 10 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->i_deblocking_filter_alphac0 = -3;
- param->i_deblocking_filter_beta = -3;
- param->analyse.f_psy_rd = 2.0;
- param->analyse.f_psy_trellis = 0.7;
- param->rc.f_aq_strength = 1.2;
- }
- else if( !strncasecmp( s, "psnr", 4 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->rc.i_aq_mode = X264_AQ_NONE;
- param->analyse.b_psy = 0;
- }
- else if( !strncasecmp( s, "ssim", 4 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->rc.i_aq_mode = X264_AQ_AUTOVARIANCE;
- param->analyse.b_psy = 0;
- }
- else if( !strncasecmp( s, "fastdecode", 10 ) )
- {
- param->b_deblocking_filter = 0;
- param->b_cabac = 0;
- param->analyse.b_weighted_bipred = 0;
- param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
- }
- else if( !strncasecmp( s, "zerolatency", 11 ) )
- {
- param->rc.i_lookahead = 0;
- param->i_sync_lookahead = 0;
- param->i_bframe = 0;
- param->b_sliced_threads = 1;
- param->b_vfr_input = 0;
- param->rc.b_mb_tree = 0;
- }
- else if( !strncasecmp( s, "touhou", 6 ) )
- {
- if( psy_tuning_used++ ) goto psy_failure;
- param->i_frame_reference = param->i_frame_reference > 1 ? param->i_frame_reference*2 : 1;
- param->i_deblocking_filter_alphac0 = -1;
- param->i_deblocking_filter_beta = -1;
- param->analyse.f_psy_trellis = 0.2;
- param->rc.f_aq_strength = 1.3;
- if( param->analyse.inter & X264_ANALYSE_PSUB16x16 )
- param->analyse.inter |= X264_ANALYSE_PSUB8x8;
- }
- else
- {
- x264_log_internal( X264_LOG_ERROR, "invalid tune '%s'\n", s );
- x264_free( tmp );
- return -1;
- }
- if( 0 )
- {
- psy_failure:
- x264_log_internal( X264_LOG_WARNING, "only 1 psy tuning can be used: ignoring tune %s\n", s );
- }
- s = strtok( NULL, ",./-+" );
- }
- x264_free( tmp );
- return 0;
-}
-
-int x264_param_default_preset( x264_param_t *param, const char *preset, const char *tune )
-{
- x264_param_default( param );
-
- if( preset && param_apply_preset( param, preset ) < 0 )
- return -1;
- if( tune && param_apply_tune( param, tune ) < 0 )
- return -1;
- return 0;
-}
-
-void x264_param_apply_fastfirstpass( x264_param_t *param )
-{
- /* Set faster options in case of turbo firstpass. */
- if( param->rc.b_stat_write && !param->rc.b_stat_read )
- {
- param->i_frame_reference = 1;
- param->analyse.b_transform_8x8 = 0;
- param->analyse.inter = 0;
- param->analyse.i_me_method = X264_ME_DIA;
- param->analyse.i_subpel_refine = X264_MIN( 2, param->analyse.i_subpel_refine );
- param->analyse.i_trellis = 0;
- param->analyse.b_fast_pskip = 1;
- }
-}
-
-static int profile_string_to_int( const char *str )
-{
- if( !strcasecmp( str, "baseline" ) )
- return PROFILE_BASELINE;
- if( !strcasecmp( str, "main" ) )
- return PROFILE_MAIN;
- if( !strcasecmp( str, "high" ) )
- return PROFILE_HIGH;
- if( !strcasecmp( str, "high10" ) )
- return PROFILE_HIGH10;
- if( !strcasecmp( str, "high422" ) )
- return PROFILE_HIGH422;
- if( !strcasecmp( str, "high444" ) )
- return PROFILE_HIGH444_PREDICTIVE;
- return -1;
-}
-
-int x264_param_apply_profile( x264_param_t *param, const char *profile )
-{
- if( !profile )
- return 0;
-
- int p = profile_string_to_int( profile );
- if( p < 0 )
- {
- x264_log_internal( X264_LOG_ERROR, "invalid profile: %s\n", profile );
- return -1;
- }
- if( p < PROFILE_HIGH444_PREDICTIVE && ((param->rc.i_rc_method == X264_RC_CQP && param->rc.i_qp_constant <= 0) ||
- (param->rc.i_rc_method == X264_RC_CRF && (int)(param->rc.f_rf_constant + QP_BD_OFFSET) <= 0)) )
- {
- x264_log_internal( X264_LOG_ERROR, "%s profile doesn't support lossless\n", profile );
- return -1;
- }
- if( p < PROFILE_HIGH444_PREDICTIVE && (param->i_csp & X264_CSP_MASK) >= X264_CSP_I444 )
- {
- x264_log_internal( X264_LOG_ERROR, "%s profile doesn't support 4:4:4\n", profile );
- return -1;
- }
- if( p < PROFILE_HIGH422 && (param->i_csp & X264_CSP_MASK) >= X264_CSP_I422 )
- {
- x264_log_internal( X264_LOG_ERROR, "%s profile doesn't support 4:2:2\n", profile );
- return -1;
- }
- if( p < PROFILE_HIGH10 && BIT_DEPTH > 8 )
- {
- x264_log_internal( X264_LOG_ERROR, "%s profile doesn't support a bit depth of %d\n", profile, BIT_DEPTH );
- return -1;
- }
-
- if( p == PROFILE_BASELINE )
- {
- param->analyse.b_transform_8x8 = 0;
- param->b_cabac = 0;
- param->i_cqm_preset = X264_CQM_FLAT;
- param->psz_cqm_file = NULL;
- param->i_bframe = 0;
- param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
- if( param->b_interlaced )
- {
- x264_log_internal( X264_LOG_ERROR, "baseline profile doesn't support interlacing\n" );
- return -1;
- }
- if( param->b_fake_interlaced )
- {
- x264_log_internal( X264_LOG_ERROR, "baseline profile doesn't support fake interlacing\n" );
- return -1;
- }
- }
- else if( p == PROFILE_MAIN )
- {
- param->analyse.b_transform_8x8 = 0;
- param->i_cqm_preset = X264_CQM_FLAT;
- param->psz_cqm_file = NULL;
- }
- return 0;
-}
-
-static int parse_enum( const char *arg, const char * const *names, int *dst )
-{
- for( int i = 0; names[i]; i++ )
- if( !strcasecmp( arg, names[i] ) )
- {
- *dst = i;
- return 0;
- }
- return -1;
-}
-
-static int parse_cqm( const char *str, uint8_t *cqm, int length )
-{
- int i = 0;
- do {
- int coef;
- if( !sscanf( str, "%d", &coef ) || coef < 1 || coef > 255 )
- return -1;
- cqm[i++] = coef;
- } while( i < length && (str = strchr( str, ',' )) && str++ );
- return (i == length) ? 0 : -1;
-}
-
-static int atobool_internal( const char *str, int *b_error )
-{
- if( !strcmp(str, "1") ||
- !strcasecmp(str, "true") ||
- !strcasecmp(str, "yes") )
- return 1;
- if( !strcmp(str, "0") ||
- !strcasecmp(str, "false") ||
- !strcasecmp(str, "no") )
- return 0;
- *b_error = 1;
- return 0;
-}
-
-static int atoi_internal( const char *str, int *b_error )
-{
- char *end;
- int v = strtol( str, &end, 0 );
- if( end == str || *end != '\0' )
- *b_error = 1;
- return v;
-}
-
-static double atof_internal( const char *str, int *b_error )
-{
- char *end;
- double v = strtod( str, &end );
- if( end == str || *end != '\0' )
- *b_error = 1;
- return v;
-}
-
-#define atobool(str) ( name_was_bool = 1, atobool_internal( str, &b_error ) )
-#undef atoi
-#undef atof
-#define atoi(str) atoi_internal( str, &b_error )
-#define atof(str) atof_internal( str, &b_error )
-
-int x264_param_parse( x264_param_t *p, const char *name, const char *value )
-{
- char *name_buf = NULL;
- int b_error = 0;
- int errortype = X264_PARAM_BAD_VALUE;
- int name_was_bool;
- int value_was_null = !value;
-
- if( !name )
- return X264_PARAM_BAD_NAME;
- if( !value )
- value = "true";
-
- if( value[0] == '=' )
- value++;
-
- if( strchr( name, '_' ) ) // s/_/-/g
- {
- char *c;
- name_buf = strdup(name);
- if( !name_buf )
- return X264_PARAM_BAD_NAME;
- while( (c = strchr( name_buf, '_' )) )
- *c = '-';
- name = name_buf;
- }
-
- if( !strncmp( name, "no", 2 ) )
- {
- name += 2;
- if( name[0] == '-' )
- name++;
- value = atobool(value) ? "false" : "true";
- }
- name_was_bool = 0;
-
-#define OPT(STR) else if( !strcmp( name, STR ) )
-#define OPT2(STR0, STR1) else if( !strcmp( name, STR0 ) || !strcmp( name, STR1 ) )
- if( 0 );
- OPT("asm")
- {
- p->cpu = isdigit(value[0]) ? atoi(value) :
- !strcasecmp(value, "auto") || atobool(value) ? x264_cpu_detect() : 0;
- if( b_error )
- {
- char *buf = strdup( value );
- if( buf )
- {
- char *tok, UNUSED *saveptr=NULL, *init;
- b_error = 0;
- p->cpu = 0;
- for( init=buf; (tok=strtok_r(init, ",", &saveptr)); init=NULL )
- {
- int i = 0;
- while( x264_cpu_names[i].flags && strcasecmp(tok, x264_cpu_names[i].name) )
- i++;
- p->cpu |= x264_cpu_names[i].flags;
- if( !x264_cpu_names[i].flags )
- b_error = 1;
- }
- free( buf );
- if( (p->cpu&X264_CPU_SSSE3) && !(p->cpu&X264_CPU_SSE2_IS_SLOW) )
- p->cpu |= X264_CPU_SSE2_IS_FAST;
- }
- }
- }
- OPT("threads")
- {
- if( !strcasecmp(value, "auto") )
- p->i_threads = X264_THREADS_AUTO;
- else
- p->i_threads = atoi(value);
- }
- OPT("lookahead-threads")
- {
- if( !strcasecmp(value, "auto") )
- p->i_lookahead_threads = X264_THREADS_AUTO;
- else
- p->i_lookahead_threads = atoi(value);
- }
- OPT("sliced-threads")
- p->b_sliced_threads = atobool(value);
- OPT("sync-lookahead")
- {
- if( !strcasecmp(value, "auto") )
- p->i_sync_lookahead = X264_SYNC_LOOKAHEAD_AUTO;
- else
- p->i_sync_lookahead = atoi(value);
- }
- OPT2("deterministic", "n-deterministic")
- p->b_deterministic = atobool(value);
- OPT("cpu-independent")
- p->b_cpu_independent = atobool(value);
- OPT2("level", "level-idc")
- {
- if( !strcmp(value, "1b") )
- p->i_level_idc = 9;
- else if( atof(value) < 6 )
- p->i_level_idc = (int)(10*atof(value)+.5);
- else
- p->i_level_idc = atoi(value);
- }
- OPT("bluray-compat")
- p->b_bluray_compat = atobool(value);
- OPT("avcintra-class")
- p->i_avcintra_class = atoi(value);
- OPT("sar")
- {
- b_error = ( 2 != sscanf( value, "%d:%d", &p->vui.i_sar_width, &p->vui.i_sar_height ) &&
- 2 != sscanf( value, "%d/%d", &p->vui.i_sar_width, &p->vui.i_sar_height ) );
- }
- OPT("overscan")
- b_error |= parse_enum( value, x264_overscan_names, &p->vui.i_overscan );
- OPT("videoformat")
- b_error |= parse_enum( value, x264_vidformat_names, &p->vui.i_vidformat );
- OPT("fullrange")
- b_error |= parse_enum( value, x264_fullrange_names, &p->vui.b_fullrange );
- OPT("colorprim")
- b_error |= parse_enum( value, x264_colorprim_names, &p->vui.i_colorprim );
- OPT("transfer")
- b_error |= parse_enum( value, x264_transfer_names, &p->vui.i_transfer );
- OPT("colormatrix")
- b_error |= parse_enum( value, x264_colmatrix_names, &p->vui.i_colmatrix );
- OPT("chromaloc")
- {
- p->vui.i_chroma_loc = atoi(value);
- b_error = ( p->vui.i_chroma_loc < 0 || p->vui.i_chroma_loc > 5 );
- }
- OPT("fps")
- {
- if( sscanf( value, "%u/%u", &p->i_fps_num, &p->i_fps_den ) != 2 )
- {
- double fps = atof(value);
- if( fps > 0.0 && fps <= INT_MAX/1000.0 )
- {
- p->i_fps_num = (int)(fps * 1000.0 + .5);
- p->i_fps_den = 1000;
- }
- else
- {
- p->i_fps_num = atoi(value);
- p->i_fps_den = 1;
- }
- }
- }
- OPT2("ref", "frameref")
- p->i_frame_reference = atoi(value);
- OPT("dpb-size")
- p->i_dpb_size = atoi(value);
- OPT("keyint")
- {
- if( strstr( value, "infinite" ) )
- p->i_keyint_max = X264_KEYINT_MAX_INFINITE;
- else
- p->i_keyint_max = atoi(value);
- }
- OPT2("min-keyint", "keyint-min")
- {
- p->i_keyint_min = atoi(value);
- if( p->i_keyint_max < p->i_keyint_min )
- p->i_keyint_max = p->i_keyint_min;
- }
- OPT("scenecut")
- {
- p->i_scenecut_threshold = atobool(value);
- if( b_error || p->i_scenecut_threshold )
- {
- b_error = 0;
- p->i_scenecut_threshold = atoi(value);
- }
- }
- OPT("intra-refresh")
- p->b_intra_refresh = atobool(value);
- OPT("bframes")
- p->i_bframe = atoi(value);
- OPT("b-adapt")
- {
- p->i_bframe_adaptive = atobool(value);
- if( b_error )
- {
- b_error = 0;
- p->i_bframe_adaptive = atoi(value);
- }
- }
- OPT("b-bias")
- p->i_bframe_bias = atoi(value);
- OPT("b-pyramid")
- {
- b_error |= parse_enum( value, x264_b_pyramid_names, &p->i_bframe_pyramid );
- if( b_error )
- {
- b_error = 0;
- p->i_bframe_pyramid = atoi(value);
- }
- }
- OPT("open-gop")
- p->b_open_gop = atobool(value);
- OPT("nf")
- p->b_deblocking_filter = !atobool(value);
- OPT2("filter", "deblock")
- {
- if( 2 == sscanf( value, "%d:%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta ) ||
- 2 == sscanf( value, "%d,%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta ) )
- {
- p->b_deblocking_filter = 1;
- }
- else if( sscanf( value, "%d", &p->i_deblocking_filter_alphac0 ) )
- {
- p->b_deblocking_filter = 1;
- p->i_deblocking_filter_beta = p->i_deblocking_filter_alphac0;
- }
- else
- p->b_deblocking_filter = atobool(value);
- }
- OPT("slice-max-size")
- p->i_slice_max_size = atoi(value);
- OPT("slice-max-mbs")
- p->i_slice_max_mbs = atoi(value);
- OPT("slice-min-mbs")
- p->i_slice_min_mbs = atoi(value);
- OPT("slices")
- p->i_slice_count = atoi(value);
- OPT("slices-max")
- p->i_slice_count_max = atoi(value);
- OPT("cabac")
- p->b_cabac = atobool(value);
- OPT("cabac-idc")
- p->i_cabac_init_idc = atoi(value);
- OPT("interlaced")
- p->b_interlaced = atobool(value);
- OPT("tff")
- p->b_interlaced = p->b_tff = atobool(value);
- OPT("bff")
- {
- p->b_interlaced = atobool(value);
- p->b_tff = !p->b_interlaced;
- }
- OPT("constrained-intra")
- p->b_constrained_intra = atobool(value);
- OPT("cqm")
- {
- if( strstr( value, "flat" ) )
- p->i_cqm_preset = X264_CQM_FLAT;
- else if( strstr( value, "jvt" ) )
- p->i_cqm_preset = X264_CQM_JVT;
- else
- p->psz_cqm_file = strdup(value);
- }
- OPT("cqmfile")
- p->psz_cqm_file = strdup(value);
- OPT("cqm4")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4iy, 16 );
- b_error |= parse_cqm( value, p->cqm_4py, 16 );
- b_error |= parse_cqm( value, p->cqm_4ic, 16 );
- b_error |= parse_cqm( value, p->cqm_4pc, 16 );
- }
- OPT("cqm8")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_8iy, 64 );
- b_error |= parse_cqm( value, p->cqm_8py, 64 );
- b_error |= parse_cqm( value, p->cqm_8ic, 64 );
- b_error |= parse_cqm( value, p->cqm_8pc, 64 );
- }
- OPT("cqm4i")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4iy, 16 );
- b_error |= parse_cqm( value, p->cqm_4ic, 16 );
- }
- OPT("cqm4p")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4py, 16 );
- b_error |= parse_cqm( value, p->cqm_4pc, 16 );
- }
- OPT("cqm4iy")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4iy, 16 );
- }
- OPT("cqm4ic")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4ic, 16 );
- }
- OPT("cqm4py")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4py, 16 );
- }
- OPT("cqm4pc")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_4pc, 16 );
- }
- OPT("cqm8i")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_8iy, 64 );
- b_error |= parse_cqm( value, p->cqm_8ic, 64 );
- }
- OPT("cqm8p")
- {
- p->i_cqm_preset = X264_CQM_CUSTOM;
- b_error |= parse_cqm( value, p->cqm_8py, 64 );
- b_error |= parse_cqm( value, p->cqm_8pc, 64 );
- }
- OPT("log")
- p->i_log_level = atoi(value);
- OPT("dump-yuv")
- p->psz_dump_yuv = strdup(value);
- OPT2("analyse", "partitions")
- {
- p->analyse.inter = 0;
- if( strstr( value, "none" ) ) p->analyse.inter = 0;
- if( strstr( value, "all" ) ) p->analyse.inter = ~0;
-
- if( strstr( value, "i4x4" ) ) p->analyse.inter |= X264_ANALYSE_I4x4;
- if( strstr( value, "i8x8" ) ) p->analyse.inter |= X264_ANALYSE_I8x8;
- if( strstr( value, "p8x8" ) ) p->analyse.inter |= X264_ANALYSE_PSUB16x16;
- if( strstr( value, "p4x4" ) ) p->analyse.inter |= X264_ANALYSE_PSUB8x8;
- if( strstr( value, "b8x8" ) ) p->analyse.inter |= X264_ANALYSE_BSUB16x16;
- }
- OPT("8x8dct")
- p->analyse.b_transform_8x8 = atobool(value);
- OPT2("weightb", "weight-b")
- p->analyse.b_weighted_bipred = atobool(value);
- OPT("weightp")
- p->analyse.i_weighted_pred = atoi(value);
- OPT2("direct", "direct-pred")
- b_error |= parse_enum( value, x264_direct_pred_names, &p->analyse.i_direct_mv_pred );
- OPT("chroma-qp-offset")
- p->analyse.i_chroma_qp_offset = atoi(value);
- OPT("me")
- b_error |= parse_enum( value, x264_motion_est_names, &p->analyse.i_me_method );
- OPT2("merange", "me-range")
- p->analyse.i_me_range = atoi(value);
- OPT2("mvrange", "mv-range")
- p->analyse.i_mv_range = atoi(value);
- OPT2("mvrange-thread", "mv-range-thread")
- p->analyse.i_mv_range_thread = atoi(value);
- OPT2("subme", "subq")
- p->analyse.i_subpel_refine = atoi(value);
- OPT("psy-rd")
- {
- if( 2 == sscanf( value, "%f:%f", &p->analyse.f_psy_rd, &p->analyse.f_psy_trellis ) ||
- 2 == sscanf( value, "%f,%f", &p->analyse.f_psy_rd, &p->analyse.f_psy_trellis ) ||
- 2 == sscanf( value, "%f|%f", &p->analyse.f_psy_rd, &p->analyse.f_psy_trellis ))
- { }
- else if( sscanf( value, "%f", &p->analyse.f_psy_rd ) )
- {
- p->analyse.f_psy_trellis = 0;
- }
- else
- {
- p->analyse.f_psy_rd = 0;
- p->analyse.f_psy_trellis = 0;
- }
- }
- OPT("psy")
- p->analyse.b_psy = atobool(value);
- OPT("chroma-me")
- p->analyse.b_chroma_me = atobool(value);
- OPT("mixed-refs")
- p->analyse.b_mixed_references = atobool(value);
- OPT("trellis")
- p->analyse.i_trellis = atoi(value);
- OPT("fast-pskip")
- p->analyse.b_fast_pskip = atobool(value);
- OPT("dct-decimate")
- p->analyse.b_dct_decimate = atobool(value);
- OPT("deadzone-inter")
- p->analyse.i_luma_deadzone[0] = atoi(value);
- OPT("deadzone-intra")
- p->analyse.i_luma_deadzone[1] = atoi(value);
- OPT("nr")
- p->analyse.i_noise_reduction = atoi(value);
- OPT("bitrate")
- {
- p->rc.i_bitrate = atoi(value);
- p->rc.i_rc_method = X264_RC_ABR;
- }
- OPT2("qp", "qp_constant")
- {
- p->rc.i_qp_constant = atoi(value);
- p->rc.i_rc_method = X264_RC_CQP;
- }
- OPT("crf")
- {
- p->rc.f_rf_constant = atof(value);
- p->rc.i_rc_method = X264_RC_CRF;
- }
- OPT("crf-max")
- p->rc.f_rf_constant_max = atof(value);
- OPT("rc-lookahead")
- p->rc.i_lookahead = atoi(value);
- OPT2("qpmin", "qp-min")
- p->rc.i_qp_min = atoi(value);
- OPT2("qpmax", "qp-max")
- p->rc.i_qp_max = atoi(value);
- OPT2("qpstep", "qp-step")
- p->rc.i_qp_step = atoi(value);
- OPT("ratetol")
- p->rc.f_rate_tolerance = !strncmp("inf", value, 3) ? 1e9 : atof(value);
- OPT("vbv-maxrate")
- p->rc.i_vbv_max_bitrate = atoi(value);
- OPT("vbv-bufsize")
- p->rc.i_vbv_buffer_size = atoi(value);
- OPT("vbv-init")
- p->rc.f_vbv_buffer_init = atof(value);
- OPT2("ipratio", "ip-factor")
- p->rc.f_ip_factor = atof(value);
- OPT2("pbratio", "pb-factor")
- p->rc.f_pb_factor = atof(value);
- OPT("aq-mode")
- p->rc.i_aq_mode = atoi(value);
- OPT("aq-strength")
- p->rc.f_aq_strength = atof(value);
- OPT("pass")
- {
- int pass = x264_clip3( atoi(value), 0, 3 );
- p->rc.b_stat_write = pass & 1;
- p->rc.b_stat_read = pass & 2;
- }
- OPT("stats")
- {
- p->rc.psz_stat_in = strdup(value);
- p->rc.psz_stat_out = strdup(value);
- }
- OPT("qcomp")
- p->rc.f_qcompress = atof(value);
- OPT("mbtree")
- p->rc.b_mb_tree = atobool(value);
- OPT("qblur")
- p->rc.f_qblur = atof(value);
- OPT2("cplxblur", "cplx-blur")
- p->rc.f_complexity_blur = atof(value);
- OPT("zones")
- p->rc.psz_zones = strdup(value);
- OPT("crop-rect")
- b_error |= sscanf( value, "%u,%u,%u,%u", &p->crop_rect.i_left, &p->crop_rect.i_top,
- &p->crop_rect.i_right, &p->crop_rect.i_bottom ) != 4;
- OPT("psnr")
- p->analyse.b_psnr = atobool(value);
- OPT("ssim")
- p->analyse.b_ssim = atobool(value);
- OPT("aud")
- p->b_aud = atobool(value);
- OPT("sps-id")
- p->i_sps_id = atoi(value);
- OPT("global-header")
- p->b_repeat_headers = !atobool(value);
- OPT("repeat-headers")
- p->b_repeat_headers = atobool(value);
- OPT("annexb")
- p->b_annexb = atobool(value);
- OPT("force-cfr")
- p->b_vfr_input = !atobool(value);
- OPT("nal-hrd")
- b_error |= parse_enum( value, x264_nal_hrd_names, &p->i_nal_hrd );
- OPT("filler")
- p->rc.b_filler = atobool(value);
- OPT("pic-struct")
- p->b_pic_struct = atobool(value);
- OPT("fake-interlaced")
- p->b_fake_interlaced = atobool(value);
- OPT("frame-packing")
- p->i_frame_packing = atoi(value);
- OPT("stitchable")
- p->b_stitchable = atobool(value);
- OPT("opencl")
- p->b_opencl = atobool( value );
- OPT("opencl-clbin")
- p->psz_clbin_file = strdup( value );
- OPT("opencl-device")
- p->i_opencl_device = atoi( value );
- else
- {
- b_error = 1;
- errortype = X264_PARAM_BAD_NAME;
- }
-#undef OPT
-#undef OPT2
-#undef atobool
-#undef atoi
-#undef atof
-
- if( name_buf )
- free( name_buf );
-
- b_error |= value_was_null && !name_was_bool;
- return b_error ? errortype : 0;
-}
-
/****************************************************************************
* x264_log:
****************************************************************************/
@@ -1076,138 +46,3 @@ void x264_log( x264_t *h, int i_level, const char *psz_fmt, ... )
va_end( arg );
}
}
-
-/****************************************************************************
- * x264_param2string:
- ****************************************************************************/
-char *x264_param2string( x264_param_t *p, int b_res )
-{
- int len = 1000;
- char *buf, *s;
- if( p->rc.psz_zones )
- len += strlen(p->rc.psz_zones);
- buf = s = x264_malloc( len );
- if( !buf )
- return NULL;
-
- if( b_res )
- {
- s += sprintf( s, "%dx%d ", p->i_width, p->i_height );
- s += sprintf( s, "fps=%u/%u ", p->i_fps_num, p->i_fps_den );
- s += sprintf( s, "timebase=%u/%u ", p->i_timebase_num, p->i_timebase_den );
- s += sprintf( s, "bitdepth=%d ", BIT_DEPTH );
- }
-
- if( p->b_opencl )
- s += sprintf( s, "opencl=%d ", p->b_opencl );
- s += sprintf( s, "cabac=%d", p->b_cabac );
- s += sprintf( s, " ref=%d", p->i_frame_reference );
- s += sprintf( s, " deblock=%d:%d:%d", p->b_deblocking_filter,
- p->i_deblocking_filter_alphac0, p->i_deblocking_filter_beta );
- s += sprintf( s, " analyse=%#x:%#x", p->analyse.intra, p->analyse.inter );
- s += sprintf( s, " me=%s", x264_motion_est_names[ p->analyse.i_me_method ] );
- s += sprintf( s, " subme=%d", p->analyse.i_subpel_refine );
- s += sprintf( s, " psy=%d", p->analyse.b_psy );
- if( p->analyse.b_psy )
- s += sprintf( s, " psy_rd=%.2f:%.2f", p->analyse.f_psy_rd, p->analyse.f_psy_trellis );
- s += sprintf( s, " mixed_ref=%d", p->analyse.b_mixed_references );
- s += sprintf( s, " me_range=%d", p->analyse.i_me_range );
- s += sprintf( s, " chroma_me=%d", p->analyse.b_chroma_me );
- s += sprintf( s, " trellis=%d", p->analyse.i_trellis );
- s += sprintf( s, " 8x8dct=%d", p->analyse.b_transform_8x8 );
- s += sprintf( s, " cqm=%d", p->i_cqm_preset );
- s += sprintf( s, " deadzone=%d,%d", p->analyse.i_luma_deadzone[0], p->analyse.i_luma_deadzone[1] );
- s += sprintf( s, " fast_pskip=%d", p->analyse.b_fast_pskip );
- s += sprintf( s, " chroma_qp_offset=%d", p->analyse.i_chroma_qp_offset );
- s += sprintf( s, " threads=%d", p->i_threads );
- s += sprintf( s, " lookahead_threads=%d", p->i_lookahead_threads );
- s += sprintf( s, " sliced_threads=%d", p->b_sliced_threads );
- if( p->i_slice_count )
- s += sprintf( s, " slices=%d", p->i_slice_count );
- if( p->i_slice_count_max )
- s += sprintf( s, " slices_max=%d", p->i_slice_count_max );
- if( p->i_slice_max_size )
- s += sprintf( s, " slice_max_size=%d", p->i_slice_max_size );
- if( p->i_slice_max_mbs )
- s += sprintf( s, " slice_max_mbs=%d", p->i_slice_max_mbs );
- if( p->i_slice_min_mbs )
- s += sprintf( s, " slice_min_mbs=%d", p->i_slice_min_mbs );
- s += sprintf( s, " nr=%d", p->analyse.i_noise_reduction );
- s += sprintf( s, " decimate=%d", p->analyse.b_dct_decimate );
- s += sprintf( s, " interlaced=%s", p->b_interlaced ? p->b_tff ? "tff" : "bff" : p->b_fake_interlaced ? "fake" : "0" );
- s += sprintf( s, " bluray_compat=%d", p->b_bluray_compat );
- if( p->b_stitchable )
- s += sprintf( s, " stitchable=%d", p->b_stitchable );
-
- s += sprintf( s, " constrained_intra=%d", p->b_constrained_intra );
-
- s += sprintf( s, " bframes=%d", p->i_bframe );
- if( p->i_bframe )
- {
- s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d weightb=%d open_gop=%d",
- p->i_bframe_pyramid, p->i_bframe_adaptive, p->i_bframe_bias,
- p->analyse.i_direct_mv_pred, p->analyse.b_weighted_bipred, p->b_open_gop );
- }
- s += sprintf( s, " weightp=%d", p->analyse.i_weighted_pred > 0 ? p->analyse.i_weighted_pred : 0 );
-
- if( p->i_keyint_max == X264_KEYINT_MAX_INFINITE )
- s += sprintf( s, " keyint=infinite" );
- else
- s += sprintf( s, " keyint=%d", p->i_keyint_max );
- s += sprintf( s, " keyint_min=%d scenecut=%d intra_refresh=%d",
- p->i_keyint_min, p->i_scenecut_threshold, p->b_intra_refresh );
-
- if( p->rc.b_mb_tree || p->rc.i_vbv_buffer_size )
- s += sprintf( s, " rc_lookahead=%d", p->rc.i_lookahead );
-
- s += sprintf( s, " rc=%s mbtree=%d", p->rc.i_rc_method == X264_RC_ABR ?
- ( p->rc.b_stat_read ? "2pass" : p->rc.i_vbv_max_bitrate == p->rc.i_bitrate ? "cbr" : "abr" )
- : p->rc.i_rc_method == X264_RC_CRF ? "crf" : "cqp", p->rc.b_mb_tree );
- if( p->rc.i_rc_method == X264_RC_ABR || p->rc.i_rc_method == X264_RC_CRF )
- {
- if( p->rc.i_rc_method == X264_RC_CRF )
- s += sprintf( s, " crf=%.1f", p->rc.f_rf_constant );
- else
- s += sprintf( s, " bitrate=%d ratetol=%.1f",
- p->rc.i_bitrate, p->rc.f_rate_tolerance );
- s += sprintf( s, " qcomp=%.2f qpmin=%d qpmax=%d qpstep=%d",
- p->rc.f_qcompress, p->rc.i_qp_min, p->rc.i_qp_max, p->rc.i_qp_step );
- if( p->rc.b_stat_read )
- s += sprintf( s, " cplxblur=%.1f qblur=%.1f",
- p->rc.f_complexity_blur, p->rc.f_qblur );
- if( p->rc.i_vbv_buffer_size )
- {
- s += sprintf( s, " vbv_maxrate=%d vbv_bufsize=%d",
- p->rc.i_vbv_max_bitrate, p->rc.i_vbv_buffer_size );
- if( p->rc.i_rc_method == X264_RC_CRF )
- s += sprintf( s, " crf_max=%.1f", p->rc.f_rf_constant_max );
- }
- }
- else if( p->rc.i_rc_method == X264_RC_CQP )
- s += sprintf( s, " qp=%d", p->rc.i_qp_constant );
-
- if( p->rc.i_vbv_buffer_size )
- s += sprintf( s, " nal_hrd=%s filler=%d", x264_nal_hrd_names[p->i_nal_hrd], p->rc.b_filler );
- if( p->crop_rect.i_left | p->crop_rect.i_top | p->crop_rect.i_right | p->crop_rect.i_bottom )
- s += sprintf( s, " crop_rect=%u,%u,%u,%u", p->crop_rect.i_left, p->crop_rect.i_top,
- p->crop_rect.i_right, p->crop_rect.i_bottom );
- if( p->i_frame_packing >= 0 )
- s += sprintf( s, " frame-packing=%d", p->i_frame_packing );
-
- if( !(p->rc.i_rc_method == X264_RC_CQP && p->rc.i_qp_constant == 0) )
- {
- s += sprintf( s, " ip_ratio=%.2f", p->rc.f_ip_factor );
- if( p->i_bframe && !p->rc.b_mb_tree )
- s += sprintf( s, " pb_ratio=%.2f", p->rc.f_pb_factor );
- s += sprintf( s, " aq=%d", p->rc.i_aq_mode );
- if( p->rc.i_aq_mode )
- s += sprintf( s, ":%.2f", p->rc.f_aq_strength );
- if( p->rc.psz_zones )
- s += sprintf( s, " zones=%s", p->rc.psz_zones );
- else if( p->rc.i_zones )
- s += sprintf( s, " zones" );
- }
-
- return buf;
-}
-
diff --git a/common/common.c b/common/param.c
similarity index 98%
copy from common/common.c
copy to common/param.c
index d1caba8..fad0ef5 100644
--- a/common/common.c
+++ b/common/param.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * common.c: misc common functions
+ * param.c: param parsing functions
*****************************************************************************
* Copyright (C) 2003-2017 x264 project
*
@@ -27,10 +27,13 @@
#include "common.h"
#include <ctype.h>
-
-const int x264_bit_depth = BIT_DEPTH;
-
-const int x264_chroma_format = X264_CHROMA_FORMAT;
+#include "osdep.h"
+#include "x264.h"
+#include "cpu.h"
+#include "mem.h"
+#include "log.h"
+#include "set.h"
+#include "mathematics.h"
/****************************************************************************
* x264_param_default:
@@ -1060,23 +1063,6 @@ int x264_param_parse( x264_param_t *p, const char *name, const char *value )
return b_error ? errortype : 0;
}
-/****************************************************************************
- * x264_log:
- ****************************************************************************/
-void x264_log( x264_t *h, int i_level, const char *psz_fmt, ... )
-{
- if( !h || i_level <= h->param.i_log_level )
- {
- va_list arg;
- va_start( arg, psz_fmt );
- if( !h )
- x264_log_default( NULL, i_level, psz_fmt, arg );
- else
- h->param.pf_log( h->param.p_log_private, i_level, psz_fmt, arg );
- va_end( arg );
- }
-}
-
/****************************************************************************
* x264_param2string:
****************************************************************************/
@@ -1210,4 +1196,3 @@ char *x264_param2string( x264_param_t *p, int b_res )
return buf;
}
-
--
2.10.0
More information about the x264-devel
mailing list