mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avutil/cpu: Remove deprecated functions
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt
James Almer
parent
ef6a9e5e31
commit
d40bb518b5
@ -102,98 +102,6 @@ int av_get_cpu_flags(void)
|
|||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FF_API_CPU_FLAGS
|
|
||||||
void av_set_cpu_flags_mask(int mask)
|
|
||||||
{
|
|
||||||
atomic_store_explicit(&cpu_flags, get_cpu_flags() & mask,
|
|
||||||
memory_order_relaxed);
|
|
||||||
}
|
|
||||||
|
|
||||||
int av_parse_cpu_flags(const char *s)
|
|
||||||
{
|
|
||||||
#define CPUFLAG_MMXEXT (AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT | AV_CPU_FLAG_CMOV)
|
|
||||||
#define CPUFLAG_3DNOW (AV_CPU_FLAG_3DNOW | AV_CPU_FLAG_MMX)
|
|
||||||
#define CPUFLAG_3DNOWEXT (AV_CPU_FLAG_3DNOWEXT | CPUFLAG_3DNOW)
|
|
||||||
#define CPUFLAG_SSE (AV_CPU_FLAG_SSE | CPUFLAG_MMXEXT)
|
|
||||||
#define CPUFLAG_SSE2 (AV_CPU_FLAG_SSE2 | CPUFLAG_SSE)
|
|
||||||
#define CPUFLAG_SSE2SLOW (AV_CPU_FLAG_SSE2SLOW | CPUFLAG_SSE2)
|
|
||||||
#define CPUFLAG_SSE3 (AV_CPU_FLAG_SSE3 | CPUFLAG_SSE2)
|
|
||||||
#define CPUFLAG_SSE3SLOW (AV_CPU_FLAG_SSE3SLOW | CPUFLAG_SSE3)
|
|
||||||
#define CPUFLAG_SSSE3 (AV_CPU_FLAG_SSSE3 | CPUFLAG_SSE3)
|
|
||||||
#define CPUFLAG_SSE4 (AV_CPU_FLAG_SSE4 | CPUFLAG_SSSE3)
|
|
||||||
#define CPUFLAG_SSE42 (AV_CPU_FLAG_SSE42 | CPUFLAG_SSE4)
|
|
||||||
#define CPUFLAG_AVX (AV_CPU_FLAG_AVX | CPUFLAG_SSE42)
|
|
||||||
#define CPUFLAG_AVXSLOW (AV_CPU_FLAG_AVXSLOW | CPUFLAG_AVX)
|
|
||||||
#define CPUFLAG_XOP (AV_CPU_FLAG_XOP | CPUFLAG_AVX)
|
|
||||||
#define CPUFLAG_FMA3 (AV_CPU_FLAG_FMA3 | CPUFLAG_AVX)
|
|
||||||
#define CPUFLAG_FMA4 (AV_CPU_FLAG_FMA4 | CPUFLAG_AVX)
|
|
||||||
#define CPUFLAG_AVX2 (AV_CPU_FLAG_AVX2 | CPUFLAG_AVX)
|
|
||||||
#define CPUFLAG_BMI2 (AV_CPU_FLAG_BMI2 | AV_CPU_FLAG_BMI1)
|
|
||||||
#define CPUFLAG_AESNI (AV_CPU_FLAG_AESNI | CPUFLAG_SSE42)
|
|
||||||
#define CPUFLAG_AVX512 (AV_CPU_FLAG_AVX512 | CPUFLAG_AVX2)
|
|
||||||
static const AVOption cpuflags_opts[] = {
|
|
||||||
{ "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" },
|
|
||||||
#if ARCH_PPC
|
|
||||||
{ "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ALTIVEC }, .unit = "flags" },
|
|
||||||
#elif ARCH_X86
|
|
||||||
{ "mmx" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_MMX }, .unit = "flags" },
|
|
||||||
{ "mmxext" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_MMXEXT }, .unit = "flags" },
|
|
||||||
{ "sse" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE }, .unit = "flags" },
|
|
||||||
{ "sse2" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE2 }, .unit = "flags" },
|
|
||||||
{ "sse2slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE2SLOW }, .unit = "flags" },
|
|
||||||
{ "sse3" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE3 }, .unit = "flags" },
|
|
||||||
{ "sse3slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE3SLOW }, .unit = "flags" },
|
|
||||||
{ "ssse3" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSSE3 }, .unit = "flags" },
|
|
||||||
{ "atom" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ATOM }, .unit = "flags" },
|
|
||||||
{ "sse4.1" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE4 }, .unit = "flags" },
|
|
||||||
{ "sse4.2" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_SSE42 }, .unit = "flags" },
|
|
||||||
{ "avx" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX }, .unit = "flags" },
|
|
||||||
{ "avxslow" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVXSLOW }, .unit = "flags" },
|
|
||||||
{ "xop" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_XOP }, .unit = "flags" },
|
|
||||||
{ "fma3" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_FMA3 }, .unit = "flags" },
|
|
||||||
{ "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_FMA4 }, .unit = "flags" },
|
|
||||||
{ "avx2" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX2 }, .unit = "flags" },
|
|
||||||
{ "bmi1" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_BMI1 }, .unit = "flags" },
|
|
||||||
{ "bmi2" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_BMI2 }, .unit = "flags" },
|
|
||||||
{ "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOW }, .unit = "flags" },
|
|
||||||
{ "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOWEXT }, .unit = "flags" },
|
|
||||||
{ "cmov", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV }, .unit = "flags" },
|
|
||||||
{ "aesni" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AESNI }, .unit = "flags" },
|
|
||||||
{ "avx512" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX512 }, .unit = "flags" },
|
|
||||||
#elif ARCH_ARM
|
|
||||||
{ "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV5TE }, .unit = "flags" },
|
|
||||||
{ "armv6", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV6 }, .unit = "flags" },
|
|
||||||
{ "armv6t2", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV6T2 }, .unit = "flags" },
|
|
||||||
{ "vfp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP }, .unit = "flags" },
|
|
||||||
{ "vfp_vm", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP_VM }, .unit = "flags" },
|
|
||||||
{ "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFPV3 }, .unit = "flags" },
|
|
||||||
{ "neon", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON }, .unit = "flags" },
|
|
||||||
#elif ARCH_AARCH64
|
|
||||||
{ "armv8", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV8 }, .unit = "flags" },
|
|
||||||
{ "neon", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON }, .unit = "flags" },
|
|
||||||
{ "vfp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP }, .unit = "flags" },
|
|
||||||
#elif ARCH_MIPS
|
|
||||||
{ "mmi", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_MMI }, .unit = "flags" },
|
|
||||||
{ "msa", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_MSA }, .unit = "flags" },
|
|
||||||
#endif
|
|
||||||
{ NULL },
|
|
||||||
};
|
|
||||||
static const AVClass class = {
|
|
||||||
.class_name = "cpuflags",
|
|
||||||
.item_name = av_default_item_name,
|
|
||||||
.option = cpuflags_opts,
|
|
||||||
.version = LIBAVUTIL_VERSION_INT,
|
|
||||||
};
|
|
||||||
|
|
||||||
int flags = 0, ret;
|
|
||||||
const AVClass *pclass = &class;
|
|
||||||
|
|
||||||
if ((ret = av_opt_eval_flags(&pclass, &cpuflags_opts[0], s, &flags)) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
return flags & INT_MAX;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
int av_parse_cpu_caps(unsigned *flags, const char *s)
|
int av_parse_cpu_caps(unsigned *flags, const char *s)
|
||||||
{
|
{
|
||||||
static const AVOption cpuflags_opts[] = {
|
static const AVOption cpuflags_opts[] = {
|
||||||
|
|||||||
@ -23,9 +23,6 @@
|
|||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include "attributes.h"
|
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
|
#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
|
||||||
|
|
||||||
/* lower 16 bits - CPU features */
|
/* lower 16 bits - CPU features */
|
||||||
@ -89,27 +86,6 @@ int av_get_cpu_flags(void);
|
|||||||
*/
|
*/
|
||||||
void av_force_cpu_flags(int flags);
|
void av_force_cpu_flags(int flags);
|
||||||
|
|
||||||
#if FF_API_CPU_FLAGS
|
|
||||||
/**
|
|
||||||
* Set a mask on flags returned by av_get_cpu_flags().
|
|
||||||
* This function is mainly useful for testing.
|
|
||||||
* Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
|
|
||||||
*/
|
|
||||||
attribute_deprecated void av_set_cpu_flags_mask(int mask);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse CPU flags from a string.
|
|
||||||
*
|
|
||||||
* The returned flags contain the specified flags as well as related unspecified flags.
|
|
||||||
*
|
|
||||||
* This function exists only for compatibility with libav.
|
|
||||||
* Please use av_parse_cpu_caps() when possible.
|
|
||||||
* @return a combination of AV_CPU_* flags, negative on error.
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
int av_parse_cpu_flags(const char *s);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
|
* Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
|
||||||
*
|
*
|
||||||
|
|||||||
@ -108,9 +108,6 @@
|
|||||||
#ifndef FF_API_CHILD_CLASS_NEXT
|
#ifndef FF_API_CHILD_CLASS_NEXT
|
||||||
#define FF_API_CHILD_CLASS_NEXT (LIBAVUTIL_VERSION_MAJOR < 57)
|
#define FF_API_CHILD_CLASS_NEXT (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CPU_FLAGS
|
|
||||||
#define FF_API_CPU_FLAGS (LIBAVUTIL_VERSION_MAJOR < 57)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_D2STR
|
#ifndef FF_API_D2STR
|
||||||
#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58)
|
#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user