From patchwork Sun Nov 26 01:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2451892pzb; Sat, 25 Nov 2023 17:30:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuweXCYi3zczXSx8FD6nvwmpf4laae8X6svLcV7sT2RqUpMsRDY4FtBJIegjbqgSXzhDoD X-Received: by 2002:adf:f6d0:0:b0:32f:9ad3:860f with SMTP id y16-20020adff6d0000000b0032f9ad3860fmr5311041wrp.52.1700962200226; Sat, 25 Nov 2023 17:30:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700962200; cv=none; d=google.com; s=arc-20160816; b=WybK3QVSMt06/rANvb3fWTjUEvsgPmcl6ZPkw5TmwQiKMtBey0YgIjvf8+/XNysTLy d3X7unO6zhcUmdCuQCReSKTNa7SJ5Cau6teJTN1gR+lxfE2kvHInJGC9mBTqJU6tkedP 7/m2xbtQaOJ7BrqVdRBKCknAQ/y9WWCztMQ1LC5hlhdp1CnFJJbfQ5kn1W+YVJnkDgQh MfZjbFLqJWCOpwm6Li5J42Rxq517sT7z9EMiZ+ynvMC0EklDMD8y6rzGy3QD0TvyyWYl PDRxNCydyW09jrx+HuWfkXomVWN90YONHRltqGseyN0EZwy4l+HGn6lm4cGO4v96Vqff 1QMA== 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=8uTumEEeIJNn9JMLB8rB98RVI49PGGFCyYH6ZequUkc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ohXKn12phAmyi+J+e97arU/9+p8ZZTWZGJPYEMWTdtK2vjwTsM7FH33IgGCilePn7e h8onXzcHlY+4feD76i4zPUzUYmxa/o6Vk28pskbCP/R0/qiEgiEBAHzr5nAvFzdLum7P O2WBPk0UetKiuN64BUmONb8+yDml/IHvUgUNWJCFX+hxEnMa835rxg6ehfbG9YiTIh6m bsLh7Nu7Vxhl/nSE/SYeC+vfK2oTD2nqnuuNnUsLPRWdhAkaqQI088ehZWEZzuXvp19J MyxjAJG2/tZr4JPvxt7oqx+jZY46i0fNw2woJ8O1vRAbafgbfNqvNgvZ6a2n/GpPHGY+ VlUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=eCMzovlR; 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 x1-20020a50d601000000b0054b11d810d0si1594505edi.135.2023.11.25.17.29.59; Sat, 25 Nov 2023 17:30:00 -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=eCMzovlR; 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 BAD8468CF49; Sun, 26 Nov 2023 03:29:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B3B668CF4F for ; Sun, 26 Nov 2023 03:29:25 +0200 (EET) Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3b83ed78a91so1908882b6e.1 for ; Sat, 25 Nov 2023 17:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700962163; x=1701566963; 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=/kcj95A9izQGNEsGk++IsBn0lQxGW8ZLfNhroDGLqMA=; b=eCMzovlRTKhEYAycGWQJLHGXoMN27fxGLnQxvp7R4c+zMfGNjmdLnUkXxrrSY2RlYj mJXz/GvDxv+OhWDPBbDnsgV+QxkBYF8MugF7KVsnseTL3XPK2Ox7CvoIPLS/AX6j5J9X YCY9yDAjaSqwI7zFpprtySZ3362aN+TjNE3rzp9w/OU+vEax4w7wzvHZcCPYIzl4foO9 jOfcMQGb+ajbypb77+O6h39UGsuyryZx2DDJGy/3xx7jzTye7Vrn8xsXWLJgSwP8UOz9 lu4FnKjyngMGKXpTElyS1BfRKIQD/9bap0pujdnGnLMPRX6cW14yibAyEyb43fSOIySv 3Fmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700962163; x=1701566963; 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=/kcj95A9izQGNEsGk++IsBn0lQxGW8ZLfNhroDGLqMA=; b=F6Zpn4a59scHZvbaWtbEZPn+L29FxAr/INSIB9hXtdjHkOMPZHJaRv9Y+RWM7nBwXe V/gV2WFc1pC6PwT0EW+/c7lxWqSU5vj/MQ0goG/89EXhuk/rX5s4ymC40b1Uv+jWnLYW s13aqewtOKjcLzmSMF4DmbyNPt35XRk0G4sV3pAtUNuCPNKTTpvaPK+eKIF94AwmHPQA VMdJpLCRg5agT5arfkkd6oa0jfydIciq3awCAJS9B/lnp5/bwykYDhb0VYjM7GaY2tYF zBCwSkzS7Li0dIzj9yO9U6q3LNO/tkwokmlwjnMyZmzKUVLQYvCSv+738w5hiHe7pnYB kwNA== X-Gm-Message-State: AOJu0YygHRpOZsznaLyCrvX+bYk2q3SSgWxtZx7RCCRu3xG5pOyvBOYp U2nvd5Gnqux2VYTkCDhrsnNn2SFjqr0= X-Received: by 2002:a05:6808:1526:b0:3b8:5fec:5d6 with SMTP id u38-20020a056808152600b003b85fec05d6mr3005969oiw.27.1700962163116; Sat, 25 Nov 2023 17:29:23 -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.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 17:29:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Nov 2023 22:28:52 -0300 Message-ID: <20231126012858.40388-4-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 3/9] 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: QQRabwk8JnEt Signed-off-by: James Almer --- libavformat/avio_internal.h | 4 ++++ libavformat/aviobuf.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index bd58499b64..6b6cd6e8b3 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -146,6 +146,10 @@ int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char **buf, int buf_siz uint64_t ffio_read_varlen(AVIOContext *bc); +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..cdd1528155 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -971,6 +971,43 @@ 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 <= 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; +} + +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;