From patchwork Sun Oct 22 22:08:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44329 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp1075233pzb; Sun, 22 Oct 2023 15:08:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpnbHR5ES9/v9ZDJ+4m3Dy1wvlYF+qtRQyk2VXaoeT3rNq47nKmO8wN0jtZ8VCpU0L7h1a X-Received: by 2002:a17:906:fe04:b0:9be:1bde:d4b with SMTP id wy4-20020a170906fe0400b009be1bde0d4bmr5705188ejb.44.1698012521562; Sun, 22 Oct 2023 15:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698012521; cv=none; d=google.com; s=arc-20160816; b=aludinEoxN3mT/lcw1fswUSUDUBD+NYGqeYA1nxpYi+H1Fwbcl62y4OD9AdvGE7Bgp L96L+SRDtz4uIUINdnWnSmxhwiNnm3gXWvwLtM60Eh2c0NP27wZofH15IUiR/vrf94Fk Iszyn5n54ypNmZnvCPbx3ZUe+N8xuqV6/O4TcR84Lb96CR9hBedoBhEvvenwavTJHh5c CbmpzEuySw8OU9Sa3801fPxCFUKnnM5BUdSUYe5HcycdDzvy5B82wSfuEDinTeaaQY5s vB96ckU550PsvZ6URhd3nHwpm+dwBwIurRSAyyri27dJ+bZQsOu92T+l0Q6zzThBzlOk SuoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=Vto/ghhUB3koz3UuvwSvJAG2jQ1/54fb3n5EjhKp6Uo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=UyrSWhxo/F5pzA1sOwAbf1XTYEymDcfyxcUjdipFgL7/Asw1JT+zvVmgVSyLKaAdX4 hUXKNDVWr44tOZSIqU+1r0NyCn5hUQ3HA87X/Ccc0hZE3/+DRPHs5LMdRJOEBdvoR/a6 5mAnFLiNlWuAmj6FLML9l8OcSx6oH4V91B2oxDh926KeZR6xIMlxlwHDIRacnEUXE1MD X91pX9OEtjEFBXJhfaiwZ35gZaWXghEcRZVCSuwBCRnI288U92OXGlQOKE+rZx4geigB 5aoswk6Zbw8FaUQnh5p9J52R8Umwxc04OSWx9QG+FYyDXyY4bVJtZx9oUGb6YMEsF7Zq jiTw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x15-20020a170906710f00b009b91a4f2299si2612087ejj.971.2023.10.22.15.08.41; Sun, 22 Oct 2023 15:08:41 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 663CB68CA13; Mon, 23 Oct 2023 01:08:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF33768C959 for ; Mon, 23 Oct 2023 01:08:31 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 24306240006 for ; Sun, 22 Oct 2023 22:08:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 Oct 2023 00:08:30 +0200 Message-Id: <20231022220830.17954-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec: remove special casing CACHED_BITSTREAM_READER 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ap5VkVkNq/uM after the vlc multi cleanup patchset today i see no fate failure but i do not know why exactly these special cases where there Signed-off-by: Michael Niedermayer --- libavcodec/magicyuv.c | 2 +- libavcodec/utvideodec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 3f6348b531e..4a143cdbbf7 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -122,7 +122,7 @@ static void magicyuv_median_pred16(uint16_t *dst, const uint16_t *src1, #define READ_PLANE(dst, plane, b, c) \ { \ x = 0; \ - for (; CACHED_BITSTREAM_READER && x < width-c && get_bits_left(&gb) > 0;) {\ + for (; x < width-c && get_bits_left(&gb) > 0;) {\ ret = get_vlc_multi(&gb, (uint8_t *)dst + x * b, multi, \ vlc, vlc_bits, 3); \ if (ret <= 0) \ diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index ce5d00f7af7..5697210276f 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -118,7 +118,7 @@ static int build_huff(UtvideoContext *c, const uint8_t *src, VLC *vlc, { \ buf = !use_pred ? dest : c->buffer; \ i = 0; \ - for (; CACHED_BITSTREAM_READER && i < width-end && get_bits_left(&gb) > 0;) {\ + for (; i < width-end && get_bits_left(&gb) > 0;) {\ ret = get_vlc_multi(&gb, (uint8_t *)buf + i * b, multi.table, \ vlc.table, VLC_BITS, 3); \ if (ret > 0) \