From patchwork Sun Nov 6 12:34:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1529904pzb; Sun, 6 Nov 2022 04:34:51 -0800 (PST) X-Google-Smtp-Source: AMsMyM7b4cgZP0lcvNgag4IlWluxMN7m0PGGUBZXPq6CBWiUbVkK6V5tVJ5napfCwPxXn0/DI4Eu X-Received: by 2002:a05:6402:2285:b0:462:cabf:5a0a with SMTP id cw5-20020a056402228500b00462cabf5a0amr44014510edb.279.1667738091591; Sun, 06 Nov 2022 04:34:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667738091; cv=none; d=google.com; s=arc-20160816; b=mW+MtpHl1Wa38x0JsZPPPUpVkFiqZo9x7FeNyS6bRPTEWYSjnN04oVGinocJ7MskI3 eaqtOpsMkvD3bTkc9t9WnlHV6oD8cf0Ijfiyi4m2xAljkHnzbDZVi+Chv4W6ytG0EPwm sqa/SkdpCMmQ6HOxEor13O41FUcEo8bPNgkU+fS3QXokmrwFWUWrTDFDGq1nGbzDE0FL 4NQ3cWyghOlmTLdG6TEKFtq0VyL8eKa5k5enfUlzGo6fyAfJGZZ54vzH4aif6GETsZNO 6v3L1JHF+J89ThJco34E0eKo0deSPlSrGYb80NH0WW8fN7bivPoxvbEUUVTgBtRRyKg2 qcTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=vaJqWMOwJ1xpdI0fpQ+l67OFYG2W09hlL6Q4/lSIMWs=; b=ykz4JGPePUivGh7anudw79cQiU2E5WsvDBfvQ3vetj2VND0XLnz5ekbIFCee5bUO08 Q5Z9YKEQkWTkC+jMC5Hoqa7g7ithPkIV04sC6QZ9uiW4hDUtVFsm8zN7Sni4xnRf0Zxl xA6rnKNfcDSpUvKkoVMDXDWHx0IzNZF+CAflbznezM/JjONqKfjircNznKQl5PYSQgzH CVo4IWPYS0FOnu25WC09DVheQDkhEN6/CiUud5QIcUUBJLddsHu2H/MSvsu6bcsPLGkE CTnOll+gh0itt26BoLLHDTsSkGFYrNH2Pn733Ndes8AwZmptkdocx46bXs7245TtCXzN 5YBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc13-20020a170907168d00b00781d82a6fc9si6194350ejc.264.2022.11.06.04.34.50; Sun, 06 Nov 2022 04:34:51 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A3C068980E; Sun, 6 Nov 2022 14:34:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 655EB68B612 for ; Sun, 6 Nov 2022 14:34:35 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 578C1C0005 for ; Sun, 6 Nov 2022 12:34:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Nov 2022 13:34:25 +0100 Message-Id: <20221106123430.1668-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221106123430.1668-1-michael@niedermayer.cc> References: <20221106123430.1668-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/bonk: Simplify read_uint_max() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4guj1Pv4IlL/ The max == 0 case can be removed too but i left it as 50% of the cases use it Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 9e8892e4db..04ea4def2f 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; }