From patchwork Tue Jun 1 07:33:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3583639iof; Tue, 1 Jun 2021 00:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEawKR1MhAclUdFTfHzb9prFryQJnGGIQwIoDcxwitPrCjJLs8fds9xke1eoED9thQbQLH X-Received: by 2002:a50:f418:: with SMTP id r24mr31969625edm.175.1622533230746; Tue, 01 Jun 2021 00:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622533230; cv=none; d=google.com; s=arc-20160816; b=iqJO0qINLjLcAkv5TV171aDPiLjE/PN/I4XCA5WrhkjMD5LeGU+exK8ax/oJEYOASm yH4ydPRCguOhCvDC5YYuwWXqmVXFt2ZQzyt5MlI0SUQ1DJJuz3apx35AiwFC3URHE2im VUdIbWq3GCiVQq9yGqF0gTlm1eiBQoRgByOoUs3AFY/6V4qHU3uLiH523EnjZSkM4QNf CLiWiIkQA1VLthu/RzKS35Ad8ses2i5AH0GZx+56KHY7to0EbjHT5vCZS6mQpBfRJnWu gdxbwRXTpW4AWWUE0AtAjoA/23g/WYJ2fuL0pjNArP9NhS0gLDel6Npsalme6xzi2J9P xOBA== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=pzGzdJj+AbuKzsEJPyc8NQa5GY6V7pdzLDFTNRpDDWM=; b=AHdu0xEavp/ej6duSX/JfWSeS/iHitsKKfHWXz7D/SDYePes6Sy7OOtfDKId4D45wl yIeQnZ1+0oYgfmLolOznH9Vw+ZUkUAYNSIP/kTW4OSmsJL9BRQfUW5zSdMgpxttJQm4l fD4Qgo/tcJpMMaZ+BfA14sVIKVZu58QIPWjHEDlI6BPGvXQ6sNIcjyA+D9cEbgG9JkVJ SQo2wZWNslBFkEJv0cagqeuFtjHRj3KfipkvcTSKDw9n1e9Z9Qb649c7egGT+a28bfBB SBzIfVs4dAFRBcJ6HtdD2k1Et7mlGsK2+RBtK4SUudA4s1ZMwrgVEKJuaGyUsgP9mo// PBAw== 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 jg15si3285097ejc.143.2021.06.01.00.40.30; Tue, 01 Jun 2021 00:40:30 -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 79CC7689B3A; Tue, 1 Jun 2021 10:40:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0350E6899BB for ; Tue, 1 Jun 2021 10:40:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lnyum-00By3M-0H for ffmpeg-devel@ffmpeg.org; Tue, 01 Jun 2021 09:34:16 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id nytolkHj5ljeHnytoloUNp; Tue, 01 Jun 2021 09:33:16 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=b6Cgc3eQxz6ncmsgIP0A:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 1 Jun 2021 09:33:14 +0200 Message-Id: <20210601073315.9104-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210601073315.9104-1-michael@niedermayer.cc> References: <20210601073315.9104-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHrn/vzEyqFNORWLg7katG3x+A1a11ejv++u95vdi9Abyx4VkKJVSMfUJeEZhQlonR42KMa7+ihGzPU056GQgTFfaVH7KUrKeR6ishcmEeRtlIoboKTw wHa/x5mtrqp4u9AzBM3xkJZ23WxDRnIjom2ZaicnsDxj6EuKcEMK32yn Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/aaccoder: Add minimal bias in search_for_ms() 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: JkwMl71zpF7w Fixes: floating point division by 0 Fixes: Ticket8218 Signed-off-by: Michael Niedermayer --- libavcodec/aaccoder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index baa82489b1..11b0559e1c 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -843,25 +843,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe) sce0->ics.swb_sizes[g], sce0->sf_idx[w*16+g], sce0->band_type[w*16+g], - lambda / band0->threshold, INFINITY, &b1, NULL, 0); + lambda / (band0->threshold + FLT_MIN), INFINITY, &b1, NULL, 0); dist1 += quantize_band_cost(s, &sce1->coeffs[start + (w+w2)*128], R34, sce1->ics.swb_sizes[g], sce1->sf_idx[w*16+g], sce1->band_type[w*16+g], - lambda / band1->threshold, INFINITY, &b2, NULL, 0); + lambda / (band1->threshold + FLT_MIN), INFINITY, &b2, NULL, 0); dist2 += quantize_band_cost(s, M, M34, sce0->ics.swb_sizes[g], mididx, midcb, - lambda / minthr, INFINITY, &b3, NULL, 0); + lambda / (minthr + FLT_MIN), INFINITY, &b3, NULL, 0); dist2 += quantize_band_cost(s, S, S34, sce1->ics.swb_sizes[g], sididx, sidcb, - mslambda / (minthr * bmax), INFINITY, &b4, NULL, 0); + mslambda / (minthr * bmax + FLT_MIN), INFINITY, &b4, NULL, 0); B0 += b1+b2; B1 += b3+b4; dist1 -= b1+b2;