From patchwork Tue Feb 1 10:02:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp475240iov; Tue, 1 Feb 2022 02:03:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2363hKGdkAh3f4VLdgJpzlsiFIhTopu1LCs0QwVFdmKkn14TbnXoeC7X7JHpIFi/Wzle1 X-Received: by 2002:a17:907:3d8e:: with SMTP id he14mr20330231ejc.226.1643709788966; Tue, 01 Feb 2022 02:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643709788; cv=none; d=google.com; s=arc-20160816; b=it+RiSVkCHdcAm1uV1HPAcqDmHG9/LuhZ3NVbSgI4QhHfelGjaTcH6kHsZTFgIBGnk ZG1HyFdtLBa39U9GjgbbZfZNu1ylb5gHCpTdqwo38P35KvpbU3Yq9DyAet5FK5bN6iCZ +KvYGWXMQWONqIj/7JT76pzXoGhNIdBsqfDRPvQGjQjCmJ7yF2vNXTW++9Aq1BLlpBiW nfFOTL69qSlkPJYXiYAvEfr8QTQyhMw4OZJgcRxTjBnjq/7XHCPqQ0+MoSuBAtIYOO8U 3jBLFxAKWsEqFdr5jNQtc97E2xUGZxWUBRr+RvCt3D55fiblMXxkT2MBHsE+K/SwVihF 88zA== 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=H/Mj29kUT2U0rXLiKIagQw08nrS3kRupdT0+33bSl3I=; b=U9X0Lyh0U/81gwjioJr6zm7M6B9fhFvqCjDbDUJnfFKBPFJwtlhCZ3jrQJzELD1PUO LQqGb4FNN0Bn4jvrU5Jo/255z5SYEFBrXTzzkPo4clM1Es6iiigeKLHQbA1CMTJdpr81 OlM1pBBVfbhwh7LD8u/umbh91m+ne6k9vhSP5KPKR5cs0gbQouv2T+MTkLbH41T0z8KH 6T+pRb8J67DzwK6Q2vkqwgODe7W8tzecRpQpiO9oli2ljWPCB4x3pekNWyZ66e7evCDm jYjA+BH5dtYiYKH1+bVCZpaVzfb9SJR2zScJbxf8mwA6u8DMaUykfBb6eLYswh2CmS5K AwTg== 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 n21si8920709edy.26.2022.02.01.02.03.08; Tue, 01 Feb 2022 02:03:08 -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 887D768B1F4; Tue, 1 Feb 2022 12:02:40 +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 A395D68B0D2 for ; Tue, 1 Feb 2022 12:02:31 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E50972404FE 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 HqyzCWD4YNcs 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 33E5E24017C for ; Tue, 1 Feb 2022 11:02:29 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 61C9A3A06CD; Tue, 1 Feb 2022 11:02:29 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 11:02:26 +0100 Message-Id: <20220201100227.18928-3-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 3/4] lavu/pixfmt: deprecate AV_PIX_FMT_XVMC 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: 7dwRWEViEbKG It is no longer used for anything. --- libavutil/pixdesc.c | 2 ++ libavutil/pixfmt.h | 2 ++ libavutil/version.h | 1 + 3 files changed, 5 insertions(+) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 727d7540b3..6e57a82cb6 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -432,10 +432,12 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, +#if FF_API_XVMC [AV_PIX_FMT_XVMC] = { .name = "xvmc", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, +#endif [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 66913f606b..2d3927cc3f 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -260,7 +260,9 @@ enum AVPixelFormat { AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian +#if FF_API_XVMC AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing +#endif AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian diff --git a/libavutil/version.h b/libavutil/version.h index 331b8f6ea9..6f6e873a92 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -110,6 +110,7 @@ #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) /** * @}