From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6C1504A741 for ; Sun, 5 May 2024 19:02:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B272068D5B3; Sun, 5 May 2024 22:01:49 +0300 (EEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D57168D5AE for ; Sun, 5 May 2024 22:01:41 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-34d9c9f2cf0so979971f8f.3 for ; Sun, 05 May 2024 12:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1714935701; x=1715540501; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XAw9UsFCbchRixL5w+8WdR51BqNjPwB+Tu5dYA6Qt+o=; b=wL3XJZRjZRBH90n5Yl9CkIaOZhtRCb8UXS99pGX2NI1AdOP1Lm0YCeSndmloMQNPsg 73/Tjq6JXdR1nmfxanYvZjMh+0p7KGL1xdjPG3CL3Qvb7ass/pgLgLnYYfZpj0K9REg2 xbRBa8tAXYHaQe3ZsLvubC2AJfuldGTOhYTvdsF8LEWvTzdur8xu0tLjCqAUwtzyw1i0 7izbMoC7L4ZLoTQRjgaTfFxrw99FAwJhxRtWEh/42k5S6yKzLbFmc5YdJ/kcekQcEOjM mTmInR/Cn6Dm4N8NI7w4FPT0iOl/8zngLsP+GsvChJv7jQ0b1NM+P6+1vxIex4Q5AT2U nKBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714935701; x=1715540501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XAw9UsFCbchRixL5w+8WdR51BqNjPwB+Tu5dYA6Qt+o=; b=D7+YGwMWciD/EjB9ry2EWPGvG/Cuuzq36TzW5GuBe1UIRxF2sjpZ+8OVuKPgX786gy pAZgbVnSBr8tVtqHRMl5P7L4I0+WAc+NKXO6XpCMm7TroAll3RdlFi97wpKIs12oR2kV Ol2jkAH9UxXQOp35iif6UOo8OREnmebILdb5x204+k0wdk0sTIW5/QdTRKswi7X6goiJ kIz2kW8uQK50kKhXlqbDoCAVaw1VLGx00jesejaUaPnh2mjd3QObM0g+0/5hjTvaX8nl DAhv1DVzQvCH5eUJ0TsW7ubIPxEYn/7rOB980yyqeTGMorzl9Hb3kAJpduGMdKgaj8CQ fa5w== X-Gm-Message-State: AOJu0YzLBR3nJkXM4+I50lXUwtjGzBKB19H/rCsCkgENQ2GZ1Jmx+LRy Z/aWxQwCdqznWV7uxnmKIGKorSnd8StWbHi+1LqQha2MYPqKrWf08NzypnxssLHtmc/eZo+12oB P X-Google-Smtp-Source: AGHT+IEcK7zV0YdY8Z4X/gefaTF2leYhaokPQEYD0B2OLIlwD4ReDcx+wVUIGRGkXynvWZaKrNKD6g== X-Received: by 2002:a05:6000:c0c:b0:345:663f:cd79 with SMTP id dn12-20020a0560000c0c00b00345663fcd79mr7124174wrb.14.1714935700876; Sun, 05 May 2024 12:01:40 -0700 (PDT) Received: from localhost.localdomain (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id s14-20020adfe00e000000b0034e553f6174sm7292523wrh.98.2024.05.05.12.01.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 May 2024 12:01:40 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 20:01:46 +0100 Message-ID: <20240505190154.90781-4-sw@jkqxz.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240505190154.90781-1-sw@jkqxz.net> References: <20240505190154.90781-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/5] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- libavutil/hwcontext_vaapi.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 4cb25dd032..caff43d1ae 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", @@ -1425,7 +1417,6 @@ fail: } #endif -#if VA_CHECK_VERSION(0, 36, 0) typedef struct VAAPIDRMImageBufferMapping { VAImage image; VABufferInfo buffer_info; @@ -1585,7 +1576,6 @@ fail: av_freep(&mapping); return err; } -#endif static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) @@ -1596,10 +1586,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 */ @@ -1649,7 +1636,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; @@ -1663,7 +1649,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) @@ -1672,10 +1657,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; @@ -1919,7 +1902,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) { @@ -1928,10 +1910,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); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".