From patchwork Wed Apr 3 22:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp690786pzb; Wed, 3 Apr 2024 15:08:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU49SkHPggZsw8MznD1eSCaiSHtN4a2QkV574U3pyizoFetpgFeR74Mv/JFdZb7uUmdkuEt9o8MYJ/vLiPzqXrRDizQugZCDqbrwA== X-Google-Smtp-Source: AGHT+IFPlOFfC+SYc82e3V9oloK6BPA/9M/Nn7Oadt5HqeQb1Lc/XoHfGlqJ0nEBZRC1zYKWKBoi X-Received: by 2002:a50:d5da:0:b0:568:3362:ccd1 with SMTP id g26-20020a50d5da000000b005683362ccd1mr617501edj.1.1712182086837; Wed, 03 Apr 2024 15:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712182086; cv=none; d=google.com; s=arc-20160816; b=sCGwFxIP9mo4AlpO2B5YDZofpeaTN4CJMXpzLs839V+Lrv9qTAWd11iPHvqBo0QlYm smDQeShyQbWhtqBYZ9oE505fM9EeFTjhovM0HzLcNXzy3iQUyUHwWa/xoSTuxgBxW32Y pi2tbsOQww5P3hdwo+cLnq9/z/iz98WXhxYxAYrjk1WWn9gPDo/riX/5ekc/92wmJR0T 1ITn3Ou5Ijqb7cZ6fe9I2D2gjjPRg+xmvsWD52mdUJFVxd2BqY9XYWWiiA+CaAde6sg1 xYmz51WjnapnY3yynWn+BeBYucoH8u5x7Agtyz0Pr5y2i4RPViUAkm2IA32evWeq9HOB dxQA== 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=4GLrvc1aCQcisERuk/dMPReeqHKSSNUWZhTWGa0VddA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=L7zjQY236KaX18XYj7FQBC8t1nZHm9nnL6Oj+f7r0JX4zX6M4HVDQ2xhuPXtTafz4L MOZiRxmPchc4ETWlOPldHbFh+AzlP7LODlbRm4RZmEk8zK8mA03F53ov4WN2bG70LOAa PhYXFzuiaXrMUpvGYRslhhhYYjis/E8QrWNQIAYtiBOoJ5LzoeX0/pe/l7RuOPEUTxo/ dcOlx6xU86pog+CFTSQl0EyjN99b5KZYrukuQ33MSzRudCeV5H7n9yyr3Zy9Lb7bV41Q +j+gXA45/fNpPncsuBxolOEQrydfxIrqN0/6nx6gehsbwvpcekw1QPR5UK7ZVrsPS8I4 Rwww==; 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=y3a7weZ4; 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 g14-20020a0564021ece00b0056bad5416c4si7516264edg.72.2024.04.03.15.08.05; Wed, 03 Apr 2024 15:08:06 -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=y3a7weZ4; 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 6C1CB68CF79; Thu, 4 Apr 2024 01:08:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB8B368CEDD for ; Thu, 4 Apr 2024 01:07:55 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-34391544c46so258399f8f.0 for ; Wed, 03 Apr 2024 15:07:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712182075; x=1712786875; 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=VhOcuSsBiEGKRATtbwEF4FdmGXPOF9I4rgoQDFCEYk0=; b=y3a7weZ4YVzrMBTkp227UuwO/oXzAUrXqKhpw8Pjk5B57aVbT2fRi9mnXL6hA7rMRE Wvf23tEf3pGHQ+7EOxxfUIBFkQ9J8GwZQBp6FYULInkM/kkbdFsBNMS7M4hkpjUZkl1j 7GqY2AAU3yXAysQXy0lg25EMvCCqP58okMttM+JVON/2XmmLY7vZvxA1O3CFjw9ltl43 TdZdhRQwDpZoVaOChYJA4WwG9g+UWGJS9cQPUjLXAtcASC733n27P39msfk5PeU2XsHy a7u8GU3TgbVKVWDUUGW4M7L4CsRsVkYop/eDB1/guvASSwfZ7BN8UH0k7RVcFWHCQNHS LpHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712182075; x=1712786875; 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=VhOcuSsBiEGKRATtbwEF4FdmGXPOF9I4rgoQDFCEYk0=; b=HUOAWxLKLq0ez+TYmndbEFnSUe8ZvemXCq3YxbBRnRVFjGJx1NIgqR+z7j3HN+4Tf0 K7mBcGj7aI0bt/IuSuE5bQq32ev9Y/vBrhsMcSFkuHRL5gHKk7iJu6xtO+7rU5ZNo6UP Ep9SqkMpcKEUcD+m/4yKKPe+XbhVPHiOq1kx/HteKwD6G+X5UvZuAVT3WSsvgur78n6X P9eEVl2EvxhG3qSoP+PwmS+xjuEg3lSl4YF57Mnzm0oEF+L6EEl5mnDg37/bMhR0Kaz+ lxsck2cJXOXOPfusp4xugWRIUpsBfsZbPawASPpewGjyqxNBQTNjQOyviTA/ckUmpzpx MZ3w== X-Gm-Message-State: AOJu0YweR2wY265o7Xk1p0Hn+fo87Glmh46tY7GOeo8SlWsJedMbw8zI WRxprd75mrPrdxP96oL4WtvLccD3rxTnsEsnV2BiY5B+v9QFBJA546hCkfv4gEIzGzdnLnj9U5V y X-Received: by 2002:adf:f144:0:b0:341:c14b:598a with SMTP id y4-20020adff144000000b00341c14b598amr694154wro.23.1712182074918; Wed, 03 Apr 2024 15:07:54 -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 ck5-20020a5d5e85000000b0034349225fbcsm11099073wrb.114.2024.04.03.15.07.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 15:07:54 -0700 (PDT) Message-ID: <6708e86a-38e7-4ed7-a202-508b2ec9165f@jkqxz.net> Date: Wed, 3 Apr 2024 23:08:21 +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 v2 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: YMDm4OGcoHQ8 libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- The other two quirk cases are very old and could probably be removed? That could then deprecate the quirks system as well. 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);