From patchwork Mon May 30 19:09:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2441034pzj; Mon, 30 May 2022 12:09:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQ24rYNwULkcITwHW55qu2i7FRBGZnk68yYCZ53N18rORaC5jnJbRTekDp3Se6MoS27WkA X-Received: by 2002:a17:907:94c3:b0:6ff:8cd6:93d6 with SMTP id dn3-20020a17090794c300b006ff8cd693d6mr3900725ejc.118.1653937766439; Mon, 30 May 2022 12:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653937766; cv=none; d=google.com; s=arc-20160816; b=hWi92mm4kj3A4TS6l+TiGeYdI5w/n4ynyOslFUBWHHG114hn/9q5u/Q3OFkfgxC3yO pI4jF4vnJrjQLvx1MNF8ZeXvjrjKdAKZm3VHZJvmnvXKE3rmY+V/YJl/xga7tdLj+5Lv PRfXRmz+ft5U3qaFWqcKYkfpXvqgM5PzRiO8cZ8vKY8v9qvN1PkrKQjIsyp0qBgcIXV1 zvly440cu28x4lXWNUAUxkJL45dBr5RUmuiROPL3CgPonctky8SvuT+aLW3lE1KF+x3V B8qK5u6vy2WVBOi5Uv5taohKMSmbQZbVDeK4d7RZJLEBlzCRY2o/kuoBNzt12eWEpzcN 8wsA== 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=EIEcijPm7ztKE0Pd2JfpALJieJu9A/4AU5hkpYbPHEQ=; b=tvMxMaUuKfr91t7UcY3PGOPrWXyEJVF7MF+BxSZNHb0aWtfce6fGIb3DHVs82QLZIS rw+RW+M62krLeWBW4ORh1/DVA3LS6gcoZUXxbTyCzqUwo2m9SpJmMtwHvHSC13ufyq10 4lhySmFvZlc0n6g7RcVgTIToVeGtH7b9jx/wdY4vshygWnkMTRiykNZcGwG8THpLIIX7 l00US4okod4sfO0WSovtzzOs8PG7CcBvZ04Px0QiXIzqB9rOUtTAJ6kJYA+5U/CBdrr9 AyhL7yzX7smrtddpRLpEHDtg4FzTyUbMJ1dyMe7yV3d3rz413YO+WlVJZzRKdSG0Rtin wV6w== 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 sa1-20020a1709076d0100b006df76385ce2si197928ejc.386.2022.05.30.12.09.24; Mon, 30 May 2022 12:09:26 -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 E6DED68B609; Mon, 30 May 2022 22:09:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-1.mx.upcmail.net (vie01a-dmta-at02-1.mx.upcmail.net [62.179.121.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8878368B3C4 for ; Mon, 30 May 2022 22:09:14 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nvklM-0003zy-Vy for ffmpeg-devel@ffmpeg.org; Mon, 30 May 2022 21:09:12 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id vkasnXLAv8s8UvklMnwiWw; Mon, 30 May 2022 21:09:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id vklMndvZo8eSWvklMn6TQn; Mon, 30 May 2022 21:09:12 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62951658 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=-o2QDF7dRAxiGfaEJtIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 30 May 2022 21:09:10 +0200 Message-Id: <20220530190911.20843-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFMzFdV9fxyhU9Y86MiFF0q1oKIPKn8wLU/J5/ggBo132WvNryLxq/2weIQAIiMjN/eoCQLCsS42mb4lza85VO/CVXZuZoTnwXk8DwlhW/zMJn6uVX6T +hFGFh5+gC7m99vIC0v2DW18g/lJogqxGzkAkjgAi5bfxAGCnTz65+pYVGVDR1NN7fKj53UP5Z95uw== Subject: [FFmpeg-devel] [PATCH 1/2] avutil/opt: Alpha workaround 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: lsoXmGinbZA7 alpha-linux-gnu-gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010 with qemu-alpha version 2.11.1(Debian 1:2.11+dfsg-1ubuntu7.39) trigger a FPE on the DBL_MAX * 90000 operation Iam not 100% sure why, but if i mess with mfp-trap-mode the compiler produces internal compiler errors This issue seems not to affect the fate box with an older compiler Ive also tried the gcc 6, gcc 7, gcc 8 packages with no luck Signed-off-by: Michael Niedermayer --- libavutil/opt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 8ffb10449b..78968cd894 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -101,8 +101,9 @@ FF_ENABLE_DEPRECATION_WARNINGS static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) { + int maxcheck = o->max == DBL_MAX ? o->max < num * intnum / den : (o->max * den < num * intnum); if (o->type != AV_OPT_TYPE_FLAGS && - (!den || o->max * den < num * intnum || o->min * den > num * intnum)) { + (!den || maxcheck || o->min * den > num * intnum)) { num = den ? num * intnum / den : (num && intnum ? INFINITY : NAN); av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", num, o->name, o->min, o->max);