From patchwork Tue Oct 22 15:26:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 52446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp3468405vqi; Tue, 22 Oct 2024 08:39:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBb2BSCW0xh18U2/icXtWpw2KorHWcJ1hflMDFWLy7WeExQr2pSKM9jYwIIPziMoj/r+gDvr4Rcd/8MuNvwVpE@gmail.com X-Google-Smtp-Source: AGHT+IEuNh5u3EUSRY1g+bG7cLXSgfBQE1WWcUgVxNyiO3zH05hJsY5xZkHPF63XxhhLrd6cRO27 X-Received: by 2002:a05:6512:39ce:b0:539:f5a9:b224 with SMTP id 2adb3069b0e04-53b139e013amr1854269e87.11.1729611545272; Tue, 22 Oct 2024 08:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729611545; cv=none; d=google.com; s=arc-20240605; b=i0pO63eEwwvNj7diPW/28o0wCd4lKYU5XTDQ0XrUyW4vutKeSs10YP6Al0KQM5OOtC Bfl9FG4rCY+T1SjIjCRvuHSQTModKLFSL0KbOCyCn8NPVlE7Xf6kdwAdck3P8mxOZFw1 TMAa5xIyeIkxiRQcz6BiVl7UheE/aViSATphg2PM4KYzj/qLIS4FL5HGAaE2ssvMS9ba LMMA+M8mTo0mk/Zcx+kipNLRBhIHH3tv8z7Qu7PmkOkfXiRoclGzY3ghg5BPOKixZehk w1dcnbZZ6F3hgbN75UwSqUXFFxRG6IGKGNUlI32DMVCMXYn7kE6Sif6ES5gGz/aIp1U3 cqCA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=hLzlK/9xePNrYpxiGS4PXJXg2m2RIWdvuhbR03Jhnio=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=bt5PTl/fAYPoPJhBu71SuYySKnOf1E6JMWySaFvrRGlLixhaHR+w11aYM3IT7YyV3/ I0voOd6D9aw2eOUe7VFw98j9iMVB0fCmX46PYrPj/KxKENgYgSY9g0ohiKUg7pguunSd aixB+g3gSNXT8yv2+UkRTkEPOVDrTXxCFnJJxWpGSwjH56NPL43VIkIBbceNIRbgOWQL /MCJm+sReo+Np93xua7soQvzYDso+04VD2QlYBpC8mgC/ZvAhxEQA9JzgsdMTboNFrRy HZ/2H0mXF6KJdwPP40QoXxzyu+xQr2SCUTmyKUIMQzGEnUMblnJHPqCgghK30zvfqXPB 6IHw==; 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=ip7kxuCD; 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-53a2245a92esi1990452e87.645.2024.10.22.08.39.04; Tue, 22 Oct 2024 08:39: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=@gmail.com header.s=20230601 header.b=ip7kxuCD; 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 8821568DE36; Tue, 22 Oct 2024 18:28:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6C1F68DE20 for ; Tue, 22 Oct 2024 18:28:14 +0300 (EEST) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a9a017a382bso60013066b.3 for ; Tue, 22 Oct 2024 08:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729610894; x=1730215694; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BmwM0pPlZ7DQJvBFe+U/Xu0QLrfqTWlYomlvbG8Ab8c=; b=ip7kxuCDtrwF4YM9AaIo4BmpN+Dcq+Tak6zbFkQO54yHKVrWcdQJ9j+NomufXdGeDn 1yuuDgh+zH+43CPm+ST9Q3AFfz6wp9rGbuul5hi08xBuEdkrMF8aVkax3vfauBXg1DPn uOEiKlWJb0ZkMRPaGzNJT1Ocd+7QhI0NAL37SrAJMDAWY6x1rRnE/r2/G3nQW55XptzV Drg4v65J5Z5B0y7pUOC6xdhILYdWocmNUm2cc9pfna9kQGjQ3xH4mgBylH8PO7rbJVgo ougrMmV1DxgCWrXnypFnod5Q/D1bmHDChG2YsCGTEHORF5ComWh4v/mKnheOtou5SSQ6 ap8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729610894; x=1730215694; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BmwM0pPlZ7DQJvBFe+U/Xu0QLrfqTWlYomlvbG8Ab8c=; b=hfKr9sA1wYBUewv6k6xYVanluJkxN4RnQUTvtaucd2Sewl+tBqBaiutzNp7kLgPy+H 9L9QtWucHijYODMshveiw4drXMmKdTBIE+RY8stMbmMMJhUr/osNX/ZmOMMC4DBM3cWZ rQj7gPeufNEtkzT80dGzW39JHwPOauwjMX1rg09UjwVmuP93CmxDCiAjBBLy/4pJIFL+ SxzAhaDBr4j5ZfxlB00yeSCtTVXQ4wfnWoX1vkeYkGbonyn84bP86vA8wGMMfGHGUNOa Ggnw9HR+rpUnnYnEm+We9jOrVC+vjCi+e+1MPUQul/smgUNGhhoL3S1eiWlaIGiUw9Jl ElNw== X-Gm-Message-State: AOJu0YyjfvAoMdx8oC3fc3PJ8OOjGUOZXx+SdPAG6PPh39qSN2ZK22k+ 4BVkQTaHKLVHxak48Cmv0mpwv8A+3N2Lkm7QCuCTbDdx73PhfPxuGgdKyw== X-Received: by 2002:a17:907:728c:b0:a9a:66ca:999a with SMTP id a640c23a62f3a-a9a695dc6f7mr665782466b.0.1729610893541; Tue, 22 Oct 2024 08:28:13 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 08:28:13 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 17:26:59 +0200 Message-ID: <20241022152734.534546-2-nowrep@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022152734.534546-1-nowrep@gmail.com> References: <20241022152734.534546-1-nowrep@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/vaapi_encode_h265: Use 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: l9EZoEbW3I4X This is needed to correctly set conformance window crop with Mesa AMD. --- libavcodec/vaapi_encode_h265.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 2283bcc0b4..0f97c9188b 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -951,8 +951,16 @@ static av_cold int vaapi_encode_h265_get_encoder_caps(AVCodecContext *avctx) "min CB size %dx%d.\n", priv->ctu_size, priv->ctu_size, priv->min_cb_size, priv->min_cb_size); - base_ctx->surface_width = FFALIGN(avctx->width, priv->min_cb_size); - base_ctx->surface_height = FFALIGN(avctx->height, priv->min_cb_size); + if (priv->common.surface_alignment_width && + priv->common.surface_alignment_height) { + base_ctx->surface_width = + FFALIGN(avctx->width, priv->common.surface_alignment_width); + base_ctx->surface_height = + FFALIGN(avctx->height, priv->common.surface_alignment_height); + } else { + base_ctx->surface_width = FFALIGN(avctx->width, priv->min_cb_size); + base_ctx->surface_height = FFALIGN(avctx->height, priv->min_cb_size); + } base_ctx->slice_block_width = base_ctx->slice_block_height = priv->ctu_size;