PR #21006 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21006 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21006.patch
Avoids checks and makes the calls cheaper. >From 80e08342c55da43b58e49da40674d1e89e1a08e2 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 24 Nov 2025 17:45:36 +0100 Subject: [PATCH] avcodec/cbs_apv: Use ff_cbs_{read,write}_simple_unsigned() Avoids checks and makes the calls cheaper. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/cbs_apv.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
