From patchwork Tue Dec 5 22:44:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp659174pzc; Tue, 5 Dec 2023 14:45:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IEANq9dLGpePPtsbKLLyBxAT0UN80ZdktiZSG5VIPbNeL3xnXUgtsNTu7/Sv0eO7k8RW3WK X-Received: by 2002:a17:907:2d0a:b0:a18:ef56:8876 with SMTP id gs10-20020a1709072d0a00b00a18ef568876mr1435321ejc.47.1701816304116; Tue, 05 Dec 2023 14:45:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701816304; cv=none; d=google.com; s=arc-20160816; b=qUfPgz04/QJII4tn9WQbZ7AgULAsdkInm27C7lPFjdczJ3edEB4nhay6mMhxA2LW8v PI1HFSW1X+Hne13D1jwW31KWJ9gx3JQuBuqxgKwt1edp5syLPaZs4Qf1tH2WBJAxmosn c97J8sL2cWKJ+6eHDxuV5nr5/5mzkszvegkrVf8rY1/IjD3IvxnrxHpCG//7dHjwqgqZ FYoHp+fMbtbMUk11VNcOF5uhDHOxnZFep95dmJ0pVav9fqK0HblDVWCRd+F/cynr8gbc eW8KDTaUkrcI9cYdoBuYfdru2MtdaR2WWBxcdnrkxDuEw4f0jhow4k/fOVFhEve/VbcD 3iag== 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=b/pHH4OKHoqsrRSUlrIZPcrS5WucfyFmg9GXD42G98c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IbL02j/MUzOuIR+h1OIrOvppbIDaXirXtWRW24Bw35xQardKF1d9DPkPoN+sK/q82z TNhRKb6l1A4KSJO+Jr4RYoSlaVXlYYrc1Ty6TCSGIdCQEgmhwoS5Z1P12Hrp/Ut/sAq5 EO9+uXtJFRBmXBmgkHbmS5Br7efkYZlP1EHGOvVC6d5lG0o5ynnmRL0TAd1pef4WZNPI I4TRiQQWNni0+fc/lvahQyfMAXRorVcCEVM6DWhqjy20RFCC9hxeHV4Ce2NHJAxYKpHa JkZEt4mpf/owk6/tDisZaAaB7/wmX349jXWIg4zF6Jb4LACtT+qwWRZ+cwLeop/4dHhB B2aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JuVuQYo7; 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 r10-20020a170906350a00b009d441527214si6016851eja.1045.2023.12.05.14.45.03; Tue, 05 Dec 2023 14:45:04 -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=JuVuQYo7; 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 793B268CF53; Wed, 6 Dec 2023 00:44:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C784268CF29 for ; Wed, 6 Dec 2023 00:43:53 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6cdcef787ffso6451522b3a.0 for ; Tue, 05 Dec 2023 14:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701816231; x=1702421031; 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=mSE6cPNs1R3AaCBlo94VrNHgs5ToTsW0px4hqwFDXSQ=; b=JuVuQYo7iV4No5fOY3hMEBnvr3b2l5BnVJziLrSbihU8ZRfnnfWPr4G22tHqXfF6oT wTWRdALRZ57Uprz0eykVXGurS+teeHcWuBMjGd0e3UjiVJ/gGwAs2mmiUrfDh38NFjMT nk6Y+DlJwM4+tJEu3HSh1XQC7bAcEa7etZfhlsSU0T5guMX7KbcPQdDCz6JLd4dwhU92 JOknNGXvexK2MWQK6g38LUdv5D7lqskqyNtgxJBBjHYNFRsh4UJgzuzCX+5AOtyXqxxk 6wuu16MmSocKjPNptoL5Eh136eBqmbJ2xNt1Ub7RU5MSfjbIuTPp2L5sRJoJOvCh3FSv sdAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701816231; x=1702421031; 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=mSE6cPNs1R3AaCBlo94VrNHgs5ToTsW0px4hqwFDXSQ=; b=G615WMHa8aEhNuMe6raljr3P+QgvFcohN15rFS7zxi7ff5dhZ5TuN+xwAkpHvyDlpN /Qnm2GMLWDHmpo1GvYqlvhL1sJR+mzKzyI59osuDAOE41pgCnBdjDBx0LB3JB0c0rXiP 3Q9RuxuKNo7bAQrayiP+1NUBWBL9H2f+OQnzSb/gVjqPp72rA1rLr2vmpzqEyAJsW7QB h9rthVFAKM906DATRmh3nTG6NyjwWuAIuLgDqIYB8YJjVJ5moDIm1vCwAbRWolRGQzeo Uvh792SUbyvbOf+joCbGxWWvWN0CORxSeN1T+uwU+ODaRI+9PBiRtWep+mZmfjAMZt+1 eVqw== X-Gm-Message-State: AOJu0Yx1nebJecuehJcTPDj8hbvOmwFeujd2N8PGCteARGrhcdT3Vbr6 VH7JSSeijwa2QLNEka+fIWCs/Z1saA4= X-Received: by 2002:a05:6a20:3d95:b0:189:bde9:71aa with SMTP id s21-20020a056a203d9500b00189bde971aamr8569321pzi.48.1701816231318; Tue, 05 Dec 2023 14:43:51 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id hq25-20020a056a00681900b0064fd4a6b306sm2037688pfb.76.2023.12.05.14.43.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 14:43:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Dec 2023 19:44:00 -0300 Message-ID: <20231205224402.14540-7-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205224402.14540-1-jamrial@gmail.com> References: <20231205224402.14540-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avformat/aviobuf: add ffio_read_leb() and ffio_write_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: 0QMbJjPWN0PT Signed-off-by: James Almer --- libavformat/avio_internal.h | 10 ++++++++++ libavformat/aviobuf.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index bd58499b64..f2e4ff30cb 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -146,6 +146,16 @@ int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char **buf, int buf_siz uint64_t ffio_read_varlen(AVIOContext *bc); +/** + * Read a unsigned integer coded as a variable number of up to eight + * little-endian bytes, where the MSB in a byte signals another byte + * must be read. + * All coded bytes are read, but values > UINT_MAX are truncated. + */ +unsigned int ffio_read_leb(AVIOContext *s); + +void ffio_write_leb(AVIOContext *s, unsigned val); + /** * Read size bytes from AVIOContext into buf. * Check that exactly size bytes have been read. diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2899c75521..5a329ce465 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -971,6 +971,39 @@ uint64_t ffio_read_varlen(AVIOContext *bc){ return val; } +unsigned int ffio_read_leb(AVIOContext *s) { + int more, i = 0; + unsigned leb = 0; + + do { + int byte = avio_r8(s); + unsigned bits = byte & 0x7f; + more = byte & 0x80; + if (i <= 4) + leb |= bits << (i * 7); + if (++i == 8) + break; + } while (more); + + return leb; +} + +void ffio_write_leb(AVIOContext *s, unsigned val) +{ + int len; + uint8_t byte; + + len = (av_log2(val) + 7) / 7; + + for (int i = 0; i < len; i++) { + byte = val >> (7 * i) & 0x7f; + if (i < len - 1) + byte |= 0x80; + + avio_w8(s, byte); + } +} + int ffio_fdopen(AVIOContext **s, URLContext *h) { uint8_t *buffer = NULL;