[FFmpeg-cvslog] avcodec/bonk: Simplify read_uint_max()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Nov  6 10:34:39 2022 +0100| [9f00286c4c133e1709bfd009b76e91e09ec40843] | committer: Michael Niedermayer

avcodec/bonk: Simplify read_uint_max()

The max == 0 case can be removed too but i left it as 50% of the cases use it

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f00286c4c133e1709bfd009b76e91e09ec40843
---

 libavcodec/bonk.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c
index c3ad80ec73..d2571e56d4 100644
--- a/libavcodec/bonk.c
+++ b/libavcodec/bonk.c
@@ -132,7 +132,6 @@ static av_cold int bonk_init(AVCodecContext *avctx)
 static unsigned read_uint_max(BonkContext *s, uint32_t max)
 {
     unsigned value = 0;
-    int i, bits;
 
     if (max == 0)
         return 0;
@@ -140,15 +139,9 @@ static unsigned read_uint_max(BonkContext *s, uint32_t max)
     if (max >> 31)
         return 32;
 
-    bits = 32 - ff_clz(max);
-
-    for (i = 0; i < bits - 1; i++)
-        if (get_bits1(&s->gb))
-            value += 1 << i;
-
-    if ((value | (1 << (bits - 1))) <= max)
+    for (unsigned i = 1; i <= max - value; i+=i)
         if (get_bits1(&s->gb))
-            value += 1 << (bits - 1);
+            value += i;
 
     return value;
 }