From patchwork Sun Nov 26 01:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44796 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2451833pzb; Sat, 25 Nov 2023 17:29:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyp/tYvVI5ALspPAkG09e3xkSGcbRLwa0w1xtKffe+iITWfAoVrkR6HyNvSZlrZyoBlMrP X-Received: by 2002:a05:6402:42c5:b0:54a:ed2a:fa7e with SMTP id i5-20020a05640242c500b0054aed2afa7emr7019595edc.24.1700962191278; Sat, 25 Nov 2023 17:29:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700962191; cv=none; d=google.com; s=arc-20160816; b=iY71uWtEFVhJp0c0awtuOqBpXkVJpFBkbSeBznSjiBNTGWtXIcT2UUjGiXGRy+EM+n 9Y9/+of03GZbRqEFKODzoaqBRxDPqDZW0Ph8fxfgwof11RPNCBayEw5O/+yFdD3J7516 jLJa3qOHRinRMmCaNSKw4uvGLknLkUQUfG/Fq0u7Y51gqtf2IyPAHJW8KKYACeQPFaCa jMSOxPlznfAEqFbBi9xkj1SsBPtqbuRDvDsCCeR1l9k7w+hW0MsFHrJGO4IY7HYIaEo0 2MLuIlXoz9q5dwNlycokQx9w2Js9KZYQ89pUAE+KMfbDfzo5OEclfm8jsW+EO5VNMR8c Ccbw== 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:dkim-signature:delivered-to; bh=/PgkBybtz5W6A8rFENgsw7SQVL2tNNrx1uAD+k32XX8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xTaYLXQw0ekwmlTlE+f5+HOpfHi2+O2kdQdCuPIIrMYMJWGhJj9XeQ3QD9Zp5Y3Mre Hhlmq2HrTrN9xlX+vPuXN4eIyWeKuwNeyeiwGd/KCpmzivu9VBPIS7lhEBfxNZniGIPJ nR+j77jtfWxwaLtOwquqdlLfPM3TSSF6LPvqRjcB0xlEYbw2/oDI8NxNtNQKcLm5V6I1 Bf30adlJasUbbWyD80PZ8UzHmR8/xlokhG/1Z70WjpmWVdhnC54x30pGsOBYtyYAL6rV S1QZoXfXl+Fq/czX5ovqyBBlD4ykX5KYS6/pELv9RY8iJF5imsdClsvZpNB5UBbp4qU8 +nmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=aUwUim1y; 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 2-20020a508742000000b00542b32fac2esi3367577edv.287.2023.11.25.17.29.50; Sat, 25 Nov 2023 17:29: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=aUwUim1y; 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 AEF5C68CF58; Sun, 26 Nov 2023 03:29:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50DEF68CF18 for ; Sun, 26 Nov 2023 03:29:24 +0200 (EET) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6c398717726so2520296b3a.2 for ; Sat, 25 Nov 2023 17:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700962162; x=1701566962; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=arhmNNOGtUuDEAx6QNq9m1p0sq23c9ApbSyxeTCo6p0=; b=aUwUim1y8FpOREziBja06bV+22b3BcnpnSCsowJMzkC0IJQhTA1NDwvP8d4SAqEi9k PdOcFaHBb0IapbhpMtvxaSLik3rk87eDvHQPVneq1U8aPZ0/8NVk/NhZyKOw3rE5WLfz ur/Iphq4qtjgs62wBKX/bfCzQAd0Jtv/mG6rvx9WlftYuBU6ZYBou7+Zbf6JRZEgf+OE zOp6AQbhcXpCEMC4sZRKeWGBuHzZIp9+hWmGKZW2aakgUOZNHiTIvKxCXKZYtWtkGt8n RJ0dhXfXONIJAu2IIOL5afiueiuMytbLpjCd+0Ok+5gZUV9qfUVW6r/qeqpf6K3LjgFh AlEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700962162; x=1701566962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=arhmNNOGtUuDEAx6QNq9m1p0sq23c9ApbSyxeTCo6p0=; b=sKLON98YfTlF/2AdknSKtGtFP3jVkpY3vLQLyBaXJT3+Al1G+MclBglNvTYyxMfD11 M/5XD93E/XJu/XzcvKwlD7/u3gy1oMR3R24dWoF6Mq3TRT5/3IntyIopKIhn5ZVXonKL my7rymlk9G6TZ/9o/Aoz/KrqkNIAGGLETvonkQf5VJGXyBDoFevX+zG4x9HjXJ8cnZGg dyR358/+Y7Q3i4xwJIGh+5VIOsVJ0CjbS1dxT7gObWQdZnBgTKcQI7HwSSz29uk0Tbea 8rUTktLiiMAOLE7gm1G1WSODg4nN+3o6bw6piqkVkOInsS/4467wb22Xefo0+m7USzHP +G5g== X-Gm-Message-State: AOJu0YxV6LBNdyLAQmsaikAhiTo/tMQTo2LotaOPyMNBKOWa5WqjRWgy jqGfiFwVR+0UGdatCm+WrGVudKUBjm0= X-Received: by 2002:a05:6a00:1d25:b0:6b3:aded:7e9a with SMTP id a37-20020a056a001d2500b006b3aded7e9amr7638811pfx.27.1700962161784; Sat, 25 Nov 2023 17:29:21 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id g3-20020a62e303000000b0068a13b0b300sm5049519pfh.11.2023.11.25.17.29.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 17:29:21 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Nov 2023 22:28:51 -0300 Message-ID: <20231126012858.40388-3-jamrial@gmail.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231126012858.40388-1-jamrial@gmail.com> References: <20231126012858.40388-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/get_bits: add get_leb() 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: rajO5QS0wq3C Signed-off-by: James Almer --- libavcodec/bitstream.h | 2 ++ libavcodec/bitstream_template.h | 22 ++++++++++++++++++++++ libavcodec/get_bits.h | 23 +++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 35b7873b9c..17f8a5da83 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -103,6 +103,7 @@ # define bits_apply_sign bits_apply_sign_le # define bits_read_vlc bits_read_vlc_le # define bits_read_vlc_multi bits_read_vlc_multi_le +# define bits_read_leb bits_read_leb_le #elif defined(BITS_DEFAULT_BE) @@ -132,6 +133,7 @@ # define bits_apply_sign bits_apply_sign_be # define bits_read_vlc bits_read_vlc_be # define bits_read_vlc_multi bits_read_vlc_multi_be +# define bits_read_leb bits_read_leb_be #endif diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index 4f3d07275f..86cbab288e 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -562,6 +562,28 @@ static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t dst[8], return ret; } +static inline unsigned BS_FUNC(read_leb)(BSCTX *bc) { + int more, i = 0; + unsigned leb = 0; + + do { + unsigned bits; + int byte = BS_FUNC(read)(bc, 8); + more = byte & 0x80; + bits = byte & 0x7f; + if (i <= 3 || (i == 4 && bits < (1 << 4))) { + leb |= bits << (i * 7); + } else if (bits) { // leb > UINT_MAX + leb |= (bits & 0xF) << (i * 7); + break; + } + if (++i == 8 && more) + break; // invalid leb + } while (more); + + return leb; +} + #undef BSCTX #undef BS_FUNC #undef BS_JOIN3 diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index cfcf97c021..cf9d5129b5 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -94,6 +94,7 @@ typedef BitstreamContext GetBitContext; #define align_get_bits bits_align #define get_vlc2 bits_read_vlc #define get_vlc_multi bits_read_vlc_multi +#define get_leb bits_read_leb #define init_get_bits8_le(s, buffer, byte_size) bits_init8_le((BitstreamContextLE*)s, buffer, byte_size) #define get_bits_le(s, n) bits_read_le((BitstreamContextLE*)s, n) @@ -710,6 +711,28 @@ static inline int skip_1stop_8data_bits(GetBitContext *gb) return 0; } +static inline unsigned get_leb(GetBitContext *gb) { + int more, i = 0; + unsigned leb = 0; + + do { + unsigned bits; + int byte = get_bits(gb, 8); + more = byte & 0x80; + bits = byte & 0x7f; + if (i <= 3 || (i == 4 && bits < (1 << 4))) { + leb |= bits << (i * 7); + } else if (bits) { // leb > UINT_MAX + leb |= (bits & 0xF) << (i * 7); + break; + } + if (++i == 8 && more) + break; // invalid leb + } while (more); + + return leb; +} + #endif // CACHED_BITSTREAM_READER #endif /* AVCODEC_GET_BITS_H */