This makes left_bits return useful data rather than overflowing, and
also saves some 64-bit integer operations, which is still always a plus sadly.
---
libavcodec/vulkan/common.comp | 22 +++++++++++-----------
libavcodec/vulkan/ffv1_dec_setup.comp | 2 +-
libavcodec/vulkan/ffv1_vlc.comp | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp
index 10af9c0623..6825693fa3 100644
--- a/libavcodec/vulkan/common.comp
+++ b/libavcodec/vulkan/common.comp
@@ -193,8 +193,8 @@ struct GetBitContext {
uint64_t buf_end;
uint64_t bits;
- uint bits_valid;
- uint size_in_bits;
+ int bits_valid;
+ int size_in_bits;
};
#define LOAD64() \
@@ -216,11 +216,11 @@ struct GetBitContext {
gb.bits_valid += 32; \
}
-void init_get_bits(inout GetBitContext gb, u8buf data, uint64_t len)
+void init_get_bits(inout GetBitContext gb, u8buf data, int len)
{
gb.buf = gb.buf_start = uint64_t(data);
gb.buf_end = uint64_t(data) + len;
- gb.size_in_bits = uint(len) * 8;
+ gb.size_in_bits = len * 8;
/* Preload */
LOAD64()
@@ -237,7 +237,7 @@ bool get_bit(inout GetBitContext gb)
return val;
}
-uint get_bits(inout GetBitContext gb, uint n)
+uint get_bits(inout GetBitContext gb, int n)
{
if (n == 0)
return 0;
@@ -251,7 +251,7 @@ uint get_bits(inout GetBitContext gb, uint n)
return val;
}
-uint show_bits(inout GetBitContext gb, uint n)
+uint show_bits(inout GetBitContext gb, int n)
{
if (n > gb.bits_valid)
RELOAD32()
@@ -259,7 +259,7 @@ uint show_bits(inout GetBitContext gb, uint n)
return uint(gb.bits >> (64 - n));
}
-void skip_bits(inout GetBitContext gb, uint n)
+void skip_bits(inout GetBitContext gb, int n)
{
if (n > gb.bits_valid)
RELOAD32()
@@ -268,12 +268,12 @@ void skip_bits(inout GetBitContext gb, uint n)
gb.bits_valid -= n;
}
-uint tell_bits(in GetBitContext gb)
+int tell_bits(in GetBitContext gb)
{
- return uint(gb.buf - gb.buf_start) * 8 - gb.bits_valid;
+ return int(gb.buf - gb.buf_start) * 8 - gb.bits_valid;
}
-uint left_bits(in GetBitContext gb)
+int left_bits(in GetBitContext gb)
{
- return gb.size_in_bits - uint(gb.buf - gb.buf_start) * 8 + gb.bits_valid;
+ return gb.size_in_bits - int(gb.buf - gb.buf_start) * 8 + gb.bits_valid;
}
diff --git a/libavcodec/vulkan/ffv1_dec_setup.comp
b/libavcodec/vulkan/ffv1_dec_setup.comp
index 671f28e7e7..5da09df21c 100644
--- a/libavcodec/vulkan/ffv1_dec_setup.comp
+++ b/libavcodec/vulkan/ffv1_dec_setup.comp
@@ -107,7 +107,7 @@ void golomb_init(inout SliceContext sc)
uint64_t ac_byte_count = sc.c.bytestream - sc.c.bytestream_start - 1;
init_get_bits(sc.gb, u8buf(sc.c.bytestream_start + ac_byte_count),
- sc.c.bytestream_end - sc.c.bytestream_start - ac_byte_count);
+ int(sc.c.bytestream_end - sc.c.bytestream_start -
ac_byte_count));
}
void main(void)
diff --git a/libavcodec/vulkan/ffv1_vlc.comp b/libavcodec/vulkan/ffv1_vlc.comp
index d374e5a069..32a6ca9f37 100644
--- a/libavcodec/vulkan/ffv1_vlc.comp
+++ b/libavcodec/vulkan/ffv1_vlc.comp
@@ -121,7 +121,7 @@ Symbol get_vlc_symbol(inout VlcState state, int v, int bits)
return set_sr_golomb(code, k, 12, bits);
}
-uint get_ur_golomb(inout GetBitContext gb, uint k, int limit, int esc_len)
+uint get_ur_golomb(inout GetBitContext gb, int k, int limit, int esc_len)
{
for (uint i = 0; i < 12; i++)
if (get_bit(gb))
@@ -130,7 +130,7 @@ uint get_ur_golomb(inout GetBitContext gb, uint k, int
limit, int esc_len)
return get_bits(gb, esc_len) + 11;
}
-int get_sr_golomb(inout GetBitContext gb, uint k, int limit, int esc_len)
+int get_sr_golomb(inout GetBitContext gb, int k, int limit, int esc_len)
{
int v = int(get_ur_golomb(gb, k, limit, esc_len));
return (v >> 1) ^ -(v & 1);
--
2.50.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-requ...@ffmpeg.org with subject "unsubscribe".
