From patchwork Sun Apr 7 13:54:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1997563pzd; Sun, 7 Apr 2024 06:53:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhQqXL+hVqme3Efw6wVgQo5h6NmEspJQhogMAp0M+jF0BngNMA926nEuFgxwN6i9ZSdp1NyIixhaSeG9ZVd9y7J9HdoXhonH//7g== X-Google-Smtp-Source: AGHT+IEjXc0vGEA/WiZY/CfcvJ2VwkUrkcJgZxxLKcwGvyRZNrBqetJ7rF25hpu7nN2wPtmoZhKm X-Received: by 2002:a19:ca1e:0:b0:516:a213:46d2 with SMTP id a30-20020a19ca1e000000b00516a21346d2mr4443848lfg.69.1712498032011; Sun, 07 Apr 2024 06:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712498031; cv=none; d=google.com; s=arc-20160816; b=Ltn1BhQ+mIvq5TDxeQfW6b5utcEbLtlZnP+Gr6xDVSRCHcO7DLUN5kpE+8n8fhhuKa d7M37NjP4K7dQfupFIdLqJ1vqigIcKDfUMTQKAaqjJ8ggXMSQFPlX2xQVuoyGr8L7tEJ B6WYsCYC/w/CFuZYKdI9RKYCXodTZRAWX0gLBrdPS/yngC3Mt49KMoG57E7urZQUvscQ Tw7VIdsdNvZV7OWfbtgHaRNRovSKNI+uxaAxi2O5nIOD6QF6EU8KUtdgKv3Yq03p9Z7k OppcHll1Tft9/uAAVLh/hXT/+cJABStgD77vF0iyDGYAJs6uP32+TnMesd2MzQ0w4+ch b4uQ== 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=i7fS8HizATx8r3qb1YPMOq4lLNJy6zYE+getfJGtkn4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=UwzDi3nCkjbg0hIxMCGvguvGTbX1C/P5MkaANswYRGgDSloofuK5FQkz8bNtbwfyxn Oq0eZRtdd2azlklh5H5GRvlk2U5/Y0R+LjPdL/JJRzK6NgU2YAaoqHt9PM/G3mmcrVNS Qu46i3CDCvb0olYZtvEJvJUDJVGLzUwu6EaCp4M4TDatoBF89/T4R7oCf0Wxp6FK37vV v3niiD7e0cWluEtk/L54xor8PghoCsg69sr+FR0ZeKDcYbCQ4V4QYCaf1EhNA/96RKIg AoQBF5KFl8iYAH1N2O0goMQhYwqKt0Px4GfDmZgSrx+8CgeBynPkD0CFDt9H6+3sVdNr /4CA==; 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=CbrVJZzq; 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 ga33-20020a1709070c2100b00a51cf7066cesi563610ejc.482.2024.04.07.06.53.51; Sun, 07 Apr 2024 06:53:51 -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=CbrVJZzq; 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 804FD68D1FA; Sun, 7 Apr 2024 16:53:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91F3568CB2B for ; Sun, 7 Apr 2024 16:53:43 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4162b74f2a1so21385165e9.3 for ; Sun, 07 Apr 2024 06:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712498023; x=1713102823; 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=G/1I/vB6nozMzJ+VtNjBOIeFRiNLFPZC1mial9jXtO8=; b=CbrVJZzqXXI7qVyC7LPwvppZ658j/g6ARFR8dj583YLcIVwK6cFiDRFkrMxu9lxZst Z3Lvy5kXVetOEvjbW9hJvzLous/JgZNwV0517V42/Adq0dVEXViz42HmohNDlEg9/7ze GYMZoB3ButmpwW/37F90T+GgXfD9TJmUNZYcK6mOwdkQZNde2mp0340m7bw9uWKdQl3S vQeR+U9po0EoGGEyj4CtQ36u0FXwFEAdjlq87FRPb11S88TY0e19+QDFpbJVIVWBa4gL VqPc2Z2bSTvnjtmSiRv8SiKf2uQtyDbHE75Tw8p8ezEGv7P5wskID5pnj9zWqGj4nxM2 S+jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712498023; x=1713102823; 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=G/1I/vB6nozMzJ+VtNjBOIeFRiNLFPZC1mial9jXtO8=; b=ZJdmikU26nRFToObMVz7MTzUQoD4JLwS7VvqiNRiV+fVmgh18QJ3mHJqiil6d1EM8R ayOppT1ghQQpAN6slmSITmi2NXiUTyvUe6Bf94xU8U0zU3yU7KzjI0NLh+vIb1hxlBCm 6ZMlEOaQ0OHbvbe/3AbOeT+AjfppZqxzfp5H9oReMUl6YxJ6RA25cl+hJeBWOsiyoHUC 4AfWqnDKMkPG9nwxMR6UzKigJLiwOK8+/sEArWYYNCcoBln0dTra0c00IO0or0poh+yb dIQvD4TIdKUAHgQAIKySBF98umuXWVaxs2TlCUdWeQTyE5Z17oPpdASuhGNF41hyhdTH 2GcQ== X-Gm-Message-State: AOJu0YwWzKuRz9elan7IOQgucwenpIMFPFDJ0EpwKoZXRzJVNBcrTIaI HkLwLwyw0+6sPX/IQYaleYcyYnBmapclOiOgFCiMHqU7p7xV0kFjIM5Yr2SNEocVzFHYQQl2w9r p X-Received: by 2002:a05:600c:3b1b:b0:416:69cf:d633 with SMTP id m27-20020a05600c3b1b00b0041669cfd633mr524371wms.41.1712498022590; Sun, 07 Apr 2024 06:53:42 -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 j15-20020a05600c190f00b004162b7af645sm12360222wmq.10.2024.04.07.06.53.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 07 Apr 2024 06:53:42 -0700 (PDT) Message-ID: Date: Sun, 7 Apr 2024 14:54:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <784d0f98-8da0-4aa5-bbae-7eb7e4db18a9@jkqxz.net> In-Reply-To: <784d0f98-8da0-4aa5-bbae-7eb7e4db18a9@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/vulkan_av1: Use av1dec reference order hint information 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: MYYqIeGHMw9F --- libavcodec/vulkan_av1.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index c9e398eaec..8cca97c005 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -242,7 +242,6 @@ static int vk_av1_start_frame(AVCodecContext *avctx, const AV1RawFrameHeader *frame_header = s->raw_frame_header; const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain; - CodedBitstreamAV1Context *cbs_ctx = (CodedBitstreamAV1Context *)(s->cbc->priv_data); const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain; @@ -272,7 +271,7 @@ static int vk_av1_start_frame(AVCodecContext *avctx, ap->ref_frame_sign_bias_mask = 0x0; for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++) - ap->ref_frame_sign_bias_mask |= cbs_ctx->ref_frame_sign_bias[i] << i; + ap->ref_frame_sign_bias_mask |= pic->ref_frame_sign_bias[i] << i; for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) { const int idx = pic->raw_frame_header->ref_frame_idx[i]; @@ -294,7 +293,7 @@ static int vk_av1_start_frame(AVCodecContext *avctx, err = vk_av1_fill_pict(avctx, &ap->ref_src[ref_count], &vp->ref_slots[ref_count], &vp->refs[ref_count], &ap->std_refs[ref_count], &ap->vkav1_refs[ref_count], - ref_frame, 0, 0, cbs_ctx->ref[idx].saved_order_hints); + ref_frame, 0, 0, ref_frame->saved_order_hints); if (err < 0) return err;