From patchwork Thu Mar 25 15:49:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26601 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5403844B722 for ; Thu, 25 Mar 2021 17:50:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AC5068AAC7; Thu, 25 Mar 2021 17:50:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AF2D687FE0 for ; Thu, 25 Mar 2021 17:50:35 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id k10so3773262ejg.0 for ; Thu, 25 Mar 2021 08:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=Tyt2eJi+oafMjjBPvA1TgKuO6cEySW4aGtimWOSh6AU=; b=f152CfogqbE2pEnTPVustvRWeoXxgHFaVoIkB5i7OGGaq5Pr9/hkt+ao0bl8xaOpvl dBLrHdwa00CLgMf8F0xYBP/K3NOPalTwJVife/JucjabhHUcIxCMkTtEs3Oslzzduxik yhtpAmlYYXpJk0WLkhu/ApTmBk0lhFok3+uYn+cDBkhvpdJ4GzdD6TseFPgWJUrEheb7 3SF/QRgMmLZGLHSgy5vhkJmiJzxibWy9VRKyetsn07R4JnOmPJgyXlhpHMnl+nZ7mF/g HHTi+WnzUJWpJfpLKiEEXg+7AM0f+xcJpz8JkESebNAzB5tbmR2L/qWLGDLCyZ6VqUHm pBqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=Tyt2eJi+oafMjjBPvA1TgKuO6cEySW4aGtimWOSh6AU=; b=Yf939AAlex2hqz/9Z6lNkJBLNaPbuxkoVHH9MfukLHsRHMZKvJfKBXfMhICJpgM/C+ jDRUknqWZO2wi7zUVY0m40S8OP3VkKVxPtUp3sXj1pOwUtrh3FijVg9S5Qxb8F1jXiuY soZdoAIL4+u5Vf2Ed8PIzpw8g1JlsxO+cpwrvYhMt/MufRVvw+1grOZ5ueSHaUhpJN60 wpj04h8opf7h4YHZnIflz/nrc9UD2+gP7G/B4RighyjguZ7tTNiZdIVLMtOx5g/12QKl CDM7ELAZFyZ3yerpdLuXE/q5iN9pz6KHd17CHWHnP+u66upQbymRHHJoke3SKkskuHzw KaYg== X-Gm-Message-State: AOAM532IXijBnZUPI9HhyFV5aIBli40MG9Cbg5Ae4uFbGJBko1LGa8LY JlLgAwZ8poQmponEwgPADQlZ38DDK506dw== X-Google-Smtp-Source: ABdhPJwePYIQ/Aci0o4xDcmtIq8a1cB6Kmnt4zT6HQSsahARS5vYS53UyJn1advdGus3wZ0CP6ChyQ== X-Received: by 2002:a17:906:7c48:: with SMTP id g8mr10525995ejp.138.1616687434318; Thu, 25 Mar 2021 08:50:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id o6sm2859103edw.24.2021.03.25.08.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 08:50:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Mar 2021 16:49:49 +0100 Message-Id: <20210325154956.2405162-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210325154956.2405162-1-andreas.rheinhardt@gmail.com> References: <20210325154956.2405162-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/12] avcodec/vorbisenc, wmavoice: Use put_bits_left() where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbisenc.c | 4 ++-- libavcodec/wmavoice.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index f8a08f816f..080017e2bf 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -155,7 +155,7 @@ static inline int put_codeword(PutBitContext *pb, vorbis_enc_codebook *cb, av_assert2(entry >= 0); av_assert2(entry < cb->nentries); av_assert2(cb->lens[entry]); - if (pb->size_in_bits - put_bits_count(pb) < cb->lens[entry]) + if (put_bits_left(pb) < cb->lens[entry]) return AVERROR(EINVAL); put_bits(pb, cb->lens[entry], cb->codewords[entry]); return 0; @@ -798,7 +798,7 @@ static int floor_encode(vorbis_enc_context *venc, vorbis_enc_floor *fc, int coded[MAX_FLOOR_VALUES]; // first 2 values are unused int i, counter; - if (pb->size_in_bits - put_bits_count(pb) < 1 + 2 * ilog(range - 1)) + if (put_bits_left(pb) < 1 + 2 * ilog(range - 1)) return AVERROR(EINVAL); put_bits(pb, 1, 1); // non zero put_bits(pb, ilog(range - 1), posts[0]); diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index fbdb865360..e76807faa5 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1881,7 +1881,7 @@ static void copy_bits(PutBitContext *pb, rmn_bits = rmn_bytes = get_bits_left(gb); if (rmn_bits < nbits) return; - if (nbits > pb->size_in_bits - put_bits_count(pb)) + if (nbits > put_bits_left(pb)) return; rmn_bits &= 7; rmn_bytes >>= 3; if ((rmn_bits = FFMIN(rmn_bits, nbits)) > 0)