From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 74070435AE for ; Fri, 17 Jun 2022 13:32:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7746468B8BB; Fri, 17 Jun 2022 16:32:18 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CA0068B8B8 for ; Fri, 17 Jun 2022 16:32:11 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A1F5A240175 for ; Fri, 17 Jun 2022 15:32:10 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Go9dPUUtE6_c for ; Fri, 17 Jun 2022 15:32:08 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E51512400F5 for ; Fri, 17 Jun 2022 15:32:08 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id E857F3A127F; Fri, 17 Jun 2022 15:32:08 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 15:32:05 +0200 Message-Id: <20220617133206.23643-4-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220617133206.23643-1-anton@khirnov.net> References: <20220617133206.23643-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] lavc/bitstream: make skip_remaining() public 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Also rename it to bitstream_skip_cache(), which is more descriptive and follows the naming conventions of tis API. --- libavcodec/bitstream.h | 1 + libavcodec/bitstream_template.h | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 3fa63695d3..364245453b 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -116,6 +116,7 @@ static inline void bitstream_unget(BitstreamContext *bc, uint64_t value, #define bitstream_peek bitstream_peek_be #define bitstream_peek_signed bitstream_peek_signed_be #define bitstream_skip bitstream_skip_be +#define bitstream_skip_cache bitstream_skip_cache_be #define bitstream_seek bitstream_seek_be #define bitstream_align bitstream_align_be #define bitstream_read_xbits bitstream_read_xbits_be diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index 14a420139c..717473ca40 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -225,7 +225,12 @@ static inline int BS_FUNC(bitstream_peek_signed)(BitstreamContext *bc, unsigned return sign_extend(BS_FUNC(bitstream_peek)(bc, n), n); } -static inline void BS_FUNC(skip_remaining)(BitstreamContext *bc, unsigned int n) +/** + * Skip n bits from the cache. This may only be called if at least n bits are + * guaranteed to be in the cache, e.g. right after bitstream_peek(n). + * Otherwise use bitstream_skip(). + */ +static inline void BS_FUNC(bitstream_skip_cache)(BitstreamContext *bc, unsigned int n) { #ifdef BITSTREAM_LE bc->bits >>= n; @@ -241,7 +246,7 @@ static inline void BS_FUNC(skip_remaining)(BitstreamContext *bc, unsigned int n) static inline void BS_FUNC(bitstream_skip)(BitstreamContext *bc, unsigned int n) { if (n < bc->bits_left) - BS_FUNC(skip_remaining)(bc, n); + BS_FUNC(bitstream_skip_cache)(bc, n); else { n -= bc->bits_left; bc->bits = 0; @@ -255,7 +260,7 @@ static inline void BS_FUNC(bitstream_skip)(BitstreamContext *bc, unsigned int n) } BS_FUNC(refill_64)(bc); if (n) - BS_FUNC(skip_remaining)(bc, n); + BS_FUNC(bitstream_skip_cache)(bc, n); } } @@ -291,7 +296,7 @@ static inline int BS_FUNC(bitstream_read_xbits)(BitstreamContext *bc, unsigned i { int32_t cache = BS_FUNC(bitstream_peek)(bc, 32); int sign = ~cache >> 31; - BS_FUNC(skip_remaining)(bc, n); + BS_FUNC(bitstream_skip_cache)(bc, n); return ((((uint32_t)(sign ^ cache)) >> (32 - n)) ^ sign) - sign; } @@ -374,14 +379,14 @@ static inline int BS_FUNC(bitstream_read_vlc)(BitstreamContext *bc, VLC_TYPE (*t int n = table[idx][1]; if (max_depth > 1 && n < 0) { - BS_FUNC(skip_remaining)(bc, bits); + BS_FUNC(bitstream_skip_cache)(bc, bits); code = BS_FUNC(set_idx)(bc, code, &n, &nb_bits, table); if (max_depth > 2 && n < 0) { - BS_FUNC(skip_remaining)(bc, nb_bits); + BS_FUNC(bitstream_skip_cache)(bc, nb_bits); code = BS_FUNC(set_idx)(bc, code, &n, &nb_bits, table); } } - BS_FUNC(skip_remaining)(bc, n); + BS_FUNC(bitstream_skip_cache)(bc, n); return code; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".