From patchwork Wed Apr 3 19:44: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: 47767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622238pzb; Wed, 3 Apr 2024 12:44:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJTU3pyFhUGYi8n+bTZn++CG20bfKzYwm8OpWvhrgXvaZ15lZA75m/M9zuRduWFpk8uE5ayS7g02+KdRx4zUn4/7IZdBP50cieEg== X-Google-Smtp-Source: AGHT+IH26vLPMb5fyC+Ii2w9ty1n+uqp2/ZhNGxPNBCtPqRs4lUvoRjlWdmr0Mgzn40rAviTbZEl X-Received: by 2002:a50:d5da:0:b0:568:3362:ccd1 with SMTP id g26-20020a50d5da000000b005683362ccd1mr381100edj.1.1712173453443; Wed, 03 Apr 2024 12:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173453; cv=none; d=google.com; s=arc-20160816; b=tl1CQQiuw+QUYKd1W/Io2FkWNeFnoeSNiOuJzAJNIXe2lKjIlfv5JJGIlLRK+50DSo co92s5wL3BHXPeTKS/tspHKF/z38eV0vlUEd2DsT7OitMsYnsK4yHkoEIKYX41qOW4FM G4/DHp00mD2s0pSHRUzouecRG/Sa8M4TqlDawancwSTW6Qu1mUWWo0koNJACvWqYg1Us DsXQT4acNQtPbeXuJGGmuRK5WO6fQ5DuAUwRyOhbqSuNUhm6aCA2B2U4Y5JD26bu1D2F e2FIoUyePCDzeAe6cMZVtNGj8+NFgsLV0xaq7myjRcWSh7dd9o+HPViXefXNEHSD5fsc 04uw== 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=Xy12qt4AZlvJXFl5rlfqhM0DB58QU9FhgXi6DDwPebQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=cjZgD++qj6m5YMLs9V1aYTmY8ZwQHNDZ1TLXftKC+Lmp9S6i32vIRRyaW0Zz3004Hn G1EyFH/ZZdRDeEDg1xZlA2YZxCSpOtKp0frfjkXo0XNbQ708JT6aaN4RFLISJPwdYBmj UbhGmhnMo6fs04w5vyqcl6RIjnv6BiinJA6d5WuY3yzhbI4fZSPkshhbvdAN7LdERESQ XbXQNFsdfgQXBNNrb8lCyRpjqmOjiTBQeZAvP88c6Ecvr7kHPKqpO4UGRUWaRW4Jo5S/ N5UZkHDZcSZ3NyCF+KY+ZIm0RZwopCrzyZVLDy45oUF7LamhW3imhle2YDWKUCaV9HJM bBvA==; 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=XfAkyPxa; 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 s30-20020a50ab1e000000b0056df7e4db42si1504875edc.403.2024.04.03.12.44.12; Wed, 03 Apr 2024 12:44:13 -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=XfAkyPxa; 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 E7A0C68D128; Wed, 3 Apr 2024 22:44:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A6F468D0EA for ; Wed, 3 Apr 2024 22:44:04 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34391544c46so144649f8f.0 for ; Wed, 03 Apr 2024 12:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173444; x=1712778244; 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=rNlB8tGiLW4KX5mEWnMAo+nbJCtfHpiKgd6xmbKIdSM=; b=XfAkyPxapnj/hJMC8f8LZlNKBfesp8gW/qmqWNqE4rOIDuYOrGFix4aGKmvj+upKMT sILT0/TsdW25KOdU7m8Pt9k8TW7CrkXnspwy5gWx1N82+HQeHIjb6Y/ShQ2Fob/0VO8w wjS9yhOc6tT0kujLm9cw8Ud9QaBHchD3FLdpmVCrE14zxweNGexvInrFMlkLoLRwMxBU RgL6YiC+2y50UV1foE/Zz8zpY/2WAxAwY+0//EI+7Xw21jbckoavFV/e3SKr/52igvjg EXQO1dq/SpFuYXJppmYh8LN3ROntgv9mgHXKYCBifob9ioiR6Dn7qiOcl8KczoEjkT1h vs8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173444; x=1712778244; 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=rNlB8tGiLW4KX5mEWnMAo+nbJCtfHpiKgd6xmbKIdSM=; b=I5zJfsjYVuUj+YCbkkir4chCD44PMz7k+e448RTCW7GjWmeyAGgRHpKGxmZwkf2KWe 7bTkLuVGp6iMk8y7pJrBkqP5xiE3BL+W/Q6RENHTFjEM4IJmWp4gaZH6z6YMt9yD5+Bc xCwVxDTuAg9H8xyo2rVmHBp2tcs3OZ04/vi0tlnKk/m37XJpm5yaJ9EVGH72+Juyv4nR W8D6Qmtqqh2W40vZWzbZs6LdrevFYQO+d4crd69Sth6muH0v0EuNo+Xt9aA9kd1sWsI3 RPQtsKSCgSi9HFJvBfTihsZgRkK+m9jCzdGXuzjvLaC53g7OxiYG8iQl4OXWAg5xjohS Nqsw== X-Gm-Message-State: AOJu0YyWJbnVbO3Kooq3M8/2eMVIW1VRf2tTnpGBjMn5BcUc819Z4Wpp KTMVs2HWOozAFB/2kbLW8/7ijwheqlF6Vt1hchNd4EWIWbuNsKY5kCBplNuZ+aC8R2PVZ3FMOQl m X-Received: by 2002:adf:b1d2:0:b0:343:4b38:6659 with SMTP id r18-20020adfb1d2000000b003434b386659mr330689wra.53.1712173443708; Wed, 03 Apr 2024 12:44:03 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.44.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:44:03 -0700 (PDT) Message-ID: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Date: Wed, 3 Apr 2024 20:44: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 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: 9U5NXJsaEKAQ libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- libavutil/hwcontext_vaapi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 56d03aa4cd..bc82ab31e6 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1637,7 +1637,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 +1650,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 +1658,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; From patchwork Wed Apr 3 19:45:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622548pzb; Wed, 3 Apr 2024 12:45:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUPkBhotJhwQ+KUFFmyybA8ShlqSolB0PNAqOBdiaIbpT9RNrOlNvH66Nddjh42aqlFFqhJjVlNiZfgqWRHgUWV6Uce3s+HPInaqA== X-Google-Smtp-Source: AGHT+IE7irwJaLm5xw7oKhENZx0MrWnJoB3gFBVjgMXc7NiOg/oQCnnN+A5HGG7v/ONo6+Z7UBjm X-Received: by 2002:a17:906:6a25:b0:a4e:7c40:d0f7 with SMTP id qw37-20020a1709066a2500b00a4e7c40d0f7mr221841ejc.25.1712173505786; Wed, 03 Apr 2024 12:45:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173505; cv=none; d=google.com; s=arc-20160816; b=q4tq0jsudJWj1efP6mfgm/K91zMzra8xDTGKWFPk6tboFHYYN2KajfDhaUqI1wtNhH n74MZNRWOKQ7e1pnIg7fRLOrfpIct/Q1YvZSVWkflTeDU80zsjyRh9LHYCIk6Hm845jT RU79Ud/oC9uOMwamdGN4sHB97QY08uivhq6/Tm9Hn9vX0Cun7Ep8Yo5NVrxnf31yaUrr y9zAXGQcDXv8J0sJDRKr86o5ZiMVRmGAUVRIpn/wplELWTn5AB3uDTdmWUX/Sxbw2W9O GmPOwlfOWmsY3cfAmHDQglzvqSJYuEqWAM2/3bjRQsTxK8B/Ajad8IYs4v+YV7tKvfD6 MRxg== 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:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=Mkj7IVkoeOx766IY3jZmcdZycjae1SIRt2ceHWrcR6o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=f0/izwyFMgY87WlP8NcP1R4OYNmobVcPoctRiiJ8C4un3XKLZ3gcwKZz6jY5UkS/yb CWNKMmeyNSerHOvOCp1l1cHS2+DT5UwF+izOPJXUE5BuZSsI7Rf2I82GcM3/n6b4vg19 Xxny7ZZX6jUtxvB5AJqtYzvTVsQ/Gs2f/sWbL6oXQlQkt7QCXHRdZQdeQ/inqxa8kLq9 yeZwkgQpiAHNMplQdnxxsvHmQFzZKQcenBbL5em0IeD3RdYwkEh+rXcrK022Sw3jLink 95ODVs2Io4D6O6+sKJCvPIqV5+PDyjZ9ivylT5DeHCvMRLeHEztCzSZbttJgYueiMgG0 T5eg==; 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=Ct5cXgIJ; 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 xd1-20020a170907078100b00a474c8399d6si7402953ejb.798.2024.04.03.12.44.58; Wed, 03 Apr 2024 12:45:05 -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=Ct5cXgIJ; 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 1CC2F68D140; Wed, 3 Apr 2024 22:44:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A6F668BECE for ; Wed, 3 Apr 2024 22:44:49 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4156a29ff70so1342705e9.3 for ; Wed, 03 Apr 2024 12:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173489; x=1712778289; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=2W7WcU/LIi/lRkqQyIoGB1Jl3shf13P2zLlhDWH1AFI=; b=Ct5cXgIJe7FVSM1YCe8N1p5mPCfoPZn2YqdJQ8ktkS3ZZWFMSt9L6JN+j9bQX82G7X Zx4Jd+flyjhNO4U+UWapw4y2r3qbsf9JgteMhWHMGzVEzrA59zvCLlioqgUk9Gxdkv78 MTP28Ok30pwdE8/QfA/rKYnOVCAzTt+sTPaVrrC9ifl9LdilJzrpVlAdCFPigKjJDziv fgOWJAF2vhy3nitba99bV+Q/CYecF3cChnYKxAwlZvrQpUGnihMA+dnAzRJIgrvsnw7P NCu0FP8y44v9PgEXj7QFUZXf7sVqNMOV70eykfBxrj29ypVYLPvFFhXJnvFdA/0JVvyY /Dqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173489; x=1712778289; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2W7WcU/LIi/lRkqQyIoGB1Jl3shf13P2zLlhDWH1AFI=; b=QhOuvFgpriZL6d7SHI/5At50o9SYEI5L/UT/kJrea7mis2l04LwzfL7pA5Ykh3ZQh2 SY0kYRydGIk+iwKEEk0lft5KN/yjUxSMDgOD+ZpRupQGTffYMbRpnM96V8IKOEMAc1J7 5tVMQtV/cA1hG9T30ADQxz4OP5/+/6deLG33MMfpyk6DVfug3JDuorXNKhjFbYQnl2nG brzRZLtl5B8Pe7zR+inpuIZeNX+G+PFc4LdO0TK3MWzO8tOiMhzgwstFhh4m8Dtix78e V9aoG7Sz3uUzOa5B6bLam7PkjiaNY4F9yJGKpy1iawzLarpD3TjnDRNYhBorMmYsz5zQ i1Nw== X-Gm-Message-State: AOJu0YyHN+ayPO1kaQClJGGZk7/5YEAHOKpY6N2kg4+dzIqR7kHZlLc4 vfuxmOc7K5GKHI0ZMdjzMflaZ8lphfOdtozpHKIW8cxjJe09HJbxYYYcPX19A0kkqJrN8BM1DYT a X-Received: by 2002:a05:600c:1715:b0:415:4a83:88f9 with SMTP id c21-20020a05600c171500b004154a8388f9mr420806wmn.38.1712173488680; Wed, 03 Apr 2024 12:44:48 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.44.48 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:44:48 -0700 (PDT) Message-ID: <6dcdde27-99b7-454f-a155-0fb02161216d@jkqxz.net> Date: Wed, 3 Apr 2024 20:45:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> In-Reply-To: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/4] lavc: 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: kjQiHa10rf/M libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- libavcodec/vaapi_decode.c | 10 ++-------- libavcodec/vaapi_encode.c | 31 +++++++++++-------------------- libavcodec/vaapi_encode_h264.c | 18 ------------------ 3 files changed, 13 insertions(+), 46 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 5665639dd7..4e8910ed25 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -191,16 +191,10 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Failed to end picture decode " "issue: %d (%s).\n", vas, vaErrorStr(vas)); err = AVERROR(EIO); - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) - goto fail; - else - goto fail_at_end; + goto fail; } - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) - ff_vaapi_decode_destroy_buffers(avctx, pic); + ff_vaapi_decode_destroy_buffers(avctx, pic); err = 0; goto exit; diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index f54b2579ec..0e19281ed4 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -618,26 +618,17 @@ static int vaapi_encode_issue(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Failed to end picture encode issue: " "%d (%s).\n", vas, vaErrorStr(vas)); err = AVERROR(EIO); - // vaRenderPicture() has been called here, so we should not destroy - // the parameter buffers unless separate destruction is required. - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) - goto fail; - else - goto fail_at_end; - } - - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) { - for (i = 0; i < pic->nb_param_buffers; i++) { - vas = vaDestroyBuffer(ctx->hwctx->display, - pic->param_buffers[i]); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to destroy " - "param buffer %#x: %d (%s).\n", - pic->param_buffers[i], vas, vaErrorStr(vas)); - // And ignore. - } + goto fail; + } + + for (i = 0; i < pic->nb_param_buffers; i++) { + vas = vaDestroyBuffer(ctx->hwctx->display, + pic->param_buffers[i]); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to destroy " + "param buffer %#x: %d (%s).\n", + pic->param_buffers[i], vas, vaErrorStr(vas)); + // And ignore. } } diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index bf51df0f51..4f4191e23b 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -106,7 +106,6 @@ typedef struct VAAPIEncodeH264Context { int aud_needed; int sei_needed; - int sei_cbr_workaround_needed; } VAAPIEncodeH264Context; @@ -271,19 +270,6 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, *type = VAEncPackedHeaderRawData; return 0; - -#if !CONFIG_VAAPI_1 - } else if (priv->sei_cbr_workaround_needed) { - // Insert a zero-length header using the old SEI type. This is - // required to avoid triggering broken behaviour on Intel platforms - // in CBR mode where an invalid SEI message is generated by the - // driver and inserted into the stream. - *data_len = 0; - *type = VAEncPackedHeaderH264_SEI; - priv->sei_cbr_workaround_needed = 0; - return 0; -#endif - } else { return AVERROR_EOF; } @@ -681,10 +667,6 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, if (priv->sei & SEI_IDENTIFIER && pic->encode_order == 0) priv->sei_needed |= SEI_IDENTIFIER; -#if !CONFIG_VAAPI_1 - if (ctx->va_rc_mode == VA_RC_CBR) - priv->sei_cbr_workaround_needed = 1; -#endif if (priv->sei & SEI_TIMING) { priv->sei_pic_timing = (H264RawSEIPicTiming) { From patchwork Wed Apr 3 19:45:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622666pzb; Wed, 3 Apr 2024 12:45:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNp+p4z3k4XvA/LtlNVK8zX/0zOBqe1mbV9SkxEQWa/sNGfgBULuws451FfepYO/H1IimFQ+IrbRds6apPrnR+5DkcTLDt5zrjsA== X-Google-Smtp-Source: AGHT+IFaE7sSjzwW4gzQ23JCrE6++u2R0Y8R6EgjLZ9nsSkySY12cNAPlzJcJl19ZYEvkmCpvwfs X-Received: by 2002:a17:906:c291:b0:a47:3469:d75a with SMTP id r17-20020a170906c29100b00a473469d75amr168584ejz.67.1712173522560; Wed, 03 Apr 2024 12:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173522; cv=none; d=google.com; s=arc-20160816; b=VOcW4bjuPdCtZnDWHC8fXhmlCvQm95+zHrrM/yCzPZB50Nd3yukmZAVbeF19jsECjH ZfhZDxauM05sQ93KrPna9HAMxKL8utzP+jn4w28fIESx2Neg+69VZFyl0vQ+Ns2ZiZ1J wL04mzU1wRCnU419NKcaA/nUujiDSOBmnEIFg9wzYStbrs1W9l7BTW1Za2gIRI47LCcT vchWBXfYdmZmEJSIx+YHLG9eHa0jo4/0RS1O2Y1EoZqLWYx7bXOloHqjbNXn6hwC6ENP p0wSwGBlRHL80wWUaooihwXGtjM/IV77wYRt2xcRSA3QXIk/zWlahrB6y+0NWhR8E+t8 3LmQ== 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:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=mNKZTZ+Fp1BoXF/bgabgBr1pGGj4rRon1atHO5/99CY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=XOxQcHaX+QoCaQwHdZjt0GwjZJc24KNvLQHd3ckAWryzG3Zwl/i9dhXCLKEgnzY0y2 i5DAWcd/ToVbZg6W/okEO9MMoeW6C2njvqhj4P68I6y2dY3jcz5GqqYDfFD77GcOq6Y+ +yMnIRleddEJLo7cJNWLiyMCNqaMCJsVqCA9Fe9HcfMWPbqbtGQiRvIYB7vmEXGbXCDQ oSUQ6SB+K8tqYjLQdcdd5NFR0eeAPJ2n5wfWuduZTKISGvx5lzkKKerE9bq6cmgmTqVX 2zzBvU5jLdI9bUTt8PsxWGEhCTPViaDkvmMtdXmkdnxEuMO03HRDb2bvZQWJcMNoDtne 4Jcw==; 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=qKKOlz2D; 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 dt2-20020a170906b78200b00a47100a7144si7384123ejb.199.2024.04.03.12.45.22; Wed, 03 Apr 2024 12:45:22 -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=qKKOlz2D; 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 2C50768D13A; Wed, 3 Apr 2024 22:45:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CBF668D13A for ; Wed, 3 Apr 2024 22:45:12 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-41628d9ca8dso690045e9.0 for ; Wed, 03 Apr 2024 12:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173512; x=1712778312; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=eAhEpkUGZ2oRS2AeAIe1D2+1g77s28McMcr+NvIloX0=; b=qKKOlz2DI3DTJD8hIuH85SytA8aWsiZxHe1cxhVOB3jchUJmu52Kb9hNfqifPIZR+f MCua5z/R05z6mB910rk0YY+xrrCfx6Lj4IJYDRbSAPGrJnCqhBoX9/t16W6Guw2AQwCM 15RoYd6BBiqUOuPxgfVH8s/iBtlqeAdPDxeSByfIuArhj6KicYecpcCsksPPnxkSEvQl otsPKU7N5yIbJP10bOm94pdtsfSR8mEgxA3GA0JKd7+Rtm2V5zNGnhYaFxv0o/wj6fQl iUmZPIwSEKoiaSWeWLOuRpcnN/BQcvu8g8oUZnxhai4epjSPXt6O/Y03t6KlhTJLYFKf +8xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173512; x=1712778312; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eAhEpkUGZ2oRS2AeAIe1D2+1g77s28McMcr+NvIloX0=; b=TaiyuUo3ziDWVH6Jptu/WZ4jJVZaILHlpSLvYc3WrvR6dVDC1T2oSMF1zlbtMZhMWR voOkJzG686co1WU1uo78x4iCa7bdYfqbZhr3hJJx/KyX0xVV0pu2oABRjlj0pMDunCb3 i0D04iMTmJzLj9kOuf9w55iGXohylU4rMuWNJWbgxAaqzoJXjAN6JZfOe4xt9oT28q7n OlaYCcf2+oRqRxg7sn5fVfweC1fCbHv+8qN2obvFuNenv9AqhVvGWZtOp2oj/J713yuk jWihhH75rhnObS8OCpWO9l+tGT4HHg9c7vnhuhPwunqEFiINsYCD9O+mPXTITJWGeFyo 6BAw== X-Gm-Message-State: AOJu0YyEVzB8xZFHMoZv2jLMPXXAEytILDz2uyyTRuGbfrEnPvk5ciAg FJn6uvcWX5gGarR+kHukZ0IvCcrwHxv/6L3g8f4z3iHTRInNsPenoK6zJFgXz4KVRfk9oLIo1u6 e X-Received: by 2002:adf:fec4:0:b0:343:69b4:b527 with SMTP id q4-20020adffec4000000b0034369b4b527mr340910wrs.18.1712173511956; Wed, 03 Apr 2024 12:45:11 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.45.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:45:11 -0700 (PDT) Message-ID: <781ade9e-ae1d-4b2d-9900-169bd02996d2@jkqxz.net> Date: Wed, 3 Apr 2024 20:45:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> In-Reply-To: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/4] lavfi: 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: 1xcG+rddCiNm libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- libavfilter/vaapi_vpp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c index ace1153a23..21d74f8112 100644 --- a/libavfilter/vaapi_vpp.c +++ b/libavfilter/vaapi_vpp.c @@ -672,15 +672,12 @@ int ff_vaapi_vpp_render_pictures(AVFilterContext *avctx, goto fail_after_render; } - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) { - for (int i = 0; i < cout && params_ids[i] != VA_INVALID_ID; i++) { - vas = vaDestroyBuffer(ctx->hwctx->display, params_ids[i]); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to free parameter buffer: " - "%d (%s).\n", vas, vaErrorStr(vas)); - // And ignore. - } + for (int i = 0; i < cout && params_ids[i] != VA_INVALID_ID; i++) { + vas = vaDestroyBuffer(ctx->hwctx->display, params_ids[i]); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to free parameter buffer: " + "%d (%s).\n", vas, vaErrorStr(vas)); + // And ignore. } } From patchwork Wed Apr 3 19:46:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622991pzb; Wed, 3 Apr 2024 12:46:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZA5PntOFdywvmhgL3jqvQ5SYShR9BPG+9KlcUBvaQ3dWXxfRodXNueVteWnwh7AOgv6pBvhW0fwoklwwe8zrS/pMb8RYjEbsIgw== X-Google-Smtp-Source: AGHT+IFFQaa9OW26pwHIXVGcNlsCeivHOHSBrNbwMRkonB744+dfbtLWJMA9dnpA+Wt6pJhWmFho X-Received: by 2002:a17:907:d26:b0:a4e:68a9:a6d2 with SMTP id gn38-20020a1709070d2600b00a4e68a9a6d2mr220842ejc.64.1712173568067; Wed, 03 Apr 2024 12:46:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173568; cv=none; d=google.com; s=arc-20160816; b=YeOlEc1fvswvUHSI4Wum3bH7YzGVv8T7u9wKpH1Wuj/EF7+9wYaGBrstUm6o1ptB9d TMRAzq8VxVZzAxdZwZmnyxnOzIQStQmuTBlCkWawPAnPmEvoN1ganhUvQJljJX6RAPu8 cDaby8pQ+LlNrA2asvFunfkXPZ8Ao9lhcDlitPjMwDFDXRCieplQl93q5AVdez+pQ6qJ 5KA+xMd1t6h2LreT9WF1GbDRsyt3aYa+cZR/KFsG36TB9qrhNYv5mwAbcdhCoECvTBKv 8gdHuKJOXvg4hnKGS+FYtNjbKPB+u//sTxFISGIcLR4Ie1YMdADnfoXYL6t/2z0o79eL c7fQ== 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:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=0+NMNnm1VezqvoG5Y+NhO5+MZ8KmInJSEUKqG3AMZDk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=UTADU0nM+gY//kY4IDtJQ7inM0sMlMYhCXd1b9CoLvTbbBpxaRWGvrMEnfeZN/vIbd M/r/V1aZ/zns/3MLHDNA0Uvu9/eStNpKPAE0CFcabWCDlqWztRfdRbLgGgz6Xm9gGmr+ jAuPH2qkDPr8l2dr5bYNs4wyCezL1oA803c2BKG8tFrjpDyXxnG3ZJEyPrVwu/BZIWb7 uojIsU6NHC8exY6uP7Irv1py9/3/hUBE++p55GmIV4S8mQL72RQjaxM4neYWLx/p3GPx FB5m8jBmnmQ9rwPsNigE0gu6x+pZTXOfV93SgENkAA65LQsL1yFsCcicTG/emz5PAMnO LcvQ==; 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=gKpLa6XZ; 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 gb36-20020a170907962400b00a4e283893dcsi7102990ejc.531.2024.04.03.12.46.07; Wed, 03 Apr 2024 12:46:08 -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=gKpLa6XZ; 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 4C0FC68D0C5; Wed, 3 Apr 2024 22:46:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 488FB68D0C5 for ; Wed, 3 Apr 2024 22:45:58 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-41624ebc521so1528945e9.1 for ; Wed, 03 Apr 2024 12:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173557; x=1712778357; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Aq3AQ/jIfC+hA6xnoHqfECAbN5s/XWq2ri4yHGFpuwQ=; b=gKpLa6XZxmb94q3R3A71z2QxvYtgeeot6C52w4h7YbvJmL5eNozzbWBiN+mEamJ6vl 2StIEe/FpqJw3xow+MrbqDQ/EH8Ef8bJnW/vlqGPUUs+fDQlYZ811MbgE407S22UwmMs ZAPRlKHWuFdXtKV7x9N3GtbwP7f462yTlCFpBvMhFCvgk5b+jbS9PgzDmrsWj1qHqNfz KBXqsF1mGxPebGaQydQJh+XavGng3CBP852kj73dfRl71s0WCPrAPFREiU5Wl1aS5px+ f6hkAYcEOOxn/eJR/VR768tCZsBsjYniY/z6QItpxrZJCMkgi8NQManIxJVUFZ1et1vM h48w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173557; x=1712778357; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Aq3AQ/jIfC+hA6xnoHqfECAbN5s/XWq2ri4yHGFpuwQ=; b=TbYZq7URaXGXJ+wZX0EgFd6R4TXGa358dgLWm0gwoPVq8gGlogRZNMljQkPMdr1A5l C0l5TF12JUAnnSaIY8JAejrZzYcbz0Gdnb04B5YquUtqczjDosrXuJYajmmbx17JdPuN fOG0Q6jIMJZN4+PKDkV1kANbfsbvkH+oEy6wtuUSUZwWd5aCFuIemBhwjWcy4XhN3Znu mbRWtnnQAzRWLfXDvdpeQacqQ/50BQyCzvdQbuPCVH4ZjrZaMLdCXmJIXb5dGZGoAwQ5 tQMvvXrwO56scX1khxP+MF3+g+yd9d8GaY8Tm2wBGjXDqAMp1MrfThBG2d3AyodUrm4R M6Aw== X-Gm-Message-State: AOJu0YztJEYI2OhzKzjaqJCek+HXxNbEO6WyQRhOR8yV2wGYkEOsryvE /OSDB57iAFuvd5i2nBOfVoCh4jPDcf2qBdlbVEh7KOZL1k7mMZGFbMmHewEoTMhf9QIt5K4VFdx H X-Received: by 2002:a05:600c:4f06:b0:413:1741:28b5 with SMTP id l6-20020a05600c4f0600b00413174128b5mr458485wmq.9.1712173557562; Wed, 03 Apr 2024 12:45:57 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.45.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:45:57 -0700 (PDT) Message-ID: <8e59da71-e1e5-4d29-8a85-c3c4d0814fde@jkqxz.net> Date: Wed, 3 Apr 2024 20:46:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> In-Reply-To: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/4] configure: 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: ycFlGVGeGJld libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. Various features no longer need any configure check after this command, including all codecs except AV1. --- configure | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 71386c3920..9adada002f 100755 --- a/configure +++ b/configure @@ -2622,7 +2622,6 @@ CONFIG_EXTRA=" texturedsp texturedspenc tpeldsp - vaapi_1 vaapi_encode vc1dsp videodsp @@ -3184,7 +3183,7 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_nvdec_hwaccel_deps="nvdec" hevc_nvdec_hwaccel_select="hevc_decoder" -hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" +hevc_vaapi_hwaccel_deps="vaapi" hevc_vaapi_hwaccel_select="hevc_decoder" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" hevc_vdpau_hwaccel_select="hevc_decoder" @@ -3256,7 +3255,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" vp9_dxva2_hwaccel_select="vp9_decoder" vp9_nvdec_hwaccel_deps="nvdec" vp9_nvdec_hwaccel_select="vp9_decoder" -vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth" +vp9_vaapi_hwaccel_deps="vaapi" vp9_vaapi_hwaccel_select="vp9_decoder" vp9_vdpau_hwaccel_deps="vdpau VdpPictureInfoVP9" vp9_vdpau_hwaccel_select="vp9_decoder" @@ -3348,7 +3347,6 @@ hevc_qsv_decoder_select="hevc_mp4toannexb_bsf qsvdec" hevc_qsv_encoder_select="hevcparse qsvenc" hevc_rkmpp_decoder_deps="rkmpp" hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf" -hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_select="atsc_a53 cbs_h265 vaapi_encode" hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf" @@ -3357,7 +3355,6 @@ mjpeg_cuvid_decoder_deps="cuvid" mjpeg_qsv_decoder_select="qsvdec" mjpeg_qsv_encoder_deps="libmfx" mjpeg_qsv_encoder_select="qsvenc" -mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG" mjpeg_vaapi_encoder_select="cbs_jpeg jpegtables vaapi_encode" mp3_mf_encoder_deps="mediafoundation" mpeg1_cuvid_decoder_deps="cuvid" @@ -3385,7 +3382,6 @@ vp8_mediacodec_decoder_deps="mediacodec" vp8_mediacodec_encoder_deps="mediacodec" vp8_qsv_decoder_select="qsvdec" vp8_rkmpp_decoder_deps="rkmpp" -vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_select="vaapi_encode" vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m" vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m" @@ -3394,7 +3390,6 @@ vp9_mediacodec_decoder_deps="mediacodec" vp9_mediacodec_encoder_deps="mediacodec" vp9_qsv_decoder_select="qsvdec" vp9_rkmpp_decoder_deps="rkmpp" -vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9" vp9_vaapi_encoder_select="vaapi_encode" vp9_qsv_encoder_deps="libmfx MFX_CODEC_VP9" vp9_qsv_encoder_select="qsvenc" @@ -3940,9 +3935,6 @@ xfade_vulkan_filter_deps="vulkan spirv_compiler" yadif_cuda_filter_deps="ffnvcodec" yadif_cuda_filter_deps_any="cuda_nvcc cuda_llvm" yadif_videotoolbox_filter_deps="metal corevideo videotoolbox" -hstack_vaapi_filter_deps="vaapi_1" -vstack_vaapi_filter_deps="vaapi_1" -xstack_vaapi_filter_deps="vaapi_1" hstack_qsv_filter_deps="libmfx" hstack_qsv_filter_select="qsvvpp" vstack_qsv_filter_deps="libmfx" @@ -7236,7 +7228,7 @@ enabled libdrm && check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2 enabled vaapi && - check_pkg_config vaapi "libva >= 0.35.0" "va/va.h" vaInitialize + check_pkg_config vaapi "libva >= 1.0.0" "va/va.h" vaInitialize if enabled vaapi; then case $target_os in @@ -7252,18 +7244,10 @@ if enabled vaapi; then check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay fi - check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)" - - check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC" - check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth check_struct "va/va.h" "VADecPictureParameterBufferAV1" bit_depth_idx check_type "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" blend_flags - check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC" - check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG" - check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8" - check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "va/va.h va/va_enc_av1.h" "VAEncPictureParameterBufferAV1" fi