From patchwork Mon Nov 8 02:27:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 31327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp3160737iok; Sun, 7 Nov 2021 18:27:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjUarVeoaHp6ommWAK6kZpyGiXu/hY6nj12YCRitBuIcbY4l0UPwCi6+NLsjeaBeMo7kj2 X-Received: by 2002:aa7:c044:: with SMTP id k4mr76703104edo.369.1636338449160; Sun, 07 Nov 2021 18:27:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636338449; cv=none; d=google.com; s=arc-20160816; b=x8M+dAuJQun+RW9T/hXcF5nrfhccjfMl/T6NoETqOLTkr0VSMe6wVt8ToJFkYlNonR bUn8F2o1Ml0uNq6A477QR1iKnRpQa7JWUBH5ihrV+p/wGI+N6hGPUNdjeALL8nK5+b3r KXYgGpM/XyfJ6iIFLcWcfnIZsN0KSig/zfwEXQgdQuLvOwtSVZG7gTGyLSyVwLMguc9/ kqwKQay9C3K/JTFy14eRrQXUnmoWOCLayDMBYFIysHHPqGdEOcbJLwVL7pdjh/Yjz0kd ztAHkncKWhMwYu591lykBJJoYL+6hN7beZj1jzziNjrV5/8N7V9D3HRUIMtNCO+VkEq7 NQUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=H4iZtBhelg9z8ChAH196zuGWcsIBc88dhhf4SuE1FVc=; b=bOjjCMu0/J81of8WoovTb0QYsSN77x8dhNYwR9wboHcum7rM10SX1tlUBFrBNAI8Fd 8179q708QmYUumQjEcYcqHCjg5lxX1IuJYAGzYIQhYiOH5OyLGXJiLH8Jx7NChKpz/ED A9c/pYVe/47rPY4M25tiUHsuFFOQJv/Fldy2QsYHBABRc1z6hqUX3DIXhk+hkrhA1THx phsMQg+ArzT9rP4X9fd2eWsiVKSZ+Wz/M9XKEZmEjLh2TjrPo4o2+opxWoLKaa9BZMba hm6vf0Rxn36h6TrlU7drIsOMHDHTn318lzgek3yYYscqO8UjLZLf/cMrUJVt2puLf1mv FRfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XC2BqT8P; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x19si25009125edl.627.2021.11.07.18.27.28; Sun, 07 Nov 2021 18:27:29 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XC2BqT8P; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E87A368A7D4; Mon, 8 Nov 2021 04:27:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EA4D68A037 for ; Mon, 8 Nov 2021 04:27:19 +0200 (EET) Received: by mail-pl1-f170.google.com with SMTP id n8so14806653plf.4 for ; Sun, 07 Nov 2021 18:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BpWxXBMKPnIgM/fh7DzAS/JeGIZWzRqVoOwXYt4xL18=; b=XC2BqT8PiveLH5RPNZThzA6DCmI0CtF1jedpwrJyLuH1Sv7eBKKcMcmMsYLl5++q1i nGgBbUnUBTub6Wpaleg6pfCBHQnieozdQjxXFbNLf2rmq8KkM2zPRe06rV+2nZP3RCd3 zwBBprzM1xmQJ2narS8XppRcaqytBoRg9lIn9c/RInM0/Ne4cSW+lzgoDHCIckvKIZEi OzfRXM7eFO+J9VngyxkOW1Ng71GmrRjVJ3L4j81b9Ux+cDhKO+GGo6m4e2Heal5UmZpi 8jDmCgPurfUtPPKghzXHdKqyHE7CD26OCPtApCyLGy8ocsm8aBzWbXU711JAYGklM377 BG3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BpWxXBMKPnIgM/fh7DzAS/JeGIZWzRqVoOwXYt4xL18=; b=J8H7qsVjAGRMyCCD8s4I2R1Bkt9LrMpGlVy8dA+wEdT4QQLknIhDaGa7l1xQTrlod9 l76D3yf/w8l+0tOYssCRe0RSBIUfmOdneja9WEF7wp6LcU2pamSD/cxDnKVJjqWhX26n r3VNM8ODQTG+IOVeLpqvKM0HyZko1wtWfE+Nuf4sfEyxU0xsdLb7kT/R+sxzbSOiHRPA zFod4ez29AoHCxYBIuE8dShRjjfLgNWb31vhwJRxaaCgZQkqHeu3kWFcoH+/UowK3TKh MPtFGT141ueIiu3B+LFATheck1xfGOpKzrn6Pk6GaNjsCnfnh36i3Tv3PRSQi4JZ+Um9 jwHA== X-Gm-Message-State: AOAM532RVY4hQgkLRIiDPRQRl0dTuN1birSadAsUgsOjQdm9hh495nDi dVOCUwbwwqvseVKzfC1s0hV0THzqzRo= X-Received: by 2002:a17:90b:2409:: with SMTP id nr9mr48858204pjb.244.1636338437433; Sun, 07 Nov 2021 18:27:17 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id y4sm14372457pfi.178.2021.11.07.18.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Nov 2021 18:27:17 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Nov 2021 18:27:04 -0800 Message-Id: <20211108022704.812-2-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211108022704.812-1-mindmark@gmail.com> References: <20211108022704.812-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] swscale/input: clamp rgbf32 values between 0, 1 before scaling 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 Cc: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M/JJAEjr82YP From: Mark Reid if the float pixel * 65535.0f > 2147483647.0f lrintf may overfow and return negative values, depending on implementation. nan and +/-inf values may also be implementation defined clamp the values between 0,1 before scaling, so lrintf always works. values <=0.0f, -inf, nan = 0.0f values >=1.0f, +inf = 1.0f --- libswscale/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/input.c b/libswscale/input.c index 90efdd2ffc..fc8242a758 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -964,7 +964,7 @@ static av_always_inline void planar_rgb16_to_uv(uint8_t *_dstU, uint8_t *_dstV, } #undef rdpx -#define rdpx(src) (is_be ? av_int2float(AV_RB32(src)): av_int2float(AV_RL32(src))) +#define rdpx(src) (FFMIN(FFMAX(is_be ? av_int2float(AV_RB32(src)): av_int2float(AV_RL32(src)), 0.0f), 1.0f)) static av_always_inline void planar_rgbf32_to_a(uint8_t *_dst, const uint8_t *_src[4], int width, int is_be, int32_t *rgb2yuv) {