mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-27 02:47:31 +09:00
[ffvpx] Update ffvp9/ffvp8 to 3.4.2-release
Structure of code was slightly modified so that it should be no longer necessary to re-generate the config_*.h files, greatly simplifying the resync process in the future.
This commit is contained in:
trav90
Roy Tam
parent
705e180aea
commit
d1361d3c21
183 changed files with 17773 additions and 28489 deletions
|
|
@ -74,6 +74,7 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den
|
|||
case AV_OPT_TYPE_CHANNEL_LAYOUT:
|
||||
case AV_OPT_TYPE_DURATION:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
*intnum = *(int64_t *)dst;
|
||||
return 0;
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
|
|
@ -96,8 +97,8 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den
|
|||
static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum)
|
||||
{
|
||||
if (o->type != AV_OPT_TYPE_FLAGS &&
|
||||
(o->max * den < num * intnum || o->min * den > num * intnum)) {
|
||||
num = den ? num * intnum / den : (num * intnum ? INFINITY : NAN);
|
||||
(!den || o->max * den < num * intnum || o->min * den > num * intnum)) {
|
||||
num = den ? num * intnum / den : (num && intnum ? INFINITY : NAN);
|
||||
av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n",
|
||||
num, o->name, o->min, o->max);
|
||||
return AVERROR(ERANGE);
|
||||
|
|
@ -126,9 +127,27 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
|
|||
break;
|
||||
case AV_OPT_TYPE_DURATION:
|
||||
case AV_OPT_TYPE_CHANNEL_LAYOUT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
*(int64_t *)dst = llrint(num / den) * intnum;
|
||||
break;
|
||||
case AV_OPT_TYPE_INT64:{
|
||||
double d = num / den;
|
||||
if (intnum == 1 && d == (double)INT64_MAX) {
|
||||
*(int64_t *)dst = INT64_MAX;
|
||||
} else
|
||||
*(int64_t *)dst = llrint(d) * intnum;
|
||||
break;}
|
||||
case AV_OPT_TYPE_UINT64:{
|
||||
double d = num / den;
|
||||
// We must special case uint64_t here as llrint() does not support values
|
||||
// outside the int64_t range and there is no portable function which does
|
||||
// "INT64_MAX + 1ULL" is used as it is representable exactly as IEEE double
|
||||
// while INT64_MAX is not
|
||||
if (intnum == 1 && d == (double)UINT64_MAX) {
|
||||
*(uint64_t *)dst = UINT64_MAX;
|
||||
} else if (d > INT64_MAX + 1ULL) {
|
||||
*(uint64_t *)dst = (llrint(d - (INT64_MAX + 1ULL)) + (INT64_MAX + 1ULL))*intnum;
|
||||
} else {
|
||||
*(uint64_t *)dst = llrint(d) * intnum;
|
||||
}
|
||||
break;}
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
*(float *)dst = num * intnum / den;
|
||||
break;
|
||||
|
|
@ -200,6 +219,7 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d
|
|||
}
|
||||
|
||||
#define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \
|
||||
opt->type == AV_OPT_TYPE_UINT64 || \
|
||||
opt->type == AV_OPT_TYPE_CONST || \
|
||||
opt->type == AV_OPT_TYPE_FLAGS || \
|
||||
opt->type == AV_OPT_TYPE_INT) \
|
||||
|
|
@ -291,8 +311,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
|
|||
if (!i || !*val)
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int set_string_image_size(void *obj, const AVOption *o, const char *val, int *dst)
|
||||
|
|
@ -456,6 +474,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
|
|||
case AV_OPT_TYPE_FLAGS:
|
||||
case AV_OPT_TYPE_INT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
case AV_OPT_TYPE_DOUBLE:
|
||||
case AV_OPT_TYPE_RATIONAL:
|
||||
|
|
@ -756,6 +775,9 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val)
|
|||
case AV_OPT_TYPE_INT64:
|
||||
ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t *)dst);
|
||||
break;
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
ret = snprintf(buf, sizeof(buf), "%"PRIu64, *(uint64_t *)dst);
|
||||
break;
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
ret = snprintf(buf, sizeof(buf), "%f", *(float *)dst);
|
||||
break;
|
||||
|
|
@ -1104,6 +1126,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
|
|||
case AV_OPT_TYPE_INT64:
|
||||
av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "<int64>");
|
||||
break;
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "<uint64>");
|
||||
break;
|
||||
case AV_OPT_TYPE_DOUBLE:
|
||||
av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "<double>");
|
||||
break;
|
||||
|
|
@ -1164,6 +1189,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
|
|||
switch (opt->type) {
|
||||
case AV_OPT_TYPE_INT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
case AV_OPT_TYPE_DOUBLE:
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
case AV_OPT_TYPE_RATIONAL:
|
||||
|
|
@ -1208,6 +1234,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
|
|||
break;
|
||||
}
|
||||
case AV_OPT_TYPE_INT:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
case AV_OPT_TYPE_INT64: {
|
||||
const char *def_const = get_opt_const_name(obj, opt->unit, opt->default_val.i64);
|
||||
if (def_const)
|
||||
|
|
@ -1286,6 +1313,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags)
|
|||
case AV_OPT_TYPE_FLAGS:
|
||||
case AV_OPT_TYPE_INT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
case AV_OPT_TYPE_DURATION:
|
||||
case AV_OPT_TYPE_CHANNEL_LAYOUT:
|
||||
case AV_OPT_TYPE_PIXEL_FMT:
|
||||
|
|
@ -1646,6 +1674,7 @@ static int opt_size(enum AVOptionType type)
|
|||
case AV_OPT_TYPE_DURATION:
|
||||
case AV_OPT_TYPE_CHANNEL_LAYOUT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
return sizeof(int64_t);
|
||||
case AV_OPT_TYPE_DOUBLE:
|
||||
return sizeof(double);
|
||||
|
|
@ -1775,6 +1804,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch
|
|||
case AV_OPT_TYPE_BOOL:
|
||||
case AV_OPT_TYPE_INT:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
case AV_OPT_TYPE_PIXEL_FMT:
|
||||
case AV_OPT_TYPE_SAMPLE_FMT:
|
||||
case AV_OPT_TYPE_FLOAT:
|
||||
|
|
@ -1864,6 +1894,7 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o)
|
|||
case AV_OPT_TYPE_CHANNEL_LAYOUT:
|
||||
case AV_OPT_TYPE_DURATION:
|
||||
case AV_OPT_TYPE_INT64:
|
||||
case AV_OPT_TYPE_UINT64:
|
||||
read_number(o, dst, NULL, NULL, &i64);
|
||||
return o->default_val.i64 == i64;
|
||||
case AV_OPT_TYPE_STRING:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue