From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 550B84CE48
for <ffmpegdev@gitmailbox.com>; Mon, 14 Apr 2025 14:00:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A543687C91;
Mon, 14 Apr 2025 17:00:28 +0300 (EEST)
Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com
[209.85.221.43])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B4E3687BEC
for <ffmpeg-devel@ffmpeg.org>; Mon, 14 Apr 2025 17:00:21 +0300 (EEST)
Received: by mail-wr1-f43.google.com with SMTP id
ffacd0b85a97d-391295490c8so390667f8f.3
for <ffmpeg-devel@ffmpeg.org>; Mon, 14 Apr 2025 07:00:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744639220; x=1745244020; 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=pIaNSpWw/ICvHvyhFEHgXUwmfdyawSwdGzeUx5PvrLI=;
b=WCTekR7G39VrevZLuFxDtH+qjIKu0y4OD5Yodh7jm24giFN+j8PhdaGVDVIDApqx7t
DriktTcElCPCVyrn+47mEe9KHf7CWurkKk+WuHmpkxX/JijUixrka3TOLAljanjd55mZ
012jQW3jlRwkL8elKGXUofGELJeRHyy5Yx85D0G67I4YM91JJfqX38zRoRPsjXXBgJMa
/BYez4dEBhC94qBW7/7pHUqCcPPvRe2iehzbX7TLrXhhGynXHWpAz+RRdJydeDbEa/e4
RurvI9AURX2sFh/TG/cnZt8pHYcQB6GAq2LR198K5kLhRmk+Jac5UAoq3a0Hpx4aD6D5
/BnA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744639220; x=1745244020;
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=pIaNSpWw/ICvHvyhFEHgXUwmfdyawSwdGzeUx5PvrLI=;
b=nnxXLHPjSnaWc1LtpHvBwEnbqHIH2iPepzBcwAPtZQafHjAM+g8KQuydT6lBP8fsW+
rLsoeydx0mDM/AwWaQKZFleuqKDfOrdjY+s+bTgvCN3KbsDpfye9LWlXMUTmdELwK/jN
SH3PXTWWnhZmki1GzIrTLOtCPVlygIBnM2Pnb43O044AKt7/PRqe8v9wC6XNJRw0gGK9
RigFavjOEfapJ9hwRSvCw3exhkWeIt3qGDLY6I2mBhG9cXfxLKbrtrBstyxXHiAud5zo
ymh88GovtsvXfXXaC4iGWaDp3bmJuLcqAdSAh/JpYeFMOkCn4mD0CPeu3YdF/PfDfIuA
FPVQ==
X-Gm-Message-State: AOJu0YwWw/69tjZwgPIHkNww05Rz4o1RfPPPMOAlDy0Je5SD+7RP4zJd
I2mwvXRHN+wL32oQ6JTezo6WJXLxYIXOcPUO9xwvv3yQUG9h3pQjhmsV2Q==
X-Gm-Gg: ASbGnctcY1d7sLhLq0SsxYH8J71K2+tOqwNzwkYN8s/8IXRY85HRjFkOP08jFVTWCA2
UBjY5dntiRrS1fHflp5ImJzY8PcOAEyIDCO66wd7KtIJwfXFtFw65sboDdmPPP//B7wEmy8WOsK
0GAVtGODYJTsvyFsKDPhEpM18vXsXcT4gNyeEMjQOqNfxYOiUzDz+yyeLeaGX0FwoestwE0MDKq
YWzL11BKRUqolBeI5l6bMYnq9/RDnMOsY7IOrBP73U+v9sd8Xtya1GyKxcqwZeLH0Wtd3F4PCK3
NGhlbfbSmfobIl4yHJf7news8KW4pZcTXL0UrdwrR2U+rqaNqjXZGOAUR8YyG7jSLAsk4cXSIoq
5uygWXOFE7qQP02VKZpOW3A9wzupkNgsF
X-Google-Smtp-Source: AGHT+IFJgu8qp5dk3flm30Mjd6c5tU/k9jvgqnvKSscLIlW7HvhcL9mBSUCHre+ZJzS/DYbCiJcFzQ==
X-Received: by 2002:a05:6000:240e:b0:391:c42:dae with SMTP id
ffacd0b85a97d-39ea52039eemr3686272f8f.4.1744639220063;
Mon, 14 Apr 2025 07:00:20 -0700 (PDT)
Received: from mitsuki..
(p200300cbcf1e9d00ea9c25fffe79145a.dip0.t-ipconnect.de.
[2003:cb:cf1e:9d00:ea9c:25ff:fe79:145a])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-39eae97b249sm11195159f8f.58.2025.04.14.07.00.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 14 Apr 2025 07:00:19 -0700 (PDT)
From: David Rosca <nowrep@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 14 Apr 2025 15:59:20 +0200
Message-ID: <20250414135931.76495-2-nowrep@gmail.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_encode_av1: Fix ref_order_hint
value for second slot
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: David Rosca <nowrep@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250414135931.76495-2-nowrep@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
We always use two slots, even when only one L0 reference is supported
by the driver. However we still need to set the correct value for the
ref_order_hint of the second slot.
Fixes bf9f921ef7 ("avcodec/hw_base_encode: restrict size of next_prev")
---
libavcodec/vaapi_encode_av1.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c
index 1b350cd936..cf0ff53edc 100644
--- a/libavcodec/vaapi_encode_av1.c
+++ b/libavcodec/vaapi_encode_av1.c
@@ -476,6 +476,7 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx,
AV1RawFrameHeader *fh = &fh_obu->obu.frame.header;
VAEncPictureParameterBufferAV1 *vpic = vaapi_pic->codec_picture_params;
CodedBitstreamFragment *obu = &priv->current_obu;
+ CodedBitstreamAV1Context *cbctx = priv->cbc->priv_data;
FFHWBaseEncodePicture *ref;
VAAPIEncodeAV1Picture *href;
int slot, i;
@@ -523,6 +524,8 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx,
fh->ref_frame_idx[3] = href->slot;
fh->ref_order_hint[href->slot] = ref->display_order - href->last_idr_frame;
vpic->ref_frame_ctrl_l0.fields.search_idx1 = AV1_REF_FRAME_GOLDEN;
+ } else {
+ fh->ref_order_hint[!href->slot] = cbctx->ref[!href->slot].order_hint;
}
break;
case FF_HW_PICTURE_TYPE_B:
--
2.49.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".