From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0752C4C1BD for ; Sat, 8 Mar 2025 12:22:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68F9B68F3D9; Sat, 8 Mar 2025 14:22:22 +0200 (EET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EB9168F3A5 for ; Sat, 8 Mar 2025 14:22:16 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43bcad638efso15946295e9.2 for ; Sat, 08 Mar 2025 04:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741436535; x=1742041335; 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=IlZDb1fLUwnosb6LNIcRphkv/lnSJwvFzmc6RfgH85E=; b=b3sOggiF0WsIRf1pKZxT4HS8oSdMNPiiQWNY4GO8xqknG8wjFylFh0h8XTonSAbhL3 i4lvwL7nLkgMrjwHbWEUnzpW7EWR/uoLcFvs63TcqkKwiEzhJd1M3qo6/XpHk6y/nlTG 8vbjrzyAJBfCCBwTcZL7u75pCAupnvu68czkAsVqjtLPehn9eMcXzeb+fNxU4jhv5yJs jcCqT9idVr0RRgan2SuvCeTxvuNDA8+nj/iUaV6P4xUkn8ql8du078esWqMbB+iPQFOx iMQyGg/z9ECyaiKAsmyBbLr28pPD7a0M8Z0xsba8OnyjViVH33Uw3+aC/5rhomq99M42 1wUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741436535; x=1742041335; 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=IlZDb1fLUwnosb6LNIcRphkv/lnSJwvFzmc6RfgH85E=; b=vcY8DG6zHUdxiXEjI2ew0eobBmJExuzJWFI73oeKLn5FfynQcK2blzaKouIoqF56z1 gAtfFByzwmEsYVQbV/jUExJAdI4Xeo06pFjzdyuYb+V5NSdP6IYN9yh13yXaT+CrnHaG sw6WvW/TeLyyv7psX3BDp9kcks0Z9iipQTTPsRoX4F83dW/F3a7Zwbt4QvV99cqvhEIT 4yABp9eNqSket5ZUvPEnmIdSGuC07ynYEykR6afJwbEOvruXLxtmeTsNWXjkmIDNwaKn rIv+pku0ZOW/cSgF8KoL16g0JbCD/D6qhKpEt1t1axUNMP80+DGa6XL/mpVsjAURH6XK miDA== X-Gm-Message-State: AOJu0YwO7OCkJSxDGMdIxe9lx393aEaLBN3Aw+abBdkeLP0ddhVUf2PT eG5URORABKu6xsDgtjM7PN2XFab1saP+oDMcGr3LaO8jJm9/Z73l0fOZfg== X-Gm-Gg: ASbGncvHR6vaQoMddSyiZcmPYowOsH/thd9aUhZkyiBO4s6X4wDpeTB6NoCY+m7eN9a hdvox0ChNHzgCX+LGF/05T1Hd5BCKIE4fuP319KU5j4YTAjdqV4ZZnq87byEAgkXsZleZLgZUYr ixh/MXeicLyVGgcdr+T3F8GeNHZ6ukCZ/a+eXNPhpQuEkg4IzOYZRX477O96QG6sl61SLqo7QoW /7u56FnKn2ys2n9kRp53vzLrs7CaNmzDBepaSKQ8OVMj1ZbDkCmbc2koe/59N43ySFS1zJoednn K8Qctq9guN38zueol8oI3SBkXn0GgGf8m58eIliPpcbjFuOt/QpmhDBm0KJg5ko2eXUxKRiM5aI 8mfsYiPNu5FDBtCoDzdUyCGIk X-Google-Smtp-Source: AGHT+IFlRGBTg4FDXcvc0iz3sP55Opm2z7yX/Ga4TmLANbF8necl7w3UcdCWacOlTRo7fcdPy+WLZg== X-Received: by 2002:a05:600c:1506:b0:43b:bdf4:1c9 with SMTP id 5b1f17b1804b1-43c743cd2admr43231495e9.29.1741436534794; Sat, 08 Mar 2025 04:22:14 -0800 (PST) Received: from localhost.localdomain ([2a02:586:6902:b900:ee24:a2d9:d520:c905]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ce720f93bsm22094505e9.25.2025.03.08.04.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 04:22:13 -0800 (PST) From: IndecisiveTurtle X-Google-Original-From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Mar 2025 14:21:39 +0200 Message-ID: <20250308122140.59850-3-47210458+raphaelthegreat@users.noreply.github.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250308122140.59850-2-47210458+raphaelthegreat@users.noreply.github.com> References: <20250308122140.59850-2-47210458+raphaelthegreat@users.noreply.github.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] libavcodec/vulkan: Add modifications to common shader for VC2 vulkan encoder 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: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/vulkan/common.comp | 58 +++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp index e4e983b3e2..3dc1527529 100644 --- a/libavcodec/vulkan/common.comp +++ b/libavcodec/vulkan/common.comp @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require + layout(buffer_reference, buffer_reference_align = 1) buffer u8buf { uint8_t v; }; @@ -57,22 +60,20 @@ layout(buffer_reference, buffer_reference_align = 8) buffer u64buf { #define mid_pred(a, b, c) \ max(min((a), (b)), min(max((a), (b)), (c))) -/* TODO: optimize */ + uint align(uint src, uint a) { - uint res = src % a; - if (res == 0) - return src; - return src + a - res; + return (src + a - 1) & ~(a - 1); +} + +int align(int src, int a) +{ + return (src + a - 1) & ~(a - 1); } -/* TODO: optimize */ uint64_t align64(uint64_t src, uint64_t a) { - uint64_t res = src % a; - if (res == 0) - return src; - return src + a - res; + return (src + a - 1) & ~(a - 1); } #define reverse4(src) \ @@ -163,6 +164,39 @@ uint32_t flush_put_bits(inout PutBitContext pb) return uint32_t(pb.buf - pb.buf_start); } +void skip_put_bytes(inout PutBitContext pb, int n) +{ + int bytes_left = pb.bit_left >> 3; + if (n < bytes_left) + { + int n_bits = n << 3; + int mask = (1 << n_bits) - 1; + pb.bit_buf <<= n_bits; + pb.bit_buf |= mask; + pb.bit_left -= uint8_t(n_bits); + return; + } + if (pb.bit_left < BUF_BITS) + { + int mask = (1 << pb.bit_left) - 1; + pb.bit_buf <<= pb.bit_left; + pb.bit_buf |= mask; + u32vec2buf(pb.buf).v = BUF_REVERSE(pb.bit_buf); + pb.buf += BUF_BYTES; + n -= pb.bit_left >> 3; + } + int skip_dwords = n >> 2; + while (skip_dwords > 0) + { + u32buf(pb.buf).v = 0xFFFFFFFF; + pb.buf += 4; + skip_dwords--; + } + int skip_bits = (n & 3) << 3; + pb.bit_buf = (1 << skip_bits) - 1; + pb.bit_left = uint8_t(BUF_BITS - skip_bits); +} + void init_put_bits(out PutBitContext pb, u8buf data, uint64_t len) { pb.buf_start = uint64_t(data); @@ -177,8 +211,8 @@ uint64_t put_bits_count(in PutBitContext pb) return (pb.buf - pb.buf_start)*8 + BUF_BITS - pb.bit_left; } -uint32_t put_bytes_count(in PutBitContext pb) +int32_t put_bytes_count(in PutBitContext pb) { uint64_t num_bytes = (pb.buf - pb.buf_start) + ((BUF_BITS - pb.bit_left) >> 3); - return uint32_t(num_bytes); + return int32_t(num_bytes); } -- 2.48.1 _______________________________________________ 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".