Commit db0d4177 authored by Anton Mitrofanov's avatar Anton Mitrofanov Committed by Anton Mitrofanov

Rename function x264_strdup to x264_param_strdup

parent 45e2f899
Pipeline #20125 passed with stages
in 9 minutes and 46 seconds
......@@ -199,7 +199,7 @@ error:
}
/****************************************************************************
* x264_strdup:
* x264_param_strdup:
****************************************************************************/
typedef struct {
int size;
......@@ -210,7 +210,7 @@ typedef struct {
#define BUFFER_OFFSET offsetof(strdup_buffer, ptr)
#define BUFFER_DEFAULT_SIZE 16
char *x264_strdup( x264_param_t *param, const char *src )
char *x264_param_strdup( x264_param_t *param, const char *src )
{
strdup_buffer *buf = param->opaque;
if( !buf )
......@@ -239,7 +239,7 @@ char *x264_strdup( x264_param_t *param, const char *src )
buf->ptr[buf->count++] = res;
return res;
fail:
x264_log_internal( X264_LOG_ERROR, "strdup failed\n" );
x264_log_internal( X264_LOG_ERROR, "x264_param_strdup failed\n" );
return NULL;
}
......@@ -871,9 +871,9 @@ static double atof_internal( const char *str, int *b_error )
#undef atof
#define atoi(str) atoi_internal( str, &b_error )
#define atof(str) atof_internal( str, &b_error )
#define CHECKED_ERROR_STRDUP( var, param, src )\
#define CHECKED_ERROR_PARAM_STRDUP( var, param, src )\
do {\
var = x264_strdup( param, src );\
var = x264_param_strdup( param, src );\
if( !var )\
{\
b_error = 1;\
......@@ -1133,10 +1133,10 @@ REALIGN_STACK int x264_param_parse( x264_param_t *p, const char *name, const cha
else if( strstr( value, "jvt" ) )
p->i_cqm_preset = X264_CQM_JVT;
else
CHECKED_ERROR_STRDUP( p->psz_cqm_file, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->psz_cqm_file, p, value );
}
OPT("cqmfile")
CHECKED_ERROR_STRDUP( p->psz_cqm_file, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->psz_cqm_file, p, value );
OPT("cqm4")
{
p->i_cqm_preset = X264_CQM_CUSTOM;
......@@ -1200,7 +1200,7 @@ REALIGN_STACK int x264_param_parse( x264_param_t *p, const char *name, const cha
OPT("log")
p->i_log_level = atoi(value);
OPT("dump-yuv")
CHECKED_ERROR_STRDUP( p->psz_dump_yuv, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->psz_dump_yuv, p, value );
OPT2("analyse", "partitions")
{
p->analyse.inter = 0;
......@@ -1316,8 +1316,8 @@ REALIGN_STACK int x264_param_parse( x264_param_t *p, const char *name, const cha
}
OPT("stats")
{
CHECKED_ERROR_STRDUP( p->rc.psz_stat_in, p, value );
CHECKED_ERROR_STRDUP( p->rc.psz_stat_out, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->rc.psz_stat_in, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->rc.psz_stat_out, p, value );
}
OPT("qcomp")
p->rc.f_qcompress = atof(value);
......@@ -1328,7 +1328,7 @@ REALIGN_STACK int x264_param_parse( x264_param_t *p, const char *name, const cha
OPT2("cplxblur", "cplx-blur")
p->rc.f_complexity_blur = atof(value);
OPT("zones")
CHECKED_ERROR_STRDUP( p->rc.psz_zones, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->rc.psz_zones, p, value );
OPT("crop-rect")
b_error |= sscanf( value, "%d,%d,%d,%d", &p->crop_rect.i_left, &p->crop_rect.i_top,
&p->crop_rect.i_right, &p->crop_rect.i_bottom ) != 4;
......@@ -1363,7 +1363,7 @@ REALIGN_STACK int x264_param_parse( x264_param_t *p, const char *name, const cha
OPT("opencl")
p->b_opencl = atobool( value );
OPT("opencl-clbin")
CHECKED_ERROR_STRDUP( p->psz_clbin_file, p, value );
CHECKED_ERROR_PARAM_STRDUP( p->psz_clbin_file, p, value );
OPT("opencl-device")
p->i_opencl_device = atoi( value );
else
......
......@@ -269,9 +269,9 @@ X264_API void x264_free( void * );
/* x264_slurp_file: malloc space for the whole file and read it */
X264_API char *x264_slurp_file( const char *filename );
/* x264_strdup: will do strdup and save returned pointer inside
/* x264_param_strdup: will do strdup and save returned pointer inside
* x264_param_t for later freeing during x264_param_cleanup */
char *x264_strdup( x264_param_t *param, const char *src );
char *x264_param_strdup( x264_param_t *param, const char *src );
/* x264_param2string: return a (malloced) string containing most of
* the encoding options */
......@@ -291,9 +291,9 @@ do {\
CHECKED_MALLOC( var, size );\
memset( var, 0, size );\
} while( 0 )
#define CHECKED_STRDUP( var, param, src )\
#define CHECKED_PARAM_STRDUP( var, param, src )\
do {\
var = x264_strdup( param, src );\
var = x264_param_strdup( param, src );\
if( !var )\
goto fail;\
} while( 0 )
......
......@@ -1464,17 +1464,17 @@ x264_t *x264_encoder_open( x264_param_t *param )
h->param.param_free = NULL;
if( h->param.psz_cqm_file )
CHECKED_STRDUP( h->param.psz_cqm_file, &h->param, h->param.psz_cqm_file );
CHECKED_PARAM_STRDUP( h->param.psz_cqm_file, &h->param, h->param.psz_cqm_file );
if( h->param.psz_dump_yuv )
CHECKED_STRDUP( h->param.psz_dump_yuv, &h->param, h->param.psz_dump_yuv );
CHECKED_PARAM_STRDUP( h->param.psz_dump_yuv, &h->param, h->param.psz_dump_yuv );
if( h->param.rc.psz_stat_out )
CHECKED_STRDUP( h->param.rc.psz_stat_out, &h->param, h->param.rc.psz_stat_out );
CHECKED_PARAM_STRDUP( h->param.rc.psz_stat_out, &h->param, h->param.rc.psz_stat_out );
if( h->param.rc.psz_stat_in )
CHECKED_STRDUP( h->param.rc.psz_stat_in, &h->param, h->param.rc.psz_stat_in );
CHECKED_PARAM_STRDUP( h->param.rc.psz_stat_in, &h->param, h->param.rc.psz_stat_in );
if( h->param.rc.psz_zones )
CHECKED_STRDUP( h->param.rc.psz_zones, &h->param, h->param.rc.psz_zones );
CHECKED_PARAM_STRDUP( h->param.rc.psz_zones, &h->param, h->param.rc.psz_zones );
if( h->param.psz_clbin_file )
CHECKED_STRDUP( h->param.psz_clbin_file, &h->param, h->param.psz_clbin_file );
CHECKED_PARAM_STRDUP( h->param.psz_clbin_file, &h->param, h->param.psz_clbin_file );
if( param->param_free )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment