From patchwork Sat Sep 18 10:02:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 30355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp121438iov; Sat, 18 Sep 2021 03:03:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJArhSNOmIxY9nbwGvBNsgQq+eBiSMlUqV32MQuejo69zloBNE9P0qk0WaZasO31CJH3Bd X-Received: by 2002:a17:906:3e81:: with SMTP id a1mr4335041ejj.482.1631959395013; Sat, 18 Sep 2021 03:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631959395; cv=none; d=google.com; s=arc-20160816; b=LiEWfW5Ir6XbedpUsNdRbFwkOm7AxUv74FOOjC6HX4GgRKhdo/TTj+5bFbitiixvRJ NIsJZ0J9m+dxB8RZCwfQtN2DuYt5aDP/RfDpMmt7IFe0F0353BLhPVC1iKVQhDbdXhlC KrYeXoH5CWa8ypHjeMh4JxBJtsXpqCdifYV9CUKRrB1vzpiVdYuJSbhNHdFnL3+JRHkO ECtUHpfpIS2wHREKLnpuQl9CKQQlkCFA1OTJjSBpI65EdfAWZVjyHFKiPKlWQh1C6R/W FfonBveQ+xIo/AJP1S9jQvemvkoOnpaO4RnQuMsDLLej/XIgmTa/znOcAFrdpMq1hcdN Epmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=X7cVj1ST5ImJIxLgG1T5AW3g3hDZ1W2Otkj2yjNJnDM=; b=rxqLG71omy24o0Tx6wus3Wsd0p5Q15WzsnpjWHNfkrlUsDh0JdVj0rWVPgWyPHPVPj XvTaevB84g0PcmJ4CzZkP+hu+flLtODFho0vvSDU6O0inQzEWfuAyjPsg0s+Wke30+gv LTdYOA85+PSXew2Tseh4kopMGwyVtllXcfpV2gNTKIoQTl6TkDjpMvokRWhIAQc6uHAY CHlVjRBuYFoEa47mTofS0bHCtsOS5x2nG0aS3hKpYYozN9YmuRPLq0LV11yEWmbte780 fbnUghxCn2hx3IctlTuQsulGQAZrWmmByOB2IT0y3bLiBd91ktihjjeSfewHJcvHj89C wJrg== 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 o29si10042027edz.353.2021.09.18.03.03.14; Sat, 18 Sep 2021 03:03:15 -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 9DA8368B09D; Sat, 18 Sep 2021 13:03:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 033B168AEE2 for ; Sat, 18 Sep 2021 13:03:05 +0300 (EEST) Received: from 8cca0619ae923910e5991cca6d545b97 ([1.145.161.12]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 18IA2wAQ012913 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sat, 18 Sep 2021 10:03:03 GMT Date: Sat, 18 Sep 2021 20:02:54 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <850ab9581cc2c568e34d013045b6db92a2c46fef.1631959242.git.pross@xvid.org> References: <5da14be177af2fd768c1cde4d450b27d659a5472.1631959242.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <5da14be177af2fd768c1cde4d450b27d659a5472.1631959242.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/siren: don't reduce getbitcontext size by checksum_bits at initialisation 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: go2h8nS3QuuV this allows the checksum calculation routine to also use getbitcontext --- at the expense of having to offset get_bits_left(gb) everywhere libavcodec/siren.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 3b0ad7b642..92fd3632f5 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -594,7 +594,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, for (i = 0; i < number_of_vectors[category]; i++) { index = 0; do { - if (get_bits_left(gb) <= 0) { + if (get_bits_left(gb) - s->checksum_bits <= 0) { error = 1; break; } @@ -614,7 +614,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, index >>= index_table[category]; if (decoded_value) { - if (get_bits_left(gb) <= 0) { + if (get_bits_left(gb) - s->checksum_bits <= 0) { error = 1; break; } @@ -693,7 +693,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, } } - return error == 1 ? AVERROR_INVALIDDATA : get_bits_left(gb); + return error == 1 ? AVERROR_INVALIDDATA : (get_bits_left(gb) - s->checksum_bits); } static int siren_decode(AVCodecContext *avctx, void *data, @@ -712,7 +712,7 @@ static int siren_decode(AVCodecContext *avctx, void *data, if (avpkt->size < bits_per_frame / 8) return AVERROR_INVALIDDATA; - if ((ret = init_get_bits(gb, avpkt->data, bits_per_frame - s->checksum_bits)) < 0) + if ((ret = init_get_bits(gb, avpkt->data, bits_per_frame)) < 0) return ret; } else if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0) @@ -726,7 +726,7 @@ static int siren_decode(AVCodecContext *avctx, void *data, rate_control = get_bits(gb, 4); - ret = categorize_regions(s->number_of_regions, get_bits_left(gb), + ret = categorize_regions(s->number_of_regions, get_bits_left(gb) - s->checksum_bits, s->absolute_region_power_index, s->power_categories, s->category_balance); if (ret < 0) @@ -741,11 +741,11 @@ static int siren_decode(AVCodecContext *avctx, void *data, if (ret < 0 && !s->microsoft) return ret; - if (get_bits_left(gb) > 0) { + if (get_bits_left(gb) - s->checksum_bits > 0) { do { frame_error |= !get_bits1(gb); - } while (get_bits_left(gb) > 0); - } else if (get_bits_left(gb) < 0 && + } while (get_bits_left(gb) - s->checksum_bits > 0); + } else if (get_bits_left(gb) - s->checksum_bits < 0 && rate_control + 1 < s->rate_control_possibilities) { frame_error = 1; }