From patchwork Tue Feb 1 10:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp475135iov; Tue, 1 Feb 2022 02:02:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRdHdq/DUUcznjzWHmi+SpK172y4hh1juGi2NOp9yABk9KlaILOuIsxhN4zZCD46LcZ4zr X-Received: by 2002:a17:907:1626:: with SMTP id hb38mr20269176ejc.306.1643709776807; Tue, 01 Feb 2022 02:02:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643709776; cv=none; d=google.com; s=arc-20160816; b=09lgQz1N3bCGleJWl/qmWI13h8BMzWbnY3l04qH+N69JBsE/byEVZP+fiHCe6Ndcsn fvjUzjnlxleCH6Sr6o7Tj1sP4o5RNR3Sqa94rbk8iNIwvHH3y7b1pn6AdDBKy4dElm7d MpuxOGQt4nnYKFz/a7S+QEMN9xNeXN/Yq25EgiwJ6HTlfbJ6LJ6MhvfJ860rM9PXylTC cQgQS4uEBxr3uAQipEqtYGqvZhRrByZKjLQjvq/3K3J0xm6KHJTGXnGELrfw7zFiREfC HjTDg+PVTxOyUwVY6E0m7xm476ZQvhhoV6LDDyZ/EN4r47wbVrZgN8wBIh0SiLsB+y5/ yPCw== 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:delivered-to; bh=/O3xvICcLWcl+MfxKHtOnrPgqZORD/Iubqskxo6DUNY=; b=0N/RN/aADnlgaNhNw4v2uGcgDCQthOCtsXg5sqnrvRlBJBEeNRGQsMDGCY50+ZkeNV TkdtQjhrfJUdWQzcPtMReFIiSFeOBXAKfv6N92JUty4ljIJRlLWfCpkGltQBwbxxeK6e oYKc+4Csb6+b4+AZdOVwDT0ukWdWayH2w86/SXJGHLLIKEXwDsBn/TDb3kM58m7Ex65i I/a0vV2GPSMZ+kYj/KXe6o97iAPf9Tf+NoTH54oVyX7MBmxIUkN523piImIjp7/GCWLc q7R5boPBkDeRrznwToMYlckcBCXq8yTKbygIiaYaHWtqu8Cs65czgBc/tDby7LV8FyNj zGWQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x1si10322415edd.507.2022.02.01.02.02.56; Tue, 01 Feb 2022 02:02:56 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8582468B211; Tue, 1 Feb 2022 12:02:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE29968B0D2 for ; Tue, 1 Feb 2022 12:02:30 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3F2EB240179 for ; Tue, 1 Feb 2022 11:02:30 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id nP2g9nkDteAo for ; Tue, 1 Feb 2022 11:02:29 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3864B2404FE for ; Tue, 1 Feb 2022 11:02:29 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 677C33A0703; Tue, 1 Feb 2022 11:02:29 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 11:02:27 +0100 Message-Id: <20220201100227.18928-4-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201100227.18928-1-anton@khirnov.net> References: <20220201100227.18928-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc: deprecate FF_IDCT_NONE 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: jk/+lKM/shBL It was only used by XvMC. --- libavcodec/avcodec.h | 5 ++++- libavcodec/idctdsp.c | 1 - libavcodec/version.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index acb7ae0e14..5362446092 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1407,7 +1407,10 @@ typedef struct AVCodecContext { #define FF_IDCT_SIMPLEARMV6 17 #define FF_IDCT_FAAN 20 #define FF_IDCT_SIMPLENEON 22 -#define FF_IDCT_NONE 24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */ +#if FF_API_IDCT_NONE +// formerly used by xvmc +#define FF_IDCT_NONE 24 +#endif #define FF_IDCT_SIMPLEAUTO 128 /** diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 71bd03c606..79e7f87443 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -287,7 +287,6 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->perm_type = FF_IDCT_PERM_NONE; #endif /* CONFIG_FAANIDCT */ } else { // accurate/default - /* Be sure FF_IDCT_NONE will select this one, since it uses FF_IDCT_PERM_NONE */ c->idct_put = ff_simple_idct_put_int16_8bit; c->idct_add = ff_simple_idct_add_int16_8bit; c->idct = ff_simple_idct_int16_8bit; diff --git a/libavcodec/version.h b/libavcodec/version.h index a46fb05f1a..b2c57360cf 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -64,5 +64,6 @@ #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_MJPEG_PRED (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) #endif /* AVCODEC_VERSION_H */