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 86CFA4CC39
for <ffmpegdev@gitmailbox.com>; Sat, 12 Apr 2025 07:25:11 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D2F968C6B9;
Sat, 12 Apr 2025 10:23:21 +0300 (EEST)
Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D5C468C53B
for <ffmpeg-devel@ffmpeg.org>; Sat, 12 Apr 2025 10:23:02 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed;
h=Message-ID:Date:Subject:To:From; t=1744442581; bh=7DYLUqqPOw1F2QhWzk9edtq
zaAKm8/3Mq4M5VSEjlmQ=; b=La9+boYEaA/vZplab7rFP8xEAOMIM+P2ORzLv03cnbcv52VDaL
VDyZGfxubaBb8iXs140AVTg2NmsJQoWmjHFPxxBxiI1OXxw2NJVxWiW/xWWcsCmx3EWFl3oobHX
7OXS25j36EYGhjo1+QcjjmoRi0BR0bhKH3hR2olxpttgI6btYJ/40yCpLwvUwkMGha0zKrdo+cr
nLuAbuiHcSAlA9kmebpZRswMA8Cd4eYIzaj7/B9OVVT7qQz4kpAnE1RICTbnTpWzR1osx3ZIPD2
1+ta1azJ9fsXHeKuKgJFp+I8e6i0sHXGVe3z3fp7cRMSXIpA09Lr/Wr53ytdKxO7Tsw==;
DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed;
h=Message-ID:Date:Subject:To:From; t=1744442581; bh=7DYLUqqPOw1F2QhWzk9edtq
zaAKm8/3Mq4M5VSEjlmQ=; b=j9Ji6V1MOyAaOGHDKoIi5cbNln7kVW7wrn9tjsqgD0GmGeH5DZ
t5AetwOc0lSvupdaPAb+gvRKzImejLciPRDA==;
From: Lynne <dev@lynne.ee>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 12 Apr 2025 09:22:42 +0200
Message-ID: <20250412072256.77815-11-dev@lynne.ee>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250412072256.77815-1-dev@lynne.ee>
References: <20250412072256.77815-1-dev@lynne.ee>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 11/18] vulkan_ffv1: fix left-2 sample
addressing
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: Lynne <dev@lynne.ee>
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/20250412072256.77815-11-dev@lynne.ee/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Typo.
Not enough to fix context=1, but its a start.
---
libavcodec/vulkan/ffv1_dec.comp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/libavcodec/vulkan/ffv1_dec.comp b/libavcodec/vulkan/ffv1_dec.comp
index 7d3150ed63..1954c050f8 100644
--- a/libavcodec/vulkan/ffv1_dec.comp
+++ b/libavcodec/vulkan/ffv1_dec.comp
@@ -44,15 +44,17 @@ ivec2 get_pred(ivec2 pos, ivec2 off, int p, int sw, uint8_t quant_table_idx)
if ((quant_table[quant_table_idx][3][127] != 0) ||
(quant_table[quant_table_idx][4][127] != 0)) {
+ TYPE cur2 = TYPE(0);
if (off.x > 0 && off != ivec2(1, 0)) {
const ivec2 yoff_border2 = off.x == 1 ? ivec2(1, -1) : ivec2(0, 0);
- TYPE cur2 = TYPE(imageLoad(dst[p], pos + ivec2(-2, 0) + yoff_border2)[0]);
- base += quant_table[quant_table_idx][3][(cur2 - cur) & MAX_QUANT_TABLE_MASK];
- }
- if (off.y > 1) {
- TYPE top2 = TYPE(imageLoad(dst[p], pos + ivec2(0, -2))[0]);
- base += quant_table[quant_table_idx][4][(top2 - top[1]) & MAX_QUANT_TABLE_MASK];
+ cur2 = TYPE(imageLoad(dst[p], pos + ivec2(-2, 0) + yoff_border2)[0]);
}
+ base += quant_table[quant_table_idx][3][(cur2 - cur) & MAX_QUANT_TABLE_MASK];
+
+ TYPE top2 = TYPE(0);
+ if (off.y > 1)
+ top2 = TYPE(imageLoad(dst[p], pos + ivec2(0, -2))[0]);
+ base += quant_table[quant_table_idx][4][(top2 - top[1]) & MAX_QUANT_TABLE_MASK];
}
/* context, prediction */
--
2.47.2
_______________________________________________
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".