From patchwork Mon Apr 19 14:09:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563069iob; Mon, 19 Apr 2021 07:20:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNrBrax8iVECuAux5jMmcU/UFQYGPiEosPhiDJbIQMG+yx0aRAfpCIwXEeD1lRD90yp1W4 X-Received: by 2002:aa7:d046:: with SMTP id n6mr25319202edo.357.1618842024151; Mon, 19 Apr 2021 07:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842024; cv=none; d=google.com; s=arc-20160816; b=K+FcI3youwVBenQSk394OZ4oRQdqnz+Rtki+poSJeanhCVfsv20zi/NLe1J/BSbRMG rZElqVc9G8o68ASGpXegZzzu7s8CwhsCYOm08sStHfp8/4FM4cKuVWTU8J2di5XnAZTS /LnUHfijk6UOy4W2906llXZyS0EfS8stmBk90FK6l6O0qaa1pNymgs1IqcFwkUsFJ6kR jSJmzrV6HFVQ/H3D7w0U3iVCzhk1SLSzwTNAbl7WpL7+CIOuicYRWxvPj0GIQkWCJOCh sqoN3HwGcWq5WfJLvTtbg4wAq5Am9xRf3XjtEuZRmm+XkL4gZokblRXj3oGwL0BoSINA J8yQ== 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=CcGp9/n1QwFt8QD0fPlxvfqPW0KKqnh6zlwz6T91j9I=; b=TZAj/REBsKMXkQ6JmwKgelEWP53PNiYm8LVY6ID3aAiSNskE0ScUMP+wxvTNTTmguk IL/ZB1yZSf711Lm50Jtq17L3RUWaoq30hUghAmsB9OqGT+V/hUhy3L8E6nE5JgIfbFwX KSrEFVmf+QkzxP44IhSIRjj7E70k/z3Z6OYDcg+rIy/NkRZ40RgWMPJd1jgdwPfSMj1U W2zAonww578x6ZfE96+3evUwOOcof2Fbg2e9Z+I18xZFc59Bp0NU3S+RwaWrUGn1IU72 lKci6Xs7YdYQgXN9ylgACfu1GLVUJ0+fDYhuKWLHTZ14J6WoySEgwI5brKxgrb77fR6s Fwpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lYes5PU8; 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 h1si8086139ede.545.2021.04.19.07.20.23; Mon, 19 Apr 2021 07:20:24 -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=lYes5PU8; 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 40B9A689B43; Mon, 19 Apr 2021 17:12:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E70F7689A29 for ; Mon, 19 Apr 2021 17:12:16 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id gv2so7618524qvb.8 for ; Mon, 19 Apr 2021 07:12:16 -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=3VWufqTQCisielmGnVWCDiFQ3kI1f9wYte2OFFlgttg=; b=lYes5PU8Uebrt99OKqTzjo+o6u5ZyLI5YidMjd0Iir+Dr4c+7mDbdRaX/0OEjWRgkM sRz3OhNa3I9o2RPfeFkroRcXmCX8HmpIf/kFtn8lITW9M2GrkSefYZF0A+2TOjWfslwk wWVhfs1wrHHdyQIJX8/AmrG7KjOEh/GpQ2HNw0Zv74fO3TnqrBL1/50/XNQRPbpUGcyt gu70A4iTqKdH+QD80KEpOCagFY430/UBzNQiE3RJDi5yceFk5LaaqG0yFwzz4UXO6lOZ eTrPgxDo71pKH5gXw8RRv6CmrWv00E277aM9LNoyjm0KqLZdAeTBgCq//cC+KGhnGkIK ZGVQ== 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=3VWufqTQCisielmGnVWCDiFQ3kI1f9wYte2OFFlgttg=; b=beSaNHgV4orlO3hQ0bAx5BHUmHAPVvGTzwhF5AMXUaMU8vHNVLsxiRGpXrvZsBaEDD hnBfLuAZJ3Dd8HDGq4L3u/l1gMDFAQt0m3nKD6LPM83YN8vCyfh+CU9Ym65Dv7fZ4Eum c7HzOLMKPLk1iMs8fZWGiJkRdJV5JCozT/HAclnqMdMozNPc2e7LAj7uFJ47RkHhq83Q Xh9memVylMyu300Bi6nKyJWivPROHJcemHOy0Ou3EeVWh+BGWjXNjW0AF3g/rnol5efi CesRfqzC4yJPMVfwmRgY2LxLazZCAE0GJE2DOx/frnw4BSC83YjnFAZvwuyrdRUS7L44 5uWA== X-Gm-Message-State: AOAM532OhqZzNKd6BdztC1oY7ksTRHBICNlnd9VeAhCDNI5jlT/DMZDi pTBL0Pcn9nElAK0WskIMbcJhVmAWXdM= X-Received: by 2002:ad4:4ee8:: with SMTP id dv8mr2749022qvb.46.1618841535618; Mon, 19 Apr 2021 07:12:15 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:59 -0300 Message-Id: <20210419141024.8174-63-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 62/87] avutil/pixfmt: Remove deprecated VAAPI pixel formats 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: LB29u1RqargA From: Andreas Rheinhardt Deprecated in 9f8e57efe4400ca86352277873792792279c3b15. Signed-off-by: Andreas Rheinhardt --- libavutil/pixdesc.c | 25 ------------------------- libavutil/pixfmt.h | 10 ---------- libavutil/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 18c7a0efc8..a4ab93c975 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1329,33 +1329,12 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_RGB, }, -#if FF_API_VAAPI - [AV_PIX_FMT_VAAPI_MOCO] = { - .name = "vaapi_moco", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VAAPI_IDCT] = { - .name = "vaapi_idct", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VAAPI_VLD] = { - .name = "vaapi_vld", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, -#else [AV_PIX_FMT_VAAPI] = { .name = "vaapi", .log2_chroma_w = 1, .log2_chroma_h = 1, .flags = AV_PIX_FMT_FLAG_HWACCEL, }, -#endif [AV_PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", .nb_components = 3, @@ -2515,10 +2494,6 @@ enum AVPixelFormat av_get_pix_fmt(const char *name) pix_fmt = get_pix_fmt_internal(name2); } -#if FF_API_VAAPI - if (pix_fmt == AV_PIX_FMT_NONE && !strcmp(name, "vaapi")) - pix_fmt = AV_PIX_FMT_VAAPI; -#endif return pix_fmt; } diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 46ef211add..30591133a4 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -112,21 +112,11 @@ enum AVPixelFormat { AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), big-endian , X=unused/undefined AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined -#if FF_API_VAAPI - /** @name Deprecated pixel formats */ - /**@{*/ - AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers - AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID - /**@}*/ - AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, -#else /** * Hardware acceleration through VA-API, data[3] contains a * VASurfaceID. */ AV_PIX_FMT_VAAPI, -#endif AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian diff --git a/libavutil/version.h b/libavutil/version.h index 658bcd402e..628a40d22b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_VAAPI -#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_FRAME_QP #define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57) #endif