From patchwork Sun Nov 7 05:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 31314 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2177334iok; Sat, 6 Nov 2021 22:52:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVPNrZyJbIb3sSseZosjzfbLscAyH9OITeY2psY841xoVDuLCm0kAAKwdK47sXz78Bq36i X-Received: by 2002:a17:906:9f20:: with SMTP id fy32mr46906806ejc.459.1636264358771; Sat, 06 Nov 2021 22:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636264358; cv=none; d=google.com; s=arc-20160816; b=LJTbLkSNqVuZfq0c3d+lFA+qsRQGO62u61R91b5Mp6eKtiLQFFEH6RbMmnlWU8O53m dFFbiV0FiMY4NyUbA9SploQ0z/PL0Ym7rZSSE+qVD3yfDExtphntdmwN3eZr8SNsN5JK G/ZvX+YlZVpw4h65KvFo2KINKrVCY4PNQiU/noi9LAO2rnN1eVamyAron6Xap+AO/7J3 XOE9mKVIwyG9afvtGLnaz0tGNKezMcuawRaP8vs54Zt3BiQv0nELi686ebvaVV0cmSmu upFwxupq0YsfHFdomaSjgmMfvSdo0Yvr2o3ylOwEr2Hv6U8EZoeRxWZMLrKZK5nV8o/T n/0g== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=1JcwovFAEtqF6khWa/9jR2ZPl14DU6Gmq1wYgWF9nPY=; b=pojud67BN+WbWkISfj5dfXNSnnEWu1nyjb59LsQSBXBUKLIvNIKcSippAQlI9+fH73 hlSvScnwoOA/Gb/TdoqP/sD4/mGaJ6ahCrAXkiuBPbxqCNZGhjP5SqdoY6U+IgdRbWtG ZV3N/bOnFryFwo0Ag/Fq3RqY0jsmlmV79rXtc7/zQtRCdY0hqx/xJvhzrFXxVBWanj+s NT3yLwDMaSYGAGNaTZ70xeTpX01rBIIjk8A37Q203iG2cu9AsFNPhyIR1GoyMX7CWzlE t14E1xYhrd5/OxAUh1lcFrkDpEEifeZSI9twHapcxTIC7bREDXY3dAKM7qvHiDSNSRZp STIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DgIqbYw3; 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 cm6si19355064edb.444.2021.11.06.22.52.38; Sat, 06 Nov 2021 22:52:38 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DgIqbYw3; 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 D9C5F68A636; Sun, 7 Nov 2021 07:52:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A30F568A0EA for ; Sun, 7 Nov 2021 07:52:26 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id s136so12134220pgs.4 for ; Sat, 06 Nov 2021 22:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yF1trBxXvWAeDzqvGhDcbVwk3kzd/CtEiiSC09scF5c=; b=DgIqbYw3vryw0pi7Jr62Iw/AjYxja6rs4G3I4W2qgSkoPJQnw+kSjg7coIB9felEYb +1GSpAfm0yIhiOk5SFNQt+WG9VOMul6ClHQDAQOlr6CC9TPgEKKSXs9hAtw/1wETdTMH jyA/FkiT86bBp9vm5Aig5zuTmlQkeffKiUskytmfRkWAqEot9iBXRzey5iA9r/u2Oetv UERKc0IEXXXBjR1E6hkgMrKRY52Bsxiuyl4J54jPAXGHJkSZvg6Vv9yNnfpqsus+P9zC mEKfK+GpycyATjxv5K/qYT9WwjrR6yJlSwHl+TqIkTOa7FK0mxkSUFp2+knKmjL4Kua+ 1+yw== 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:mime-version :content-transfer-encoding; bh=yF1trBxXvWAeDzqvGhDcbVwk3kzd/CtEiiSC09scF5c=; b=7Gd3p7mMoXZ1EYLjakMc/ocpcqMYnUNkLmSqhV7iH3sTmZ/p30xmYkquU0NukqudR3 5nhzq7iSDUWmttVRlLgi0iYGPNhvg/VaZMRzU9K7P9KGjFC2gQv6nP8LD+juw3xszxZa K5ti9BeDBdlSzVO7cx8+n0tiELCVilW2Opo1X1sUlQGAgbu4CjX93K9Nyv/4wbELze44 qc2sc9Is1W/CS25DCiQsQsQx4gv0sjgOpaLvmwAFvQdVD9wFd9ALeZybQ56XbMD45r5V mvTJ7w5lwDKYUbrv8+rJ+5uTBsf1GBo+q/OSzDjXiWOXNS74GlPeo7hQ93HDqVXQIS3/ KNyw== X-Gm-Message-State: AOAM5314DNKqd+pk2xcey6Nn80kCDLAVldONRZFX4sGD74hm85fohafl oYsbCxEUr33QuA4vEjsWet/ZUQonABY= X-Received: by 2002:a63:4512:: with SMTP id s18mr47047426pga.388.1636264344784; Sat, 06 Nov 2021 22:52:24 -0700 (PDT) Received: from MacBook-Pro.hitronhub.home (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id s10sm9626365pji.55.2021.11.06.22.52.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Nov 2021 22:52:24 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Nov 2021 22:52:21 -0700 Message-Id: <20211107055221.99121-1-mindmark@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: Ldzgk6HSlAfR 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.29.2 diff --git a/libswscale/input.c b/libswscale/input.c index 336f957c8c..ea50c9de5c 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) { @@ -1013,17 +1013,16 @@ static av_always_inline void planar_rgbf32_to_y(uint8_t *_dst, const uint8_t *_s } } -#undef rdpx - static av_always_inline void grayf32ToY16_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, const uint8_t *unused2, int width, uint32_t *unused) { int i; const float *src = (const float *)_src; uint16_t *dst = (uint16_t *)_dst; + int is_be = 0; for (i = 0; i < width; ++i){ - dst[i] = av_clip_uint16(lrintf(65535.0f * src[i])); + dst[i] = av_clip_uint16(lrintf(65535.0f * rdpx(src + i))); } } @@ -1033,12 +1032,15 @@ static av_always_inline void grayf32ToY16_bswap_c(uint8_t *_dst, const uint8_t * int i; const uint32_t *src = (const uint32_t *)_src; uint16_t *dst = (uint16_t *)_dst; + int is_be = 1; for (i = 0; i < width; ++i){ - dst[i] = av_clip_uint16(lrintf(65535.0f * av_int2float(av_bswap32(src[i])))); + dst[i] = av_clip_uint16(lrintf(65535.0f * rdpx(src+ i))); } } +#undef rdpx + #define rgb9plus_planar_funcs_endian(nbits, endian_name, endian) \ static void planar_rgb##nbits##endian_name##_to_y(uint8_t *dst, const uint8_t *src[4], \ int w, int32_t *rgb2yuv) \