/*****************************************************************************
* common.c: h264 library
*****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: common.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
+ * Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#include <stdio.h>
-#include <string.h>
#include <stdarg.h>
+#include <ctype.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
/* CPU autodetect */
param->cpu = x264_cpu_detect();
param->i_threads = 1;
+ param->b_deterministic = 1;
/* Video properties */
param->i_csp = X264_CSP_I420;
param->vui.i_chroma_loc= 0; /* left center */
param->i_fps_num = 25;
param->i_fps_den = 1;
- param->i_level_idc = 51; /* as close to "unrestricted" as we can get */
+ param->i_level_idc = -1;
/* Encoder parameters */
param->i_frame_reference = 1;
param->i_keyint_min = 25;
param->i_bframe = 0;
param->i_scenecut_threshold = 40;
- param->b_bframe_adaptive = 1;
+ param->i_bframe_adaptive = X264_B_ADAPT_FAST;
param->i_bframe_bias = 0;
param->b_bframe_pyramid = 0;
param->b_cabac = 1;
param->i_cabac_init_idc = 0;
- param->rc.i_rc_method = X264_RC_CQP;
+ param->rc.i_rc_method = X264_RC_NONE;
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 = 26;
- param->rc.i_rf_constant = 0;
+ param->rc.f_rf_constant = 0;
param->rc.i_qp_min = 10;
param->rc.i_qp_max = 51;
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.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.psz_rc_eq = "blurCplx^(1-qComp)";
param->rc.f_qcompress = 0.6;
param->rc.f_qblur = 0.5;
param->rc.f_complexity_blur = 20;
| 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.f_psy_trellis = 0;
param->analyse.i_me_range = 16;
- param->analyse.i_subpel_refine = 5;
+ param->analyse.i_subpel_refine = 6;
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_dct_decimate = 1;
+ param->analyse.i_luma_deadzone[0] = 21;
+ param->analyse.i_luma_deadzone[1] = 11;
param->analyse.b_psnr = 1;
param->analyse.b_ssim = 1;
return (i == length) ? 0 : -1;
}
-static int atobool( const char *str )
+static int x264_atobool( const char *str, int *b_error )
{
- if( !strcmp(str, "1") ||
- !strcmp(str, "true") ||
+ if( !strcmp(str, "1") ||
+ !strcmp(str, "true") ||
!strcmp(str, "yes") )
return 1;
- if( !strcmp(str, "0") ||
- !strcmp(str, "false") ||
+ if( !strcmp(str, "0") ||
+ !strcmp(str, "false") ||
!strcmp(str, "no") )
return 0;
- return -1;
+ *b_error = 1;
+ return 0;
+}
+
+static int x264_atoi( const char *str, int *b_error )
+{
+ char *end;
+ int v = strtol( str, &end, 0 );
+ if( end == str || *end != '\0' )
+ *b_error = 1;
+ return v;
}
-#define atobool(str) ( (i = atobool(str)) < 0 ? (b_error = 1) : i )
+static double x264_atof( 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, x264_atobool( str, &b_error ) )
+#define atoi(str) x264_atoi( str, &b_error )
+#define atof(str) x264_atof( 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 name_was_bool;
+ int value_was_null = !value;
int i;
if( !name )
return X264_PARAM_BAD_NAME;
if( !value )
- return X264_PARAM_BAD_VALUE;
+ value = "true";
if( value[0] == '=' )
value++;
+ if( strchr( name, '_' ) ) // s/_/-/g
+ {
+ char *p;
+ name_buf = strdup(name);
+ while( (p = strchr( name_buf, '_' )) )
+ *p = '-';
+ name = name_buf;
+ }
+
if( (!strncmp( name, "no-", 3 ) && (i = 3)) ||
(!strncmp( name, "no", 2 ) && (i = 2)) )
{
name += i;
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 = atobool(value) ? x264_cpu_detect() : 0;
+ {
+ p->cpu = isdigit(value[0]) ? atoi(value) :
+ !strcmp(value, "auto") || atobool(value) ? x264_cpu_detect() : 0;
+ if( b_error )
+ {
+ char *buf = strdup(value);
+ char *tok, UNUSED *saveptr, *init;
+ b_error = 0;
+ p->cpu = 0;
+ for( init=buf; (tok=strtok_r(init, ",", &saveptr)); init=NULL )
+ {
+ for( i=0; 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 );
+ }
+ }
OPT("threads")
{
if( !strcmp(value, "auto") )
else
p->i_threads = atoi(value);
}
- OPT("level")
+ OPT2("deterministic", "n-deterministic")
+ p->b_deterministic = atobool(value);
+ OPT2("level", "level-idc")
{
if( atof(value) < 6 )
p->i_level_idc = (int)(10*atof(value)+.5);
}
OPT("overscan")
b_error |= parse_enum( value, x264_overscan_names, &p->vui.i_overscan );
- OPT("vidformat")
+ 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("colourprim")
+ 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("colourmatrix")
+ OPT("colormatrix")
b_error |= parse_enum( value, x264_colmatrix_names, &p->vui.i_colmatrix );
OPT("chromaloc")
{
}
OPT("fps")
{
- float fps;
if( sscanf( value, "%d/%d", &p->i_fps_num, &p->i_fps_den ) == 2 )
;
- else if( sscanf( value, "%f", &fps ) )
+ else
{
+ float fps = atof(value);
p->i_fps_num = (int)(fps * 1000 + .5);
p->i_fps_den = 1000;
}
- else
- b_error = 1;
}
- OPT("ref")
+ OPT2("ref", "frameref")
p->i_frame_reference = atoi(value);
OPT("keyint")
{
if( p->i_keyint_min > p->i_keyint_max )
p->i_keyint_min = p->i_keyint_max;
}
- OPT("min-keyint")
+ 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 = atoi(value);
+ {
+ p->i_scenecut_threshold = atobool(value);
+ if( b_error || p->i_scenecut_threshold )
+ {
+ b_error = 0;
+ p->i_scenecut_threshold = atoi(value);
+ }
+ }
OPT("bframes")
p->i_bframe = atoi(value);
OPT("b-adapt")
- p->b_bframe_adaptive = atobool(value);
+ {
+ 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")
p->b_bframe_pyramid = atobool(value);
OPT("nf")
- p->b_deblocking_filter = 0;
- OPT("filter")
+ p->b_deblocking_filter = !atobool(value);
+ OPT2("filter", "deblock")
{
- int count;
- if( 0 < (count = sscanf( value, "%d:%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta )) ||
- 0 < (count = sscanf( value, "%d,%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta )) )
+ 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;
- if( count == 1 )
- p->i_deblocking_filter_beta = p->i_deblocking_filter_alphac0;
+ p->i_deblocking_filter_beta = p->i_deblocking_filter_alphac0;
}
else
p->b_deblocking_filter = atobool(value);
p->b_cabac = atobool(value);
OPT("cabac-idc")
p->i_cabac_init_idc = atoi(value);
+ OPT("interlaced")
+ p->b_interlaced = atobool(value);
OPT("cqm")
{
if( strstr( value, "flat" ) )
else if( strstr( value, "jvt" ) )
p->i_cqm_preset = X264_CQM_JVT;
else
- b_error = 1;
+ p->psz_cqm_file = strdup(value);
}
OPT("cqmfile")
p->psz_cqm_file = strdup(value);
}
OPT("log")
p->i_log_level = atoi(value);
- OPT("analyse")
+#ifdef VISUALIZE
+ OPT("visualize")
+ p->b_visualize = atobool(value);
+#endif
+ OPT("dump-yuv")
+ p->psz_dump_yuv = strdup(value);
+ OPT2("analyse", "partitions")
{
p->analyse.inter = 0;
if( strstr( value, "none" ) ) p->analyse.inter = 0;
}
OPT("8x8dct")
p->analyse.b_transform_8x8 = atobool(value);
- OPT("weightb")
+ OPT2("weightb", "weight-b")
p->analyse.b_weighted_bipred = atobool(value);
- OPT("direct")
+ 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 );
- OPT("merange")
+ OPT2("merange", "me-range")
p->analyse.i_me_range = atoi(value);
- OPT("mvrange")
+ OPT2("mvrange", "mv-range")
p->analyse.i_mv_range = atoi(value);
- OPT("subme")
+ 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("bime")
- p->analyse.b_bidir_me = atobool(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 ) )
+ { }
+ 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("chroma-me")
p->analyse.b_chroma_me = atobool(value);
- OPT("b-rdo")
- p->analyse.b_bframe_rdo = atobool(value);
OPT("mixed-refs")
p->analyse.b_mixed_references = atobool(value);
OPT("trellis")
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;
}
- OPT("qp")
+ OPT2("qp", "qp_constant")
{
p->rc.i_qp_constant = atoi(value);
p->rc.i_rc_method = X264_RC_CQP;
}
OPT("crf")
{
- p->rc.i_rf_constant = atoi(value);
+ p->rc.f_rf_constant = atof(value);
p->rc.i_rc_method = X264_RC_CRF;
}
- OPT("qpmin")
+ OPT2("qpmin", "qp-min")
p->rc.i_qp_min = atoi(value);
- OPT("qpmax")
+ OPT2("qpmax", "qp-max")
p->rc.i_qp_max = atoi(value);
- OPT("qpstep")
+ 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);
p->rc.i_vbv_buffer_size = atoi(value);
OPT("vbv-init")
p->rc.f_vbv_buffer_init = atof(value);
- OPT("ipratio")
+ OPT2("ipratio", "ip-factor")
p->rc.f_ip_factor = atof(value);
- OPT("pbratio")
+ 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 i = x264_clip3( atoi(value), 0, 3 );
p->rc.psz_stat_in = strdup(value);
p->rc.psz_stat_out = strdup(value);
}
- OPT("rceq")
- p->rc.psz_rc_eq = strdup(value);
OPT("qcomp")
p->rc.f_qcompress = atof(value);
OPT("qblur")
p->rc.f_qblur = atof(value);
- OPT("cplxblur")
+ OPT2("cplxblur", "cplx-blur")
p->rc.f_complexity_blur = atof(value);
OPT("zones")
p->rc.psz_zones = strdup(value);
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);
else
return 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 ? X264_PARAM_BAD_VALUE : 0;
}
pic->i_type = X264_TYPE_AUTO;
pic->i_qpplus1 = 0;
pic->img.i_csp = i_csp;
- switch( i_csp & X264_CSP_MASK )
- {
- case X264_CSP_I420:
- case X264_CSP_YV12:
- pic->img.i_plane = 3;
- pic->img.plane[0] = x264_malloc( 3 * i_width * i_height / 2 );
- pic->img.plane[1] = pic->img.plane[0] + i_width * i_height;
- pic->img.plane[2] = pic->img.plane[1] + i_width * i_height / 4;
- pic->img.i_stride[0] = i_width;
- pic->img.i_stride[1] = i_width / 2;
- pic->img.i_stride[2] = i_width / 2;
- break;
-
- case X264_CSP_I422:
- pic->img.i_plane = 3;
- pic->img.plane[0] = x264_malloc( 2 * i_width * i_height );
- pic->img.plane[1] = pic->img.plane[0] + i_width * i_height;
- pic->img.plane[2] = pic->img.plane[1] + i_width * i_height / 2;
- pic->img.i_stride[0] = i_width;
- pic->img.i_stride[1] = i_width / 2;
- pic->img.i_stride[2] = i_width / 2;
- break;
-
- case X264_CSP_I444:
- pic->img.i_plane = 3;
- pic->img.plane[0] = x264_malloc( 3 * i_width * i_height );
- pic->img.plane[1] = pic->img.plane[0] + i_width * i_height;
- pic->img.plane[2] = pic->img.plane[1] + i_width * i_height;
- pic->img.i_stride[0] = i_width;
- pic->img.i_stride[1] = i_width;
- pic->img.i_stride[2] = i_width;
- break;
-
- case X264_CSP_YUYV:
- pic->img.i_plane = 1;
- pic->img.plane[0] = x264_malloc( 2 * i_width * i_height );
- pic->img.i_stride[0] = 2 * i_width;
- break;
-
- case X264_CSP_RGB:
- case X264_CSP_BGR:
- pic->img.i_plane = 1;
- pic->img.plane[0] = x264_malloc( 3 * i_width * i_height );
- pic->img.i_stride[0] = 3 * i_width;
- break;
-
- case X264_CSP_BGRA:
- pic->img.i_plane = 1;
- pic->img.plane[0] = x264_malloc( 4 * i_width * i_height );
- pic->img.i_stride[0] = 4 * i_width;
- break;
-
- default:
- fprintf( stderr, "invalid CSP\n" );
- pic->img.i_plane = 0;
- break;
- }
+ pic->img.i_plane = 3;
+ pic->img.plane[0] = x264_malloc( 3 * i_width * i_height / 2 );
+ pic->img.plane[1] = pic->img.plane[0] + i_width * i_height;
+ pic->img.plane[2] = pic->img.plane[1] + i_width * i_height / 4;
+ pic->img.i_stride[0] = i_width;
+ pic->img.i_stride[1] = i_width / 2;
+ pic->img.i_stride[2] = i_width / 2;
}
/****************************************************************************
uint8_t *dst = p_data;
uint8_t *src = nal->p_payload;
uint8_t *end = &nal->p_payload[nal->i_payload];
-
int i_count = 0;
/* FIXME this code doesn't check overflow */
i_count = 0;
}
if( *src == 0 )
- {
i_count++;
- }
else
- {
i_count = 0;
- }
*dst++ = *src++;
}
*pi_data = dst - (uint8_t*)p_data;
return *pi_data;
}
-/****************************************************************************
- * x264_nal_decode:
- ****************************************************************************/
-int x264_nal_decode( x264_nal_t *nal, void *p_data, int i_data )
-{
- uint8_t *src = p_data;
- uint8_t *end = &src[i_data];
- uint8_t *dst = nal->p_payload;
-
- nal->i_type = src[0]&0x1f;
- nal->i_ref_idc = (src[0] >> 5)&0x03;
-
- src++;
-
- while( src < end )
- {
- if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 && src[2] == 0x03 )
- {
- *dst++ = 0x00;
- *dst++ = 0x00;
-
- src += 3;
- continue;
- }
- *dst++ = *src++;
- }
-
- nal->i_payload = dst - (uint8_t*)p_data;
- return 0;
-}
-
/****************************************************************************
buf = (uint8_t *) malloc( i_size + 15 + sizeof( void ** ) +
sizeof( int ) );
align_buf = buf + 15 + sizeof( void ** ) + sizeof( int );
- align_buf -= (long) align_buf & 15;
+ align_buf -= (intptr_t) align_buf & 15;
*( (void **) ( align_buf - sizeof( void ** ) ) ) = buf;
*( (int *) ( align_buf - sizeof( void ** ) - sizeof( int ) ) ) = i_size;
return align_buf;
uint8_t * p_new;
if( p )
{
- i_old_size = *( (int*) ( (uint8_t*) p ) - sizeof( void ** ) -
- sizeof( int ) );
+ i_old_size = *( (int*) ( (uint8_t*) p - sizeof( void ** ) -
+ sizeof( int ) ) );
}
p_new = x264_malloc( i_size );
if( i_old_size > 0 && i_size > 0 )
****************************************************************************/
char *x264_param2string( x264_param_t *p, int b_res )
{
- char *buf = x264_malloc( 1000 );
- char *s = buf;
+ int len = 1000;
+ char *buf, *s;
+ if( p->rc.psz_zones )
+ len += strlen(p->rc.psz_zones);
+ buf = s = x264_malloc( len );
if( b_res )
{
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, " brdo=%d", p->analyse.b_bframe_rdo );
+ s += sprintf( s, " psy_rd=%.1f:%.1f", 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, " chroma_qp_offset=%d", p->analyse.i_chroma_qp_offset );
- s += sprintf( s, " slices=%d", p->i_threads );
+ s += sprintf( s, " threads=%d", p->i_threads );
s += sprintf( s, " nr=%d", p->analyse.i_noise_reduction );
s += sprintf( s, " decimate=%d", p->analyse.b_dct_decimate );
+ s += sprintf( s, " mbaff=%d", p->b_interlaced );
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 wpredb=%d bime=%d",
- p->b_bframe_pyramid, p->b_bframe_adaptive, p->i_bframe_bias,
- p->analyse.i_direct_mv_pred, p->analyse.b_weighted_bipred,
- p->analyse.b_bidir_me );
+ s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d wpredb=%d",
+ p->b_bframe_pyramid, p->i_bframe_adaptive, p->i_bframe_bias,
+ p->analyse.i_direct_mv_pred, p->analyse.b_weighted_bipred );
}
s += sprintf( s, " keyint=%d keyint_min=%d scenecut=%d",
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=%d", p->rc.i_rf_constant );
+ 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, " rceq='%s' qcomp=%.2f qpmin=%d qpmax=%d qpstep=%d",
- p->rc.psz_rc_eq, p->rc.f_qcompress,
- p->rc.i_qp_min, p->rc.i_qp_max, p->rc.i_qp_step );
+ 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 );
s += sprintf( s, " ip_ratio=%.2f", p->rc.f_ip_factor );
if( p->i_bframe )
s += sprintf( s, " pb_ratio=%.2f", p->rc.f_pb_factor );
- if( p->rc.i_zones )
+ 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" );
}