From patchwork Tue Oct 22 15:26:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 52451 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:aaed:0:b0:48e:c0f8:d0de with SMTP id k13csp344708vqw; Wed, 23 Oct 2024 04:24:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmIjsoDLPxIhts2hkHst5Dh7eRmSabuWsHgCCJsVZwARs5BqoHhzeKHfTBp2jYQd3nokseq6Mt4CQwP3OQC8KR@gmail.com X-Google-Smtp-Source: AGHT+IGrByYmAQ8/C9Swy9mWzPePDgNgv0ICn1OVTJe/hFgYT1UIPOoO8dQaiuwRRttDsEIGY7Dz X-Received: by 2002:ac2:4f16:0:b0:53b:205c:e979 with SMTP id 2adb3069b0e04-53b205ceaf2mr14026e87.12.1729682646594; Wed, 23 Oct 2024 04:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729682646; cv=none; d=google.com; s=arc-20240605; b=Hk9MSC+7KozouLgyDrZ7onD+Uuls0ohj7AgrgKZRjka1tF17KUDjE49OC+g1qbS0bc JL73LhTxA1yF9KMpwZVGvvRCGA4vcq+//n3yJNf3KnFatyYdYTr+aX3WFAVJ7s94l8iL RV40UxjQuErlff7lQkaOydbB2z/gvT3gFMJ9Wk09pSdt6rJ6lTLzKcq1PFgZk+XUFK2x 8hVgbGGoNqJs5ir5iMvPBfZ1cHSk7GUobB1/2PxB3DFl2nuCylO5c6xbWQBuyrUR6yMn VhsO59QrK9IuP7X+7FVgpchn0i3vwkSWV5992ifCOSQfq6srZEptZAp01pskQOas3UD1 eMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=E6JnhZoEnUPtb1qVNyBL9j/yGn9nbU7wZ3LGB39hhxU=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=aT+gRzS8FsFWrYeGr4M4ndpPO0iSHblCkKPmXowYAV4ieue+JPiuwCW30JEetEDFm/ vMoDfuZtEWbUcGBgeJo2hoTa3nlKLuBFj5t6ORcjRqcX+jESvZjy0uINxS3HC3fvdu/0 iHj9Uq6Picpjvuc4fuBxJ2Gjy/Yb8SbERHNVKrt/rxQlocv8a3Vnm3V29TrymAURml55 S8Nu9ZZUyyzPqfi54ILxqyk9qjYFJzE9JAahafb4EHD1rhBXqJCNOen9nNQ2TbYpIx89 g4F9XYSy0mv87UY6SVmPGEis2CdwVHT3lAWWsgLMBYMPp/asKGclDpHIiaAZ5m+4G6xm cuZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nDSiD6qR; 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; dara=fail header.i=@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 2adb3069b0e04-53a22446782si2590083e87.461.2024.10.23.04.24.05; Wed, 23 Oct 2024 04:24: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=@gmail.com header.s=20230601 header.b=nDSiD6qR; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D5D268DE05; Tue, 22 Oct 2024 18:28:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70A6168DB18 for ; Tue, 22 Oct 2024 18:28:12 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a9a1b8d45fcso65537966b.2 for ; Tue, 22 Oct 2024 08:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729610891; x=1730215691; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lW0H2GmExpzcx+HizDKT+F4QfVL2+6u3nLSFBGK5hr8=; b=nDSiD6qRaNYGAkXU3MJlnLgsfMyI2g6RUlcVjlXN7UIdgpu7zFANspUtDGe7r0zD/Z TuLITU61Lylbh9o+jRnVKUabIAWuI9+d+DsXlrt1KE61NAF2vcxZJ8S2kK1LymkcnM7a ySwDcWMsNOoaH1MThm+JwSyZnKZiRW0nYVDYgeKb4CiiAu9Ksucb7btrRfmnHwbHj6ve pABkacF3bNp5vTLh69s5Gc5pPaLF4hcqcm8HSA9KJdb/eeuJ2Sc7vuE+0ARv2xj17af3 kESedvvBxsOkFPAdMUM8BeipCLZyR8QBLLGOEqUfsiPNsNU8KA1H7aVxWT+vYGKTvct7 lc2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729610891; x=1730215691; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lW0H2GmExpzcx+HizDKT+F4QfVL2+6u3nLSFBGK5hr8=; b=HBJzcMP6U7l9A6poFHv3dMlA6CUYE+yshkKAZr5Ldu/XQyrTqlsmTR6WWiHs7SM5p9 zsa4xlFMHFpdJXMcEJx1AT/dNsb12EDasPM27XU7UHCF8pv0NBMWWAwVVXdiABy4mh5/ wmP/DlQcgbW2OKgFY4XEB7gyvp3054cemWMgUvTjTPpXkNOqWPJ8GrtnCRMKUv270mEZ ZOXvZd28usz7NfgTvwR2cpCthX5I7hhK+erJhrKuAZVPvVRGQzoNSYaba8TbEK1uPTZV sWGWwql7lnOHN5whvSxcA0JJtYK1SGj0A1aWLNDojTFcGr9hbzBKFtsHJNW2Oh4gu0rD fVWg== X-Gm-Message-State: AOJu0Yw/pbRXvMfgQzbghUKTtmVWBxJZp5Uw184F7Mhy978y3l+2Hgnp PkLCDgkBZDGm/CiXEWDyahuhEL1bTrJfOO6FA8qIII3vtdPAl+bDxw02WQ== X-Received: by 2002:a17:907:7204:b0:a9a:1dc3:d5b9 with SMTP id a640c23a62f3a-a9a69c98c5dmr794899866b.11.1729610891271; Tue, 22 Oct 2024 08:28:11 -0700 (PDT) Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a915717b8sm360095866b.145.2024.10.22.08.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 08:28:10 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 17:26:58 +0200 Message-ID: <20241022152734.534546-1-nowrep@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/vaapi_encode: Query surface alignment 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 Cc: David Rosca Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B8ZL+tHwT1NG It needs to create temporary config to query surface attribute. --- libavcodec/vaapi_encode.c | 66 +++++++++++++++++++++++++++++++++++++++ libavcodec/vaapi_encode.h | 4 +++ 2 files changed, 70 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 16a9a364f0..c8864745a9 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1133,6 +1133,68 @@ fail: return err; } +static av_cold int vaapi_encode_surface_alignment(av_unused AVCodecContext *avctx) +{ +#if VA_CHECK_VERSION(1, 21, 0) + VAAPIEncodeContext *ctx = avctx->priv_data; + VASurfaceAttrib *attr_list = NULL; + unsigned int attr_count = 0; + VAConfigID va_config; + VAStatus vas; + int err = 0; + + vas = vaCreateConfig(ctx->hwctx->display, + ctx->va_profile, ctx->va_entrypoint, + NULL, 0, &va_config); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to create temp encode pipeline " + "configuration: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR(EIO); + } + + vas = vaQuerySurfaceAttributes(ctx->hwctx->display, va_config, + 0, &attr_count); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: " + "%d (%s).\n", vas, vaErrorStr(vas)); + err = AVERROR_EXTERNAL; + goto fail; + } + + attr_list = av_malloc(attr_count * sizeof(*attr_list)); + if (!attr_list) { + err = AVERROR(ENOMEM); + goto fail; + } + + vas = vaQuerySurfaceAttributes(ctx->hwctx->display, va_config, + attr_list, &attr_count); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: " + "%d (%s).\n", vas, vaErrorStr(vas)); + err = AVERROR_EXTERNAL; + goto fail; + } + + for (unsigned int i = 0; i < attr_count; i++) { + if (attr_list[i].type == VASurfaceAttribAlignmentSize) { + ctx->surface_alignment_width = + 1 << (attr_list[i].value.value.i & 0xf); + ctx->surface_alignment_height = + 1 << ((attr_list[i].value.value.i & 0xf0) >> 4); + break; + } + } + +fail: + av_freep(&attr_list); + vaDestroyConfig(ctx->hwctx->display, va_config); + return err; +#else + return 0; +#endif +} + static const VAAPIEncodeRCMode vaapi_encode_rc_modes[] = { // Bitrate Quality // | Maxrate | HRD/VBV @@ -2111,6 +2173,10 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) if (err < 0) goto fail; + err = vaapi_encode_surface_alignment(avctx); + if (err < 0) + goto fail; + if (ctx->codec->get_encoder_caps) { err = ctx->codec->get_encoder_caps(avctx); if (err < 0) diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index c4f85397a2..ca5cfe9eca 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -260,6 +260,10 @@ typedef struct VAAPIEncodeContext { * This is a RefStruct reference. */ VABufferID *coded_buffer_ref; + + // Surface alignment required by driver. + int surface_alignment_width; + int surface_alignment_height; } VAAPIEncodeContext; typedef struct VAAPIEncodeType {