highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu/opt: get rid of useless read_number() calls

Browse Source 
The option type is known and fixed for all these, so reading the value
directly is simpler and more clear.
This commit is contained in:
Anton Khirnov
2024-02-08 16:16:49 +01:00
parent 1ffa657a03
commit 200f82e3f8
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/opt.c
View File

@@ -313,7 +313,7 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
} }
} }
if (o->type == AV_OPT_TYPE_FLAGS) { if (o->type == AV_OPT_TYPE_FLAGS) {
read_number(o, dst, NULL, NULL, &intnum); intnum = *(unsigned int*)dst;
if (cmd == '+') if (cmd == '+')
d = intnum | (int64_t)d; d = intnum | (int64_t)d;
else if (cmd == '-') else if (cmd == '-')
@@ -2035,8 +2035,7 @@ void av_opt_freep_ranges(AVOptionRanges **rangesp)
int av_opt_is_set_to_default(void *obj, const AVOption *o) int av_opt_is_set_to_default(void *obj, const AVOption *o)
{ {
int64_t i64; int64_t i64;
double d, d2; double d;
float f;
AVRational q; AVRational q;
int ret, w, h; int ret, w, h;
char *str; char *str;
@@ -2081,13 +2080,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
return !strcmp(str, o->default_val.str); return !strcmp(str, o->default_val.str);
case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_DOUBLE:
read_number(o, dst, &d, NULL, NULL); d = *(double *)dst;
return o->default_val.dbl == d; return o->default_val.dbl == d;
case AV_OPT_TYPE_FLOAT: case AV_OPT_TYPE_FLOAT:
read_number(o, dst, &d, NULL, NULL); d = *(float *)dst;
f = o->default_val.dbl; return (float)o->default_val.dbl == d;
d2 = f;
return d2 == d;
case AV_OPT_TYPE_RATIONAL: case AV_OPT_TYPE_RATIONAL:
q = av_d2q(o->default_val.dbl, INT_MAX); q = av_d2q(o->default_val.dbl, INT_MAX);
return !av_cmp_q(*(AVRational*)dst, q); return !av_cmp_q(*(AVRational*)dst, q);