From patchwork Tue Oct 24 15:04:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44348 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp2122906pzb; Tue, 24 Oct 2023 08:05:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZuZDbpubwVMblhTw436KJp6W+lvJWXyKNL4K5+fMmo5WXLfLHFuJ3NkiZtIui2m3+0V5P X-Received: by 2002:ac2:5198:0:b0:503:3781:ac32 with SMTP id u24-20020ac25198000000b005033781ac32mr8498356lfi.41.1698159921234; Tue, 24 Oct 2023 08:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698159921; cv=none; d=google.com; s=arc-20160816; b=McSTKuHCU18fG1lQeujcQb1XqTvvubpPxHkf/VY2vbR77spcCqeo0kVkWscK42xk7n 5ymo1B5o0qb24WeNK4fKeugwcDK0lUV7uGGopOvB4mX+GenC8ZGOZkuPhs0T2jbMgtaD XjzFECK1lh5YE/teU/F91lAa356emnmn7lkQf0KOX6H1PVjdcbTE/sXhefGey5j4d6+c SYNqMVyW4wL5x7qQ2bmS1kmQxgSw6NE0M9xhhmSuIhCwDrXNdqYbIj1bxpdCr3EaZLz4 S/yiWeqWwzf+JoGeFKp4NKVVhyNX5SBMaA34CHHpAzB2fUM4xl6J9BWFzRaIcA2VjUxY xLtA== 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=dbR9Qnd49Bt6QpAwEWrLlFzUVGHh+qKZz8GAndWkwIo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=PcHZfHL+/x8nDzoEDH0eyityDU03HBr2ly1X+1vcfkJv3tfpl0x4nVwFQ5eA6ggGgt hkTvINF7FT5pF/r+j1aBqhXtTuNndbmB4id4PKOMvZ1iw5Er4oUiDqK+e5kjtn2IzKWo KRywNxfUVLQJaew7YdA1eoNT4N9ZF6Sav1gNvUTslMwGnpXnLxWkRBEBjK4OtOfN50d4 F1C6yw7MYrdYgZU1GN6jEy72oINSnUhU/IWTEkG4uo2KuHymrpQcbixrXWJExIh0tWIz RmV1ugW8GZs3X9Rl2s+mARsa6keAzDDIeYGWPYUENCRGORMmpZ/0ZQRpNsYCk8nZQuMx Td9w== 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 v17-20020a50a451000000b005403d3931f8si2733573edb.522.2023.10.24.08.05.09; Tue, 24 Oct 2023 08:05:21 -0700 (PDT) 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 1009E68CA3B; Tue, 24 Oct 2023 18:04:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 672B768C9D6 for ; Tue, 24 Oct 2023 18:04:45 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C523360003 for ; Tue, 24 Oct 2023 15:04:44 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 24 Oct 2023 17:04:41 +0200 Message-Id: <20231024150443.7438-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231024150443.7438-1-michael@niedermayer.cc> References: <20231024150443.7438-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/get_bits: Avoid 2nd bitstream read in GET_VLC() if bits are known at build and small 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: Oo+CsL6sKuSb Signed-off-by: Michael Niedermayer --- libavcodec/get_bits.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index cfcf97c021c..86cea00494a 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -581,8 +581,12 @@ static inline const uint8_t *align_get_bits(GetBitContext *s) n = table[index].len; \ \ if (max_depth > 1 && n < 0) { \ - LAST_SKIP_BITS(name, gb, bits); \ - UPDATE_CACHE(name, gb); \ + if (av_builtin_constant_p(bits <= MIN_CACHE_BITS/2) && bits <= MIN_CACHE_BITS/2) { \ + SKIP_BITS(name, gb, bits); \ + } else { \ + LAST_SKIP_BITS(name, gb, bits); \ + UPDATE_CACHE(name, gb); \ + } \ \ nb_bits = -n; \ \