From patchwork Mon Apr 19 14:10:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564663iob; Mon, 19 Apr 2021 07:22:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymSBrtsGvs3TbuHnVr0pkbqjjLUgbTUa5pr3obtB8MKfPML04ZQI4ovYOu863eHNfklxb3 X-Received: by 2002:aa7:da01:: with SMTP id r1mr17555047eds.197.1618842132215; Mon, 19 Apr 2021 07:22:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842132; cv=none; d=google.com; s=arc-20160816; b=fc/aZ4sAvpGcQEnKRTXxZeC8byh4T3KkS+dohlEU+Ncrp+aeOuv823HCRd1X1V47/f 2AlYOfZYo+vQ6E0718FvhefW9L4+5FENmhfMKEXUoQL5F6RBaeWKIzKHoAN5CQR/0ouX 4KXpUDGbggfyD5k9UeCT6SObZyEzkMe3G1fzQG8ejGoug9+OSIbW4yPaNG8ihcGAt07b ppFekfQXQSRVs8iqrMIsW/YMRAWR3trG7bVqCP8E5F8ld6MNsLsuBGPe6T4YIKXxVtig ++8F11tKw0NiFW7/lehkx1iTBvToMhy56qIdjVLdjkYbcRPZhBlIgKiS/8Vl3wG5iP9h 4dhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3ylz5AvGBqNSv3zTvNN12ihlTKZUyZ4jxSDEguDkT+4=; b=hpqz4tyFAyuqVZG8KhlN0cm7ME75bkcgAwE5KeULSWzpN3dpt0nCLoXzZE3zECuNTb YY4golhrI+dKnC8BuDovKm21OX115JSFClJOU/YA1viTL5lHJ1QdSssGhAiHw9sUcYoy QiTe6O7NAqqrBUydEtjqOIhxGPKik06t8GnXCP+siuJHA4RqzJouu8vaH9rMRUlJZYZ9 8yrTJxUcUOuZL1VN1pkPKm+D+/H5el3S7lps5wc1Nnp1D+F4Et+0IZRBVJoLNpnR7fnc cIf4uKb4xTXVeyD7SOeGSGQlZ8OifjbUxV44H3NnG/pvyRQEDUcdo+WRRa2wkEZwB3LF Xhsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SthVjDFy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w19si12659083edt.351.2021.04.19.07.22.11; Mon, 19 Apr 2021 07:22:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SthVjDFy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A2D1689D92; Mon, 19 Apr 2021 17:12:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1F88689D2F for ; Mon, 19 Apr 2021 17:12:29 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id 8so2104270qkv.8 for ; Mon, 19 Apr 2021 07:12:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JI/XetkB6XVwQKayRZhKc5QUYXAM19svEJ7HbYJxPSE=; b=SthVjDFya4JDb6Z6pcHv48etFyIqNoqwYiMencc4JPjZryutcJxhQHnDvsZyxrokSg UWuFvmRhRsgyRLxMZsHRb7W62ytnaQ0yuup0h2bEpcg+R81eiMhloO4z/23+NPhOhT8k FC6AqfGhl+shHwDF13SPPb3kv61pZqcfGCo+Gpn9Ifq1Rq4KfSDk/9r6HA7M6HeAqcdd GCzvI4gB+bo/4/vPJdJMeAK9OFSWvmEeiY5/EMs2sVT/K85CRah5R59HfF5Ye+t3QbZq 4BYGL7effDF2nNGmvR5sy26CAPaPlfIV8RW+m3+Dq6Q3pBE4qWpN92/NApJk8Zj6QgNC rgWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JI/XetkB6XVwQKayRZhKc5QUYXAM19svEJ7HbYJxPSE=; b=cs7Xntd7Df/2f2mPbvVY//K3NFHkjlXUXgCYl/HdYmmmnt8wbqnmtjeCGDLFTf4evK Rn4yqwtt4X5KkcOXOKkmqMVeRCVJ/fzOybYw4b/wPU2qebdJNWojlXv5IPyuOIH7KB6a xfXDRr5uKjTDxDueZIzg/K4i4t7hz1sYW7poy2Z8s5Y4hA9FGtqqYo9TRShvrJsgWJGG K4MGvIIMnz5y8BzBgmmiZoTk0aVz9/3OoRb1Wl3vNK7GQJQlVvkyQib0opfrHcF0SwDv 5pni3JA1kTWMG8DieN0AMoQJPhXV7KFp4pb2Pz2TJisFRcBbi0Wc432GrtUPmqimW3nC Mwiw== X-Gm-Message-State: AOAM530Q+cHLYSGCWvYuLuQ51Su9me7CGIMPVBEcjdknZ9Drzk8de9Q/ d66x3fT9qBR0WhtXiv5MGhlV9D+icgw= X-Received: by 2002:a37:8a01:: with SMTP id m1mr12459858qkd.85.1618841548279; Mon, 19 Apr 2021 07:12:28 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:08 -0300 Message-Id: <20210419141024.8174-72-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 71/87] avutil/cpu: Remove deprecated functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: s/qkahnCXnMQ From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavutil/cpu.c | 92 --------------------------------------------- libavutil/cpu.h | 24 ------------ libavutil/version.h | 3 -- 3 files changed, 119 deletions(-) diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 1215394620..8960415d00 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -102,98 +102,6 @@ int av_get_cpu_flags(void) 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) { static const AVOption cpuflags_opts[] = { diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 18dfa492ef..b555422dae 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -23,9 +23,6 @@ #include -#include "attributes.h" -#include "version.h" - #define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */ /* lower 16 bits - CPU features */ @@ -89,27 +86,6 @@ int av_get_cpu_flags(void); */ 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. * diff --git a/libavutil/version.h b/libavutil/version.h index 310145e350..b61467ed9d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -108,9 +108,6 @@ #ifndef FF_API_CHILD_CLASS_NEXT #define FF_API_CHILD_CLASS_NEXT (LIBAVUTIL_VERSION_MAJOR < 57) #endif -#ifndef FF_API_CPU_FLAGS -#define FF_API_CPU_FLAGS (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_D2STR #define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) #endif