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 9BC684D3F3
for <ffmpegdev@gitmailbox.com>; Thu, 17 Apr 2025 23:56:34 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76EB6687DE8;
Fri, 18 Apr 2025 02:56:05 +0300 (EEST)
Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com
[209.85.218.53])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B8AF687DE4
for <ffmpeg-devel@ffmpeg.org>; Fri, 18 Apr 2025 02:55:59 +0300 (EEST)
Received: by mail-ej1-f53.google.com with SMTP id
a640c23a62f3a-aca99fc253bso212535166b.0
for <ffmpeg-devel@ffmpeg.org>; Thu, 17 Apr 2025 16:55:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744934158; x=1745538958; 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=Wd3s4X+DEjME//WnPa6/7MWVPVjWRB0XB3ksU3SMn3I=;
b=Cknkx5Pw6mpWgbq7jo6WlzUd1Z3Gfyej978u7m2vmfY3ce2g4X28e+JJadH9CprKQX
mXypdawyqKyDOKqoQ6VEwNwK1ztqJy/F94fhLiv1C0/9CmkkyWPmYtdiibwn5mmAnnk9
Etgpk/Zl2iROdvF0U/ljOeoMWH57vnElJyKlAA2IJqH/0WxmTKdG4cBj9bajH66sjecl
zFFFhA2dtnYF/G+yspSyrpJI512tvEBLmBukb/lOTRSPt4JDjQHXgOGQMgEkvUV9gd/N
dqShBYrN4pXgt6jD4NfNMo+hrxEDA7ooX1xu/s4SeMhBsY0KDDO/VLovx+0l0HMm01Mg
xO8A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744934158; x=1745538958;
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=Wd3s4X+DEjME//WnPa6/7MWVPVjWRB0XB3ksU3SMn3I=;
b=AsdgWQFYqqnOvR01NKljr8zYi5MZlrpvdpN0LYNxBQ1JLQKq4/p8kE2kfguo0uarYQ
NEtjU7mZd+AUonfmZINHH+VVzyfxt/alKiG+qfPczBHjcffQHwon8K3Oxbc4/lQecbyO
W7v/hVNDt+zO56Jbr690B5Lp2ik8BpnAH72ukyPOBEQXT5HL7y/pAp1L8OhK0o3XfUiT
sGD3JtVaSTkGMltq3GpLIOdPPp6HSz9m2pDZCA9L+ArY/sRb+rpayhJIfZvicjwxTYfz
B6C8UugoiephpmE5NKAVjkXo72rz1Aa3ZOOTU9jNCXElb14uitYYOQttIxdtXQvboiSB
OGtw==
X-Gm-Message-State: AOJu0YzBjOdvWpy8aZPrCDQ2uu353+jCHknGqbEGdeW3qxPNcFnPfrEr
uEskeGt7b4T+rvxQ/hP+ZYEyZRhfypaQ0e6xV43Dj1ZsO+kjSdxeVVHNbcPH
X-Gm-Gg: ASbGncuSYZTHhVc5U1pACA9oElt+j74SSZzJQmhi49TF8EurG1T2q/JD9HMSZh00Fda
ec5Wz+tEZ3DAGQntFCxMRrappr9Caicy+2HhmiuoKvLpcsKo3gjsuMlI3fMsAMKbSq5WvxuwpGy
pAyRSFWTVZDlzdNOlBdAb5koomhSakqSfC6oYuTtr76vd9beroKwEpBVXx3BPixRPX4REukZVju
jOvByIbLOhAcRIP6CrkLffQfECeMctgb8ogL/3ewHeR+lMH3wzomE1MNdG97mkUO7zwwxWhIm5s
QN8Gtq0PtYcgepg5/BrOQx9ftmYwPzFeKDP8AP/GU0lV00swZRnYlGdoZQSyKgNuWoKN7eF2PZk
FmMS0X8HuI84bKjcMLe/QqzRdtPN/aEa8LAR/6eDz7KeD8A==
X-Google-Smtp-Source: AGHT+IGeafoRVt78Mq9TmL5RsC9wbfTLRQI4sPfKgmBEZydomJkWcdH/tGWmvSruInzPN4/nN17ykw==
X-Received: by 2002:a17:907:2d13:b0:acb:7104:353a with SMTP id
a640c23a62f3a-acb74ba6109mr54696666b.34.1744934157892;
Thu, 17 Apr 2025 16:55:57 -0700 (PDT)
Received: from localhost.localdomain (adsl-135.91.140.30.tellas.gr.
[91.140.30.135]) by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-acb6eefcf97sm50763566b.88.2025.04.17.16.55.56
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 17 Apr 2025 16:55:57 -0700 (PDT)
From: IndecisiveTurtle <geoster3d@gmail.com>
X-Google-Original-From: IndecisiveTurtle
<47210458+raphaelthegreat@users.noreply.github.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 18 Apr 2025 02:55:31 +0300
Message-ID: <20250417235543.227108-4-47210458+raphaelthegreat@users.noreply.github.com>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250417235543.227108-1-47210458+raphaelthegreat@users.noreply.github.com>
References: <20250417235543.227108-1-47210458+raphaelthegreat@users.noreply.github.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v3 4/5] 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 <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: IndecisiveTurtle <geoster3d@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/20250417235543.227108-4-47210458+raphaelthegreat@users.noreply.github.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: IndecisiveTurtle <geoster3d@gmail.com>
---
libavcodec/vulkan/common.comp | 54 ++++++++++++++++++++++++++++-------
1 file changed, 44 insertions(+), 10 deletions(-)
diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp
index 10af9c0623..db216a2ac6 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;
};
@@ -61,22 +64,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) \
@@ -167,6 +168,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)
+ {
+ u8vec4buf(pb.buf).v = u8vec4(0xFF);
+ 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);
--
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".