From patchwork Thu Sep 7 19:27:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Gisquet X-Patchwork-Id: 43644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp35362pzb; Thu, 7 Sep 2023 12:27:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhfk3zo3bk39eN7+07L5+dPT5daD/X2JDonA+W1uanPFrxkncgwR62b2Yqv1oi9gY5J4kz X-Received: by 2002:aa7:c3d6:0:b0:52a:1d54:2530 with SMTP id l22-20020aa7c3d6000000b0052a1d542530mr191569edr.27.1694114873594; Thu, 07 Sep 2023 12:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694114873; cv=none; d=google.com; s=arc-20160816; b=hjusRqn/rO3cCbB7O5rKbfRFJ+1ss3lmScB8yVDeGrmG5nr6Jh5VVvaxovxeUJAbJn aJkbDLGHL3ZonLNw5++UdAta0F4qNMBAmKBlKSKa1pHr0kmLTB/jnPVSN7npLS3njLEp XAOqvTG+UrSYdTg2FELVcMxjm8zmFKyNl9MJxjG9VLlL/+2z2zxIk4hcacssTR25uQPy JGKS/MsoGknDxlDcZ6v6EP4PfoXyWGh7lBeLZo1dKKbKibuqZK7v0ZvZMwNKMz5ByB1R esL3GHXLku6PlTDdORurO0iaJxjdS51LZdi6dJywFM4LNUxjJNOJYeOHbD8YzcmK/Mbw Eylg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=UrEnn4ct+pK1/kUpEJQfsiTlCLySbWpEbqgTnJNx1Ek=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xraynsBoRHPjDxyxwouRTzd8i1LdQgSJ1ye0iahMcksduO5qXYrFniS8AOIFarQLTe u9Bw9ovfGmdiUOe3QhbhLUt5fHvGEHnCFNz92tvLCJbi4u5hCqBgMLI/Z/dn2u8E7YsX Eb8KHGHgBBvd/pxTJJmX0JxxRlzWs02hxl7jAM6PJOx2MUzD679DhYetkADHgJ56V8xr E81FCZxMAM32qmT6Lk+yPl72RPVIwxhudQCu5CGR6K+QgZ0lc26UTFYS4PQRU5vHtF+Z gr+u4exv7Gxzn/UB3+FSeGIdnfiqArgStIROb8sxT6TbsvzM7RJ7fJ/sK+LhqcpgulQz YtYw== 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o10-20020a056402038a00b005255db6966bsi143861edv.621.2023.09.07.12.27.52; Thu, 07 Sep 2023 12:27:53 -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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3991168C683; Thu, 7 Sep 2023 22:27:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BF5A68C683 for ; Thu, 7 Sep 2023 22:27:32 +0300 (EEST) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:8a7:6440:a506:2525:387f:fe6d]) (Authenticated sender: christophe.gisquet@free.fr) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 23E48780504 for ; Thu, 7 Sep 2023 21:27:31 +0200 (CEST) From: Christophe Gisquet To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 21:27:20 +0200 Message-ID: <20230907192721.50459-2-christophe.gisquet@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907192721.50459-1-christophe.gisquet@gmail.com> References: <20230907192721.50459-1-christophe.gisquet@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] Expose and start using skip_remaining 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Y+rZLIJdPiYj Bitstream readers sometimes have already checked there are enough bits, and the check is redundant. --- libavcodec/bitstream.h | 8 +++++--- libavcodec/bitstream_template.h | 22 +++++++++++----------- libavcodec/get_bits.h | 1 + 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 35b7873b9c..dd043fb349 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -95,6 +95,7 @@ # define bits_peek_signed bits_peek_signed_le # define bits_peek_signed_nz bits_peek_signed_nz_le # define bits_skip bits_skip_le +# define bits_skip_remaining bits_skip_remaining_le # define bits_seek bits_seek_le # define bits_align bits_align_le # define bits_read_xbits bits_read_xbits_le @@ -124,6 +125,7 @@ # define bits_peek_signed bits_peek_signed_be # define bits_peek_signed_nz bits_peek_signed_nz_be # define bits_skip bits_skip_be +# define bits_skip_remaining bits_skip_remaining_be # define bits_seek bits_seek_be # define bits_align bits_align_be # define bits_read_xbits bits_read_xbits_be @@ -146,7 +148,7 @@ n = table[index].len; \ \ if (max_depth > 1 && n < 0) { \ - bits_skip(bc, bits); \ + skip_remaining(bc, bits); \ \ nb_bits = -n; \ \ @@ -154,7 +156,7 @@ level = table[index].level; \ n = table[index].len; \ if (max_depth > 2 && n < 0) { \ - bits_skip(bc, nb_bits); \ + skip_remaining(bc, nb_bits); \ nb_bits = -n; \ \ index = bits_peek(bc, nb_bits) + level; \ @@ -163,7 +165,7 @@ } \ } \ run = table[index].run; \ - bits_skip(bc, n); \ + skip_remaining(bc, n); \ } while (0) #endif /* AVCODEC_BITSTREAM_H */ diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index 0308e3a924..3f90fc6a07 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -175,7 +175,7 @@ static inline uint64_t BS_FUNC(priv_val_show)(BSCTX *bc, unsigned int n) #endif } -static inline void BS_FUNC(priv_skip_remaining)(BSCTX *bc, unsigned int n) +static inline void BS_FUNC(skip_remaining)(BSCTX *bc, unsigned int n) { #ifdef BITSTREAM_TEMPLATE_LE bc->bits >>= n; @@ -192,7 +192,7 @@ static inline uint64_t BS_FUNC(priv_val_get)(BSCTX *bc, unsigned int n) av_assert2(n > 0 && n < 64); ret = BS_FUNC(priv_val_show)(bc, n); - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); return ret; } @@ -375,7 +375,7 @@ static inline int BS_FUNC(peek_signed)(BSCTX *bc, unsigned int n) static inline void BS_FUNC(skip)(BSCTX *bc, unsigned int n) { if (n < bc->bits_valid) - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); else { n -= bc->bits_valid; bc->bits = 0; @@ -389,7 +389,7 @@ static inline void BS_FUNC(skip)(BSCTX *bc, unsigned int n) } BS_FUNC(priv_refill_64)(bc); if (n) - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); } } @@ -425,7 +425,7 @@ static inline int BS_FUNC(read_xbits)(BSCTX *bc, unsigned int n) { int32_t cache = BS_FUNC(peek)(bc, 32); int sign = ~cache >> 31; - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); return ((((uint32_t)(sign ^ cache)) >> (32 - n)) ^ sign) - sign; } @@ -508,14 +508,14 @@ static inline int BS_FUNC(read_vlc)(BSCTX *bc, const VLCElem *table, int n = table[idx].len; if (max_depth > 1 && n < 0) { - BS_FUNC(priv_skip_remaining)(bc, bits); + BS_FUNC(skip_remaining)(bc, bits); code = BS_FUNC(priv_set_idx)(bc, code, &n, &nb_bits, table); if (max_depth > 2 && n < 0) { - BS_FUNC(priv_skip_remaining)(bc, nb_bits); + BS_FUNC(skip_remaining)(bc, nb_bits); code = BS_FUNC(priv_set_idx)(bc, code, &n, &nb_bits, table); } } - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); return code; } @@ -534,17 +534,17 @@ static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t *dst, code = table[idx].sym; n = table[idx].len; if (max_depth > 1 && n < 0) { - BS_FUNC(priv_skip_remaining)(bc, bits); + BS_FUNC(skip_remaining)(bc, bits); code = BS_FUNC(priv_set_idx)(bc, code, &n, &nb_bits, table); if (max_depth > 2 && n < 0) { - BS_FUNC(priv_skip_remaining)(bc, nb_bits); + BS_FUNC(skip_remaining)(bc, nb_bits); code = BS_FUNC(priv_set_idx)(bc, code, &n, &nb_bits, table); } } AV_WN16(dst, code); ret = n > 0; } - BS_FUNC(priv_skip_remaining)(bc, n); + BS_FUNC(skip_remaining)(bc, n); return ret; } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 0594e104bb..2e24632cb5 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -79,6 +79,7 @@ typedef BitstreamContext GetBitContext; #define get_bits_left bits_left #define skip_bits_long bits_skip #define skip_bits bits_skip +#define skip_remaining bits_skip_remaining #define get_bits bits_read_nz #define get_bitsz bits_read #define get_bits_long bits_read From patchwork Thu Sep 7 19:27:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Gisquet X-Patchwork-Id: 43645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp35442pzb; Thu, 7 Sep 2023 12:28:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwoxAQXdt6uL9bUfiTpBi7+Y38iySq4AUYVhOHuKhPs8ktlUuRFKIMs2yO5ldFVWrudEed X-Received: by 2002:a2e:9f14:0:b0:2bc:d6d8:fd35 with SMTP id u20-20020a2e9f14000000b002bcd6d8fd35mr105751ljk.47.1694114882947; Thu, 07 Sep 2023 12:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694114882; cv=none; d=google.com; s=arc-20160816; b=T8VYOp3XyDmCSkmRe2H6vbW8wZj+PhvCGDl5khYn1W4+JBv1KSBs/+/+WsS1dmbblx sfRysSb2ROmouT3Sb0dIW5Ovh+o8SPUXgjicGKJwcxQHDYOACJfjVckZyPCPCxRv5kSM M9hAp8h4mJgSivYCB7wTQIvvhOhKQVSzva0aqWFb+tvOuxzpDPZm9PUdDZzZMfpJDP9N DaJQwCUKMkwofi0IijfD49TjfbTPFZLns/BVpQi5km+tQEUQ1nZs+oX3uOh3sJrJnr1n 2EJv7M+HTVvFlQrTMt7TZPePezSMGQ+cGKAgYLxe6+oETKQASQFMLTS/L9UuO0HeEIT1 sTYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=WbEpSC6Y8AYolfmcOacQLzB/tCMiaB1nHZRxkVb10nQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wmihIMlDZix/c6A+X5zYP/wodbeoE2l1Wb1AB+qDD4kG+kML1hOYk7JQU334lNe2rZ 0/ArtMc7Srkp00ZhG4zvjx/qHJQUhBmXi005GTmHnwReX5aC7fpGOLVPbzhVlmNckDFV XLycPMiGElm49V+2ASjJ7LsdCMFptBIQErHC/qng+vl0SJGOIIb1/cRR2YZ/gkUr44FU D75sUGuyhZiqFwJ1d0ItZkuxr0sp1rmI7ijOFdUMGDaMn1Nb5hfWUk/Wni42cGbW9Auk UUZPeFG/L1MV5J/ZqFNS5zJloC84WOf1K9Nqm8Tm7SALRPfWYN/2OmkBFCDIPMiCo1GY cbTw== 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n10-20020a170906378a00b009a21af200f7si24095ejc.993.2023.09.07.12.28.02; Thu, 07 Sep 2023 12:28:02 -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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4518768C892; Thu, 7 Sep 2023 22:27:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6AC868C884 for ; Thu, 7 Sep 2023 22:27:33 +0300 (EEST) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:8a7:6440:a506:2525:387f:fe6d]) (Authenticated sender: christophe.gisquet@free.fr) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 583E2780375 for ; Thu, 7 Sep 2023 21:27:32 +0200 (CEST) From: Christophe Gisquet To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 21:27:21 +0200 Message-ID: <20230907192721.50459-3-christophe.gisquet@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907192721.50459-1-christophe.gisquet@gmail.com> References: <20230907192721.50459-1-christophe.gisquet@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] read_xbits: request fewer bits 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: I67GR8sJjhx9 This would have also helped a bitstream reader with a cache of 32 bits. --- libavcodec/bitstream_template.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index 3f90fc6a07..c27e8108b2 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -423,8 +423,18 @@ static inline const uint8_t *BS_FUNC(align)(BSCTX *bc) */ static inline int BS_FUNC(read_xbits)(BSCTX *bc, unsigned int n) { - int32_t cache = BS_FUNC(peek)(bc, 32); - int sign = ~cache >> 31; + int32_t cache; + int sign; + + if (n > bc->bits_valid) + BS_FUNC(priv_refill_32)(bc); + +#if defined(BITSTREAM_READER_LE) + cache = bc->bits & 0xFFFFFFFF; +#else + cache = bc->bits >> 32; +#endif + sign = ~cache >> 31; BS_FUNC(skip_remaining)(bc, n); return ((((uint32_t)(sign ^ cache)) >> (32 - n)) ^ sign) - sign;