From patchwork Wed Jan 31 12:17:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2785714pzb; Wed, 31 Jan 2024 04:17:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+V0QrLtzlL5kg+/xGXzfd4ThwtFnAoSouMeukIpKU9qkHt/pFO31b6QZMvBU9RSC5Fqzz X-Received: by 2002:aa7:c6c2:0:b0:55f:4b07:f383 with SMTP id b2-20020aa7c6c2000000b0055f4b07f383mr1012725eds.17.1706703451270; Wed, 31 Jan 2024 04:17:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706703451; cv=none; d=google.com; s=arc-20160816; b=Bk+M3w15qQYMvQskjl7bB/dNu3RoXSZf8vIsEzxHjB9IjuTX4pt+RpnAa+gJ7mgoIv nZt3oG52CMZYbSEri3QNGy07tWgdawYelvM2vu7RoWqBh7dq7JsbBcWxWMPqX5b87hkN hgvLEXjJrjligdWlaJku01JIEFwCmb2EC6VsTTvyvyF1PmOWuXoOZ0yadsfRd4cqJxEw DaY59FzC4b39Km3iGNAMMWt76AOJUYo5ibLLEcJdfgbcuBgGjxF5gWGPkkZixfzonnVO 2epC8w0DGp5hytV6xjVt6uDQtdD4yOUVwPhlB7vOGPHB+w0g0wJUvpO/n8/8+eZYgcve mpaw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=WIjLlIVQxcaKJXcLCcj9tYJY/nzrXeIemZFXQkrc0JU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aywJ2YPM/CATNCp/2xDpH5mSwOwz+NN4TAVhH9YrqNKUExhDzF8Dft5OM39W9VqeMB 6qTnYbUa1SctG41IRvCjI37Q8r1hBINylSZdrnVokciJnZKSUDc7vc1BHekt7hqO2pme dT5o5qkmdUY9qq7W/zHMDPpcGprcV4O3nvI2Nzgs6XVAyFGYmMHIO1Ccdd/NuQGH4Mk+ 7+Md2NERIuXxpFut0zHTH1GZTy7O4w3KOIIur3uQR6U6SEsvkJEtYzRLzKFz85hSMtHp 60qgNTzFS93Rrcw81pk/55sMJuAFruJzJ6T4sZE6+a97NiLlekaicV9M8vhqQqTNTEUk q7jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=IYlVBpBC; 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 p10-20020a056402044a00b00557a9f389aasi5595041edw.559.2024.01.31.04.17.15; Wed, 31 Jan 2024 04:17:31 -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=IYlVBpBC; 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 32A6C68CE06; Wed, 31 Jan 2024 14:17:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E33DC68C92E for ; Wed, 31 Jan 2024 14:17:05 +0200 (EET) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1d751bc0c15so43158845ad.2 for ; Wed, 31 Jan 2024 04:17:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706703423; x=1707308223; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=uDHbHxdy8xQjefahKv6iNGlhLN+YaCHCuXU8ehX1i7s=; b=IYlVBpBCiGYvA3l+AwmE8AkLupTe1yA1TY4T3thOzU9R+upBzhbAvM9tKnpsuH6Y4N wqSDXelapMFz06sBrfhopeMfXKkgQCbScpvMxzGXlTEA8xGeUtIb52wfvDfOK+Kea4dE MaszfAtjJ+1wjPQXGELyM+/ZGG9VlLH3Pn0zK+uDD9/qx+0k6AMwLkk1DNjtgTe6HuAN XQoZWxd0UKKtz3BEC1eTghASHyhf3sjdvs1M4DFM+KWzrZeiWNWb/ZjEk40GkdsLPhLl 9v2Xe+R4sseRHHu9m75rqDUlj/+QCeCB3bNFLos5TgfwKQo8oKEqSPHQgyb9kUpLh7zE +QLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706703423; x=1707308223; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uDHbHxdy8xQjefahKv6iNGlhLN+YaCHCuXU8ehX1i7s=; b=TjIhEM0hRjYjumncxMCWhZh1cZJdabS3HLru0R+drQHI/NronQbhkcdOu0UuzS4ke/ 5aKh0gSShVDkN51kTEd7Sion/4lUB9vmMB0S0z0IDIX3wgPaOLomycabirJchSi+GDnd ZkVvQEfjYLwlSXPbJUIGZvEzIBZyHmS93YHhXxqjJl8QQALZg/YOOVdpXyVVoexP976O GTivj8fZL1znfINTHqIwfTa/byMw+aGJvsXOj/I+uH5IiRmt/tty8ghUMLduFLpD4iOk uN9xbEmRkE0oLsc7s6oHp/vZ86Igc3SZOhkh/XoH/bNfSTstr+mK35OkatwgDMvDK0L9 G0lw== X-Gm-Message-State: AOJu0YwLBM1oImgmycb2BvGJmxqS88GZ4pxuU66IJq2pj2p+bqEGFi2X iXl6435nX2N0KWQR2sOvRk6kZMJRqGKD7W5ZX9DzB3iUy6bXDodIUC8e5kY/ X-Received: by 2002:a17:902:ced2:b0:1d8:a697:b995 with SMTP id d18-20020a170902ced200b001d8a697b995mr1557296plg.27.1706703422759; Wed, 31 Jan 2024 04:17:02 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q6-20020a170902b10600b001d706912d1esm8977492plr.225.2024.01.31.04.17.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 04:17:02 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 09:17:16 -0300 Message-ID: <20240131121716.4178-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: move leb reading functions to its own header 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: KH4X4alun7Nj Signed-off-by: James Almer --- libavcodec/av1_parse.h | 16 +------ libavcodec/bitstream.h | 2 - libavcodec/bitstream_template.h | 23 ---------- libavcodec/bsf/extract_extradata.c | 2 +- libavcodec/get_bits.h | 24 ---------- libavcodec/leb.h | 70 ++++++++++++++++++++++++++++++ libavformat/av1dec.c | 2 +- libavformat/iamf_parse.c | 1 + 8 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 libavcodec/leb.h diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index d0abd7ac7c..2b8cce4835 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -30,6 +30,7 @@ #include "av1.h" #include "get_bits.h" +#include "leb.h" // OBU header fields + max leb128 length #define MAX_OBU_HEADER_SIZE (2 + 8) @@ -88,19 +89,6 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, */ void ff_av1_packet_uninit(AV1Packet *pkt); -static inline int64_t leb128(GetBitContext *gb) { - int64_t ret = 0; - int i; - - for (i = 0; i < 8; i++) { - int byte = get_bits(gb, 8); - ret |= (int64_t)(byte & 0x7f) << (i * 7); - if (!(byte & 0x80)) - break; - } - return ret; -} - static inline int parse_obu_header(const uint8_t *buf, int buf_size, int64_t *obu_size, int *start_pos, int *type, int *temporal_id, int *spatial_id) @@ -129,7 +117,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, *temporal_id = *spatial_id = 0; } - *obu_size = has_size_flag ? leb128(&gb) + *obu_size = has_size_flag ? get_leb128(&gb) : buf_size - 1 - extension_flag; if (get_bits_left(&gb) < 0) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 17f8a5da83..35b7873b9c 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -103,7 +103,6 @@ # 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) @@ -133,7 +132,6 @@ # 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 4c7101632f..4f3d07275f 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -562,29 +562,6 @@ static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t dst[8], return ret; } -/** - * 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. - * Values > UINT_MAX are truncated, but all coded bits are read. - */ -static inline unsigned BS_FUNC(read_leb)(BSCTX *bc) { - int more, i = 0; - unsigned leb = 0; - - do { - int byte = BS_FUNC(read)(bc, 8); - unsigned bits = byte & 0x7f; - more = byte & 0x80; - if (i <= 4) - leb |= bits << (i * 7); - if (++i == 8) - break; - } while (more); - - return leb; -} - #undef BSCTX #undef BS_FUNC #undef BS_JOIN3 diff --git a/libavcodec/bsf/extract_extradata.c b/libavcodec/bsf/extract_extradata.c index baa629295f..5d5d80c90f 100644 --- a/libavcodec/bsf/extract_extradata.c +++ b/libavcodec/bsf/extract_extradata.c @@ -68,7 +68,7 @@ static int metadata_is_global(const AV1OBU *obu) if (init_get_bits(&gb, obu->data, obu->size_bits) < 0) return 0; - metadata_type = leb128(&gb); + metadata_type = get_leb(&gb); return val_in_array(metadata_obu_types, FF_ARRAY_ELEMS(metadata_obu_types), metadata_type); diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 9e19d2a439..cfcf97c021 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -94,7 +94,6 @@ 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) @@ -711,29 +710,6 @@ static inline int skip_1stop_8data_bits(GetBitContext *gb) return 0; } -/** - * 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 bits are read, but values > UINT_MAX are truncated. - */ -static inline unsigned get_leb(GetBitContext *s) { - int more, i = 0; - unsigned leb = 0; - - do { - int byte = get_bits(s, 8); - unsigned bits = byte & 0x7f; - more = byte & 0x80; - if (i <= 4) - leb |= bits << (i * 7); - if (++i == 8) - break; - } while (more); - - return leb; -} - #endif // CACHED_BITSTREAM_READER #endif /* AVCODEC_GET_BITS_H */ diff --git a/libavcodec/leb.h b/libavcodec/leb.h new file mode 100644 index 0000000000..5159c434b1 --- /dev/null +++ b/libavcodec/leb.h @@ -0,0 +1,70 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * leb128 handling implementations + */ + +#ifndef AVCODEC_LEB_H +#define AVCODEC_LEB_H + +#include "get_bits.h" + +/** + * 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 bits are read, but values > UINT_MAX are truncated. + */ +static inline unsigned get_leb(GetBitContext *s) { + int more, i = 0; + unsigned leb = 0; + + do { + int byte = get_bits(s, 8); + unsigned bits = byte & 0x7f; + more = byte & 0x80; + if (i <= 4) + leb |= bits << (i * 7); + if (++i == 8) + break; + } while (more); + + return leb; +} + +/** + * 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. + */ +static inline int64_t get_leb128(GetBitContext *gb) { + int64_t ret = 0; + + for (int i = 0; i < 8; i++) { + int byte = get_bits(gb, 8); + ret |= (int64_t)(byte & 0x7f) << (i * 7); + if (!(byte & 0x80)) + break; + } + + return ret; +} + +#endif /* AVCODEC_LEB_H */ diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 8a06445958..c4542a5cbe 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -325,7 +325,7 @@ static int read_obu_with_size(const uint8_t *buf, int buf_size, int64_t *obu_siz skip_bits(&gb, 3); // extension_header_reserved_3bits } - *obu_size = leb128(&gb); + *obu_size = get_leb128(&gb); if (*obu_size > INT_MAX) return AVERROR_INVALIDDATA; diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 32976e6788..a6443f4f3d 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -26,6 +26,7 @@ #include "libavutil/log.h" #include "libavcodec/get_bits.h" #include "libavcodec/flac.h" +#include "libavcodec/leb.h" #include "libavcodec/mpeg4audio.h" #include "libavcodec/put_bits.h" #include "avio_internal.h"