From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id F0D2E4DBA6 for ; Fri, 4 Jul 2025 13:45:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6028E68FA3A; Fri, 4 Jul 2025 16:45:19 +0300 (EEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9047C68FA2D for ; Fri, 4 Jul 2025 16:45:16 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-234bfe37cccso11043875ad.0 for ; Fri, 04 Jul 2025 06:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751636715; x=1752241515; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=qa1V/IkAblv/rXYusqnmGhLDAz32YN1Mz79YspGhrdM=; b=k4SXYV6cf4rdbRgtqb9XZJv8vGB9OS6+pLbiwG16uI8tXL6BAqmC3+6ptkTdQnAveB yzpGUjgMxQKPF0epMMGKKM6ZCKpewED0lfn99j33qqpHyKnc1+JA7RMg0vjOnYaKS3Vo vzhcsITohcCKq63gBTvXxNWkBme+ztZzLVkN4LdwlQUCs2d7B4gTRFeM9TEiY8gtyecu hM0cQfUCBVeTK9nq97IdndMEDD07dsugj86artJWbXOSNc17MErmDMeh1BrB5Dj+bo99 caNeUUnPeDs/jvp5yvXwVGuk9c+8mblhC7A+gkhqz1JlTwX5jiV3duV0xVUyze52VlPy KrHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751636715; x=1752241515; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qa1V/IkAblv/rXYusqnmGhLDAz32YN1Mz79YspGhrdM=; b=HolNXitJ9UXIGHe1hOHcgPvLBWuRRfsKAlSqKJSB47DsdE8uD1LPTugJ8YZCQXaeO5 7qVe6rAFdQD9eLvfnaI3+6JwXaDq++zf6uwpxk/6DXD8iZU42ZV3pDNcs0wWHMn8QbIR 1un/SAkVzsFhxwMRnSqrcMY2lLwxb5ReuMxo6zqMT4ooso1dyKFTaeAeCSAg0MgIXLw0 nNxf7CquSYgwsC5Gsyq2hyMNbFxSRdWRfDGqbpfch2qxV7VHQ3X0vQD3DnjhzOEiYeLl Gj3rw6URuPhil/t3vgVTA/Vv8VVBpXmiCR4eoWgEYAjR8bjrfGcHWaEnGgsi0bqAOojS d9ow== X-Gm-Message-State: AOJu0YxNysl+nfMiJz0YeIa15J7SWIZynctU1e3ZEr+0c3UzHadZ+9Lo Zb46SDr/ILaulq+DJkCkPxg/RDRehBbR7MMvhYSYiV+rShzHRJTOne1PV2p+7w== X-Gm-Gg: ASbGncuTpIcOg36+UMQmX7VGZ0FpCnRF8RpM+75Vfj+yI4z9Wk2kT3rq+kE7szdB+TZ xPDiR4KGy5KHkajYhMZdPuhKNu7VMEdLMLv0UQrveJQwnskD1JTRYEnTjIOVn8Sf+Fy35KwQvlr XRQnn5nqrNeDvHIUBwfrtKMZbO1GVyb3NkENfC3AGa8nYkiXk3VLxc6VRQccmV+GudBKqseL4CR weNTpNLbvL7n76O1eoixXQWafUhZnrCxIceGrCW57e3noHO9XQUHr2OUiCqBHNEWBDFEaPHgA// eu7aLjlhxKCS4wBOCA3jhG//SxDvTXY+8H872yGjwKLGy4iHGmICVpO0bP0Hs/HxWQ5DGWvubk/ 9fpdDIqO2cL8DmBVs X-Google-Smtp-Source: AGHT+IEPK8B40QFx/tIkrZN0QZOnIQM79E+m59ejKNxiVCDXf60ufULkENWVw8lKQWUvGG55hJnYCw== X-Received: by 2002:a17:902:f550:b0:235:129e:f640 with SMTP id d9443c01a7336-23c8613842amr44540355ad.38.1751636714551; Fri, 04 Jul 2025 06:45:14 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31aaaf6f6c5sm2176168a91.43.2025.07.04.06.45.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jul 2025 06:45:14 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <74d4eb18240684d32dda4e8feb689c23387aad86.1751636697.git.ffmpegagent@gmail.com> In-Reply-To: References: X-Original-From: Andreas Rheinhardt Date: Fri, 04 Jul 2025 13:44:55 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/vvc/dec: Don't use GetBit-API when byte-aligned 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 Cc: Andreas Rheinhardt 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: From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/dec.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 7930d64a05..90fff3a03f 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -20,6 +20,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavcodec/bytestream.h" #include "libavcodec/codec_internal.h" #include "libavcodec/decode.h" #include "libavcodec/hwaccel_internal.h" @@ -509,13 +511,14 @@ static int slices_realloc(VVCFrameContext *fc) return 0; } -static int get_ep_size(const H266RawSliceHeader *rsh, GetBitContext *gb, const H2645NAL *nal, const int header_size, const int ep_index) +static int get_ep_size(const H266RawSliceHeader *rsh, const GetByteContext *gb, + const H2645NAL *nal, const int header_size, const int ep_index) { int size; if (ep_index < rsh->num_entry_points) { int skipped = 0; - int64_t start = (gb->index >> 3); + int64_t start = bytestream2_tell(gb); int64_t end = start + rsh->sh_entry_point_offset_minus1[ep_index] + 1; while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped] <= start + header_size) { skipped++; @@ -525,26 +528,27 @@ static int get_ep_size(const H266RawSliceHeader *rsh, GetBitContext *gb, const H skipped++; } size = end - start; - size = av_clip(size, 0, get_bits_left(gb) / 8); + size = av_clip(size, 0, bytestream2_get_bytes_left(gb)); } else { - size = get_bits_left(gb) / 8; + size = bytestream2_get_bytes_left(gb); } return size; } -static int ep_init_cabac_decoder(EntryPoint *ep, GetBitContext *gb, const int size) +static int ep_init_cabac_decoder(EntryPoint *ep, GetByteContext *gb, const int size) { int ret; - av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end); - ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + av_assert0(size <= bytestream2_get_bytes_left(gb)); + ret = ff_init_cabac_decoder(&ep->cc, gb->buffer, size); if (ret < 0) return ret; - skip_bits(gb, size * 8); + bytestream2_skipu(gb, size); return 0; } -static int ep_init(EntryPoint *ep, const int ctu_addr, const int ctu_end, GetBitContext *gb, const int size) +static int ep_init(EntryPoint *ep, const int ctu_addr, const int ctu_end, + GetByteContext *gb, const int size) { const int ret = ep_init_cabac_decoder(ep, gb, size); @@ -567,7 +571,7 @@ static int slice_init_entry_points(SliceContext *sc, const H266RawSlice *slice = unit->content_ref; int nb_eps = sh->r->num_entry_points + 1; int ctu_addr = 0; - GetBitContext gb; + GetByteContext gb; int ret; if (sc->nb_eps != nb_eps) { @@ -578,9 +582,8 @@ static int slice_init_entry_points(SliceContext *sc, sc->nb_eps = nb_eps; } - ret = init_get_bits8(&gb, slice->data, slice->data_size); - if (ret < 0) - return ret; + bytestream2_init(&gb, slice->data, slice->data_size); + for (int i = 0; i < sc->nb_eps; i++) { const int size = get_ep_size(sc->sh.r, &gb, nal, slice->header_size, i); -- ffmpeg-codebot _______________________________________________ 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".