From patchwork Mon Apr 22 21:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 48231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp40574pzb; Mon, 22 Apr 2024 14:41:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVN9huDgvoUaR7unHCtJf7R2em0FFY075qi/dsWBWPwK9ecZKBWy5lxs6pXJWj0lttZaDjZ36nlaKYicxABz3heZUF4GMzN0tL2Xw== X-Google-Smtp-Source: AGHT+IFq9zQAVa/wklIi9ltDcfIJsn/QzlB9MeIH7SKVMTG3qKO7LBh7NLvz1jmuwQFFmYg8/m19 X-Received: by 2002:a17:907:971a:b0:a55:b581:dca8 with SMTP id jg26-20020a170907971a00b00a55b581dca8mr3885067ejc.38.1713822076879; Mon, 22 Apr 2024 14:41:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713822076; cv=none; d=google.com; s=arc-20160816; b=Gu9DI3USxEOkT6TKwzHknCITaEJHcMmj3IWkEG34nOeO9GbLJYdtxpLlQtYY4HNMP0 8kkd4g6jIB1MyZBQwzyaDdN/22Lki5EjSppsTv39nPvjb56mgtR4O59cXp20hJHtitsV J2mHovsE0a9OBnp8GCQfnN5s8nRAypLmHLrKHnFcw5vq9OtKf+TilZlGq5kxb6nxNgnG DYRNdXq5QrmLJ4/hce0kna8Tx3Wail0U51ZhoSAgGD8z0S8GcNvJPP5qDIbVAZvOX0za 64FQBWgxOlXNpyKytWAA/od78HBAzRxpAr7u08XfbiYtUkIjlG94TPUyYUyJhcGyjsdH iRKQ== 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:from:to:content-language:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=/256CKrKY9pbUoQ1pvjThJW4pPawpSMxYooJ0/Rjvz8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=OSK+glkARiGqCAlKAyP9DlCLLb+LLxrLsq82129Pi5gYhGQyCeo69zXp6rfq/pLyej N3mOwdRhL86nbDMo5Pmcv1PRF/O0lmWsvf+hB/6q2Fogl1Vfv60Y6cA8GJ5QB1AB47nA slmBY6GO3BnKycBBBIGm9A2HnjYdOzC+v0A7B9UA98g6RlzNGNhYSX6B+kkcT68rEQcv Z1QxeDvEmAOgP4Dzf3mfD/o6oeFNEBI7SIetMZsqw0IKKBm72vuMBwGuC5JFVDRXWyr5 zWHA18VHx64rfPVDnNGrQMe8b0tHgiK8h9CLpRiCqL+C774hPXH0bIYx288fTajOBxHb Dsdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=qxZ6RXAt; 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 gn22-20020a1709070d1600b00a587d60c0f7si13271ejc.864.2024.04.22.14.41.16; Mon, 22 Apr 2024 14:41:16 -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=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=qxZ6RXAt; 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 8960F68D385; Tue, 23 Apr 2024 00:41:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B03A368D180 for ; Tue, 23 Apr 2024 00:41:06 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-343d2b20c4bso3975164f8f.2 for ; Mon, 22 Apr 2024 14:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1713822066; x=1714426866; darn=ffmpeg.org; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=TB8rTNk3/Q3YS3ahEQKzSyJ2dRAfb45XU49DfWmyhyg=; b=qxZ6RXAt3piwhzuR4eHHVFHcYQ+IUZdkzRdYJsSWzUKEl/iNUBt1UiWGmGxqIWxUHQ 5ZO3xqGEIsEv97J0kyz+AChu7IriSPmq62iDbA83pe1TZc6oAetDCnflAgNZ7hLSh+x3 2koPvrKNr53413AeeI4ewwTgMJOup4qwYu3Pwl3iit1yK4X9C1nmJaxf9iz1gZgpH4mZ 60AoJIGeci0HC8ZmOloQAmEYMLH43KN3Wy4y26dUemGTXlsH+aMWTP119ZVNYNK/UuAU EfMGHJWtf7UeX+DknkV2rXN2CO9dBoJWmjE1/AaPhxEhxBgxGgk3K7LEtST1iF8CXkf2 uijQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713822066; x=1714426866; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TB8rTNk3/Q3YS3ahEQKzSyJ2dRAfb45XU49DfWmyhyg=; b=fM1reBizuH+CCbYwqE0tT5RRuvqidF+MJdbAGn/zU/YZ5NHiunLwb8+1XmSD0Hrqdv M9DSzMzd5SzsW+0kerbjR378ZNPl6OixEcG9fH/Fu98BjPYWLYa7VLaJcDvwjCTxLfka fD+ndxpMf48r0skSVfsybaBHNrCbSCUonpIbALKwC0uhdhTbUY+F6I2B+l3Au7eCxFCJ JEy+Fy8YS0NyVzONfEjf0buBD1erqF8aNDYEKQiJVXgPwwMsyKo22ZN4bDEtuTBs64SM 0V1JA5/LqAVw+wtalboFCDC/HJq/JYtrfRcrqSyM/1N0P8zr71myEJthFDcpUwL7RNdE F42A== X-Gm-Message-State: AOJu0YxMw+btrExVqd2mtf0IPHPWZtkRgZejnvmErJKuIjMlpDlcIBmW xv36ajm6sKA9spMmsd3a/OC5QOy08NHd4wyLCP7DNPyIWCVisb7QOL1nPv522N1Tfrv2MhSTYNR S X-Received: by 2002:adf:ab03:0:b0:341:ddb5:badc with SMTP id q3-20020adfab03000000b00341ddb5badcmr8406246wrc.19.1713822065929; Mon, 22 Apr 2024 14:41:05 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id r26-20020adfa15a000000b0034b6d40ecdbsm141771wrr.48.2024.04.22.14.41.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Apr 2024 14:41:05 -0700 (PDT) Message-ID: Date: Mon, 22 Apr 2024 22:41:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: FFmpeg development discussions and patches From: Mark Thompson Subject: [FFmpeg-devel] [PATCH v3 1/4] lavu: Remove libva 1.x support 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: RthsRyKLRAK1 libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- Rebased. I think we can also drop the other quirks? They are for the proprietary media SDK driver (which I think is dead?) and the VDPAU wrapper (which I don't think was ever updated for libva 2?). libavutil/hwcontext_vaapi.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 56d03aa4cd..84bcb78087 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -372,14 +372,6 @@ static const struct { const char *match_string; unsigned int quirks; } vaapi_driver_quirks_table[] = { -#if !VA_CHECK_VERSION(1, 0, 0) - // The i965 driver did not conform before version 2.0. - { - "Intel i965 (Quick Sync)", - "i965", - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS, - }, -#endif { "Intel iHD", "ubit", @@ -1413,7 +1405,6 @@ fail: } #endif -#if VA_CHECK_VERSION(0, 36, 0) typedef struct VAAPIDRMImageBufferMapping { VAImage image; VABufferInfo buffer_info; @@ -1573,7 +1564,6 @@ fail: av_freep(&mapping); return err; } -#endif static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) @@ -1584,10 +1574,7 @@ static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, if (err != AVERROR(ENOSYS)) return err; #endif -#if VA_CHECK_VERSION(0, 36, 0) return vaapi_map_to_drm_abh(hwfc, dst, src, flags); -#endif - return AVERROR(ENOSYS); } #endif /* CONFIG_LIBDRM */ @@ -1637,7 +1624,6 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) av_freep(&priv); } -#if CONFIG_VAAPI_1 static void vaapi_device_log_error(void *context, const char *message) { AVHWDeviceContext *ctx = context; @@ -1651,7 +1637,6 @@ static void vaapi_device_log_info(void *context, const char *message) av_log(ctx, AV_LOG_VERBOSE, "libva: %s", message); } -#endif static int vaapi_device_connect(AVHWDeviceContext *ctx, VADisplay display) @@ -1660,10 +1645,8 @@ static int vaapi_device_connect(AVHWDeviceContext *ctx, int major, minor; VAStatus vas; -#if CONFIG_VAAPI_1 vaSetErrorCallback(display, &vaapi_device_log_error, ctx); vaSetInfoCallback (display, &vaapi_device_log_info, ctx); -#endif hwctx->display = display; @@ -1907,7 +1890,6 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, ent = av_dict_get(opts, "driver", NULL, 0); if (ent) { -#if VA_CHECK_VERSION(0, 38, 0) VAStatus vas; vas = vaSetDriverName(display, ent->value); if (vas != VA_STATUS_SUCCESS) { @@ -1916,10 +1898,6 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, vaTerminate(display); return AVERROR_EXTERNAL; } -#else - av_log(ctx, AV_LOG_WARNING, "Driver name setting is not " - "supported with this VAAPI version.\n"); -#endif } return vaapi_device_connect(ctx, display);