The branch, master has been updated
via f0f7834726286dab911c27f9d7efc58ba93382d3 (commit)
from 7018ce14df7b0f1094ef8e21f7154c5c0c513588 (commit)
- Log -----------------------------------------------------------------
commit f0f7834726286dab911c27f9d7efc58ba93382d3
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Mon Nov 24 17:45:36 2025 +0100
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 14:00:45 2025 +0000
avcodec/cbs_apv: Use ff_cbs_{read,write}_simple_unsigned()
Avoids checks and makes the calls cheaper.
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c
index a1e546c92e..7a06244c69 100644
--- a/libavcodec/cbs_apv.c
+++ b/libavcodec/cbs_apv.c
@@ -67,8 +67,6 @@ static void cbs_apv_derive_tile_info(CodedBitstreamContext
*ctx,
#define u(width, name, range_min, range_max) \
xu(width, name, current->name, range_min, range_max, 0, )
-#define ub(width, name) \
- xu(width, name, current->name, 0, MAX_UINT_BITS(width), 0, )
#define us(width, name, range_min, range_max, subs, ...) \
xu(width, name, current->name, range_min, range_max, subs, __VA_ARGS__)
#define ubs(width, name, subs, ...) \
@@ -86,6 +84,12 @@ static void cbs_apv_derive_tile_info(CodedBitstreamContext
*ctx,
#define RWContext GetBitContext
#define FUNC(name) cbs_apv_read_ ## name
+#define ub(width, name) do { \
+ uint32_t value; \
+ CHECK(CBS_FUNC(read_simple_unsigned)(ctx, rw, width, #name, \
+ &value)); \
+ current->name = value; \
+ } while (0)
#define xu(width, name, var, range_min, range_max, subs, ...) do { \
uint32_t value; \
CHECK(CBS_FUNC(read_unsigned)(ctx, rw, width, #name, \
@@ -106,6 +110,7 @@ static void cbs_apv_derive_tile_info(CodedBitstreamContext
*ctx,
#undef READWRITE
#undef RWContext
#undef FUNC
+#undef ub
#undef xu
#undef infer
#undef byte_alignment
@@ -117,6 +122,11 @@ static void cbs_apv_derive_tile_info(CodedBitstreamContext
*ctx,
#define RWContext PutBitContext
#define FUNC(name) cbs_apv_write_ ## name
+#define ub(width, name) do { \
+ uint32_t value = current->name; \
+ CHECK(CBS_FUNC(write_simple_unsigned)(ctx, rw, width, #name, \
+ value)); \
+ } while (0)
#define xu(width, name, var, range_min, range_max, subs, ...) do { \
uint32_t value = var; \
CHECK(CBS_FUNC(write_unsigned)(ctx, rw, width, #name, \
@@ -142,6 +152,7 @@ static void cbs_apv_derive_tile_info(CodedBitstreamContext
*ctx,
#undef READWRITE
#undef RWContext
#undef FUNC
+#undef ub
#undef xu
#undef infer
#undef byte_alignment
-----------------------------------------------------------------------
Summary of changes:
libavcodec/cbs_apv.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]