From patchwork Tue Sep 13 14:51:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 37901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp743124pzh; Tue, 13 Sep 2022 07:51:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR4mqHbs9D0GSlsFS/M+Wi6P693UP28gcGwCqgMxm4+THfpJ5Re3CYW7dKBEk7neC/u4NZzT X-Received: by 2002:a17:907:1de6:b0:77a:c72a:b853 with SMTP id og38-20020a1709071de600b0077ac72ab853mr11844976ejc.353.1663080675497; Tue, 13 Sep 2022 07:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663080675; cv=none; d=google.com; s=arc-20160816; b=juPQugH1x2i4nDtHNXF68Q5bTDb2TeLa5m0hFV1bOyhnYV87PJfxNE58RSzMPTH9MD Zvi18ZWw5zKqcsUmp+nEM7E59uVnj2gq0ry1iFUBTtYl4ey9zTGsxqg3sYQymLjxV8CF A3/qS8ZvzNoNHcZAdK4JsOSXzq6y1zWP7o+5MomEpBnkN+CQYiX5Ru/YAsWU534b/PQx vI5qVem7f4CbDHLhJp2TnMs9qRB6tKHeAWRGeuG+6Q9D6szt9B/Qo1Y+ia6yxlWlOGiN dTUvlmY6+PCw3r9gw+ms6P/aX3i+bRBBH5z7M4Uf0tFoozZzAsy0l5xK/yxljosBNEZT ZR3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=F52zFAbmqXLAVOB5AdRZEhYPghkz0cHYNttw64+NoFQ=; b=tPVQqltCgZ8Jlom3WobmmQWoxUKpoL+nmgNa0gwIBCaKuNXMzTiRrBl8BR7Fc7VO0T 8RxrustS2+DLZsF7xDjEHdEIXJI48KNIXAgw9O+NBo0i4wwQ0JAWSxjO7bdbRI+UtRE5 BtvPwva9m72iHr4+WzYg8z0qKU5pO4HNyBvKcgwBFsaXPYy9VvOZUtL26QmQH0xl577y EZSQz5xt+noJFxF4BEqYRsyTfbZm03Ef0mWBhVtwbuGBOyVwRpQfHYwN2OBYMxO5jII5 OdO9q9sg5yi7JXbFGLYPDYvc19uUpRnjyViOJ61hNuN27Vfc6O/Y1wn98MFC7xtgcsCy +xug== 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 qb17-20020a1709077e9100b0071200866b78si9358043ejc.689.2022.09.13.07.51.14; Tue, 13 Sep 2022 07:51: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 5D17768BAE8; Tue, 13 Sep 2022 17:51:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 872C368B972 for ; Tue, 13 Sep 2022 17:51:04 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 9F1BCC0012 for ; Tue, 13 Sep 2022 17:51:03 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 17:51:03 +0300 Message-Id: <20220913145103.3595-1-remi@remlab.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc: avoid rounding errors in float constants 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: XMK1JhyoLoyh From: Rémi Denis-Courmont INT_MAX is (typically) a value with 31 significant bits but float can only represent 23 significant bits, leading to a rounding error. This substitutes the actual rounded value to avoid a clang warning: warning: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Wimplicit-const-int-float-conversion] --- libavcodec/aaccoder.c | 2 +- libavcodec/imc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index e3b6b2f02c..877558c91c 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -531,7 +531,7 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, int nz = 0; bandaddr[idx] = w * 16 + g; - qmin = INT_MAX; + qmin = -INT_MIN; qmax = 0.0f; for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g]; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 92f9980ded..d4dfe3222c 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -917,7 +917,7 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch) chctx->flcoeffs1, chctx->flcoeffs2); for(i=0; iflcoeffs1[i] > INT_MAX) { + if(chctx->flcoeffs1[i] > -INT_MIN) { av_log(avctx, AV_LOG_ERROR, "scalefactor out of range\n"); return AVERROR_INVALIDDATA; }