From patchwork Sun Jun 6 13:47:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2716806iof; Sun, 6 Jun 2021 06:49:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkBqGcW+WemcX9/PDHejtEiHaoBUTlXAOYtcOwI2JGv/lvf3x9+TxhPxEy4qwvilz5FY7m X-Received: by 2002:a50:fc9a:: with SMTP id f26mr13028249edq.216.1622987360002; Sun, 06 Jun 2021 06:49:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622987359; cv=none; d=google.com; s=arc-20160816; b=CSDpQ5ArKd1d4LxBAzHCY2hiXLYQRl74Zw7OvkRExNXW4QIWyLGsNg+JQi/ih9QEse BV+HR/NqMqVjB7XpIFZS7h+5RGt+ieyJ9qqm5SVzYE2741sbmZuyCtz+nJ2T8CTHyzP8 +lTLo/dp+Me5rD/tVk5A26LDLjcf2I36h1iAiRz+OaBYhi1QeIGVOa+frJpKT/UHBkYH MmeFKGEBvdaDvSNOYj7PTPP1EhxjgySlPkmVCI0GANY3lgyVqgX1OUU/8QtNyy/PcM0B Dkr/pfVUqiYHJIzsfow3HE1AlMFY0EsX16yfai0BWIWLMKraLppKT8/YCnWpNmX2Lnh2 Jcsw== 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=HQJ2WowQ+jctvBN3mcY1qacwk7+hZjUrRwOxVAnKTMY=; b=PTXViClAAZ/Ou5uky8Fm/JfLcuysHZDsC3jVYjI066yoL86asAfnPbGP2eXnL3knH/ jbNm+yISnhU7eCjk8HZQsKPbHsdSjwToukzgbRqTd5tAhwuzAatWakhOPVWTozFYxJZF Ojhy4tLq+bYeB+5lSaUcmbvt0yQO3orMZ+c4LFeR2U5xP4FESV+Zz13M+acaP7uh5Egy 3WxJeQLKbgEDaRGAa7TE9uhyVoc69Yhm9NAU6Lwr/JQZAHzvHIo9SAIiR2O4hT5pjsQ3 dlflrrorItunrPkbOIMGUn3yFzBmoinLGmpCApeOJmasKB/pfP9ldw10mtcO5yKPAgGu ATIw== 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 fh1si9378253ejc.91.2021.06.06.06.49.19; Sun, 06 Jun 2021 06:49:19 -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 F215468A756; Sun, 6 Jun 2021 16:49:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C028168A42C for ; Sun, 6 Jun 2021 16:48:58 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lpt97-001DBC-0H for ffmpeg-devel@ffmpeg.org; Sun, 06 Jun 2021 15:48:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pt89lYUhvljeHpt89lkgNf; Sun, 06 Jun 2021 15:47:57 +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=L9z0o7ZFF90q1LJVgu4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Jun 2021 15:47:53 +0200 Message-Id: <20210606134757.18919-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfHG57K4Afi2L7m0QzxILuQKcDdBnC9wKKY0JygTEyrwLemlIH4kqnuENuI4QgRZGVnDa4M4Jly4xmNqTTlLWaKGYF1mqB+VOMHpCepTFe1MIsjIuisS0 4y1HAUoz4fy7YKXQU1NS8PswzxpZWKe9KvyioXUJoebLghT6hX5lVdmy Subject: [FFmpeg-devel] [PATCH 1/5] avfilter/vf_ciescope: Handle black as very dark neutral gray 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: s7CPRbJ7TsMk Fixes: floating point division by 0 Fixes: undefined behavior in handling NaN Fixes: Ticket 8268 Signed-off-by: Michael Niedermayer --- libavfilter/vf_ciescope.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index b3b906f517..f8fe554c06 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -844,6 +844,9 @@ rgb_to_xy(double rc, { double sum; + if (rc == 0 && gc == 0 && bc == 0) + rc = gc = bc = 0.1/65536; + *x = m[0][0] * rc + m[0][1] * gc + m[0][2] * bc; *y = m[1][0] * rc + m[1][1] * gc + m[1][2] * bc; *z = m[2][0] * rc + m[2][1] * gc + m[2][2] * bc; From patchwork Sun Jun 6 13:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2719054iof; Sun, 6 Jun 2021 06:54:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyPUXmkIKrcpzu6A/xzrXn646M+U1bTOgpskITYhCCTlfSbDY8EgDj0Lzi+tS6aPO04Bkp X-Received: by 2002:a17:906:c9d8:: with SMTP id hk24mr13755990ejb.480.1622987672353; Sun, 06 Jun 2021 06:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622987672; cv=none; d=google.com; s=arc-20160816; b=zCSi9vebI3W4RkFbaxSjcySJWubUrt+SogWwKl3QYrxbNiULS3uzTUiYOqhEJFgwOY /FWrb+xUHdrZVoKtgHbp96gP5JecbHDBBS9fRmCb0GhumFg/nA3XYAlkH5fh44fFIYuy OyqfM7/YipxHecwaA70SFrOnbdZB7qjXrga1sIFMvOdzeufMhB7qPPW9omDOdabovMGG qxU4EQzreDn4crVMOQywAyonpj0F8pxo5ZVpFG7VMZQbe8NYboyUE9zmaNXIK1VrLXWy CF9D2F7YuZ3nsQT/kNCZl1P46PsDqLoJiXdPASDbJ4msewiK+SXHlrKC+D8gxLdoIca0 NG2g== 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=oDqM9LUkAtl48Geg7lzmrhlb8OSayNPLFOffAFsEqBE=; b=JTeE3jOQC1SSvX7ujLS35wfK2q0Vma6d1cAWHFiRQaI3hZLaE4VMPa+6e703rvCzFb DQPkzwBv6qi/TAjMya2BrBUa1n8HcaIaAU7V8K8+ZWRwBZguWDaWdRZmE4Axp/SQlm5U ykRt87J+CRvAk1unNQS8w9SDGOnFVELS8sMMmGeoUiLsPIglQdcqCA5uWSJFWfU7x8MS zG46ZdOxvCLMuNZ3iyK+0YGuiar5B8NNKtx6X2Lc9g8+BV+nooH0aTlc1TBxVpDILlou OjWfSotZuh/xxUAQBA1Kef7Tv3ToSkgc1KxWKi78WmuKCypsHH2rJF8lq3M3TiOriLaP KKGQ== 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 t26si10322052edi.390.2021.06.06.06.54.32; Sun, 06 Jun 2021 06:54:32 -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 D8A6168A787; Sun, 6 Jun 2021 16:54:25 +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 60F8E68A783 for ; Sun, 6 Jun 2021 16:54:19 +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 1lpt97-007Pu9-0H for ffmpeg-devel@ffmpeg.org; Sun, 06 Jun 2021 15:48:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pt89lYUjKljeHpt89lkgOM; Sun, 06 Jun 2021 15:47:57 +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=dZ5ug8ybREYwFxlgrXAA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Jun 2021 15:47:54 +0200 Message-Id: <20210606134757.18919-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210606134757.18919-1-michael@niedermayer.cc> References: <20210606134757.18919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHG57K4Afi2L7m0QzxILuQKcDdBnC9wKKY0JygTEyrwLemlIH4kqnuENuI4QgRZGVnDa4M4Jly4xmNqTTlLWaKGYF1mqB+VOMHpCepTFe1MIsjIuisS0 4y1HAUoz4fy7YKXQU1NS8PswzxpZWKe9KvyioXUJoebLghT6hX5lVdmy Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/vf_dctdnoiz: Check threads 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: O+l94V9FeVHY Fixes: floating point division by 0 Fixes: Ticket 8269 Signed-off-by: Michael Niedermayer --- libavfilter/vf_dctdnoiz.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index 63b1b29ea2..f09ab19c4d 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -568,6 +568,9 @@ static int config_input(AVFilterLink *inlink) av_log(ctx, AV_LOG_DEBUG, "threads: [max=%d hmax=%d user=%d] => %d\n", MAX_THREADS, max_slice_h, ff_filter_get_nb_threads(ctx), s->nb_threads); + if (!s->nb_threads) + return AVERROR(EINVAL); + s->p_linesize = linesize = FFALIGN(s->pr_width, 32); for (i = 0; i < 2; i++) { s->cbuf[i][0] = av_malloc_array(linesize * s->pr_height, sizeof(*s->cbuf[i][0])); From patchwork Sun Jun 6 13:47:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2718882iof; Sun, 6 Jun 2021 06:54:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsskn5z61ErRCBWihOxi85pladaV8gVazmVzFILZXJp18mIY7GS/cD2XPDET1x/WruZ7eM X-Received: by 2002:a17:906:6d97:: with SMTP id h23mr13478451ejt.467.1622987653684; Sun, 06 Jun 2021 06:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622987653; cv=none; d=google.com; s=arc-20160816; b=hpuimTsD0AdK7jSsgwM//seNYd+/cK+6yy2sOA5zdw8GSSxnetE8AkU5CeQjT8q5SM E/BjHc42P39zoNlfusFhYSg0GP2AMAUIC0jERznmGDaaMuBxy/I8p0SeEq9b0DnfCXhZ Vv1Bbj95DA54PNFTV69qxbL000jDch0E4kzMY5s8qn4MINq/wjK+UESsg5DJeNBKTmD5 BeECi/5YYetzkpJzHx/FSYCiYIInn88ci+j32zKG92DxZXPIEfwZyNfioPPFQqQ4ti9w 2c/EJw1ZujsnHWQiiglBICgRtYNEQXsVg3sA7D9uqlj3E8hdZHBYNXuh2Il9gmEbs89C li0w== 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=xhg+Avv6KVR0pJTRZGiKUKWGhEnuYO/r7ncFvTE1nDU=; b=s+KbckFXeQbiNxUWKGCLMq9/1UydVaLSYbuiBkqbaKGy3DJKqAAwiyjZv6EXw685nJ gdds5ToveLXDY6ie/MQ5t/lT6UDHyT2whzUCo9r8ldmJo7sd6kFyAU0bRSKARW2dC2gq rPzvN0Ueyudw39xkKBTgFbyZiHFBc/gteBIuWwHiWUS2fKsov/Sajkg32a4MISW3gT+z 0GeXuxsBGiV2yCFkoql2sD4uX76xxbaoLpNtSs+g5vPBx2R15Tlm5O145p9o5V9kVnjj MmACMwSoIkhDMI30U3ITliLOtlBw9ob3aNpCxA5Piauc4pddUaST7znN10It6lNmQ3Kk SvXA== 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 b15si10826130ejl.351.2021.06.06.06.54.13; Sun, 06 Jun 2021 06:54:13 -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 9FAE968A771; Sun, 6 Jun 2021 16:54:10 +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 5C98F6883D3 for ; Sun, 6 Jun 2021 16:54:03 +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 1lpt98-007Pu9-1W for ffmpeg-devel@ffmpeg.org; Sun, 06 Jun 2021 15:48:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pt89lYUjgljeHpt89lkgOa; Sun, 06 Jun 2021 15:47:58 +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=TY6tqG9Da4_a_vna3FYA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Jun 2021 15:47:55 +0200 Message-Id: <20210606134757.18919-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210606134757.18919-1-michael@niedermayer.cc> References: <20210606134757.18919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDa17lGcx04/olBunAzprRIRZdN8Bv+0woCy7t5JDAEJX/Zkipt9X3mSbnkQGzZpa0+cM+hgBROICrcs9Ltshey8lbLgqGbk0yJY9p1YxIJDasEqlHzc UZp6bP4NH0jDbsb/sZS/p8NgyzuW0p9MCrUQyTkTUCOFtswzTfRSOL1V Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_mestimate: Check b_count 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: cYcnzgLdzAks Fixes: left shift of negative value -1 Fixes: Ticket8270 Signed-off-by: Michael Niedermayer --- libavfilter/vf_mestimate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c index daf7fde95f..f1935244c1 100644 --- a/libavfilter/vf_mestimate.c +++ b/libavfilter/vf_mestimate.c @@ -100,6 +100,9 @@ static int config_input(AVFilterLink *inlink) s->b_height = inlink->h >> s->log2_mb_size; s->b_count = s->b_width * s->b_height; + if (s->b_count == 0) + return AVERROR(EINVAL); + for (i = 0; i < 3; i++) { s->mv_table[i] = av_mallocz_array(s->b_count, sizeof(*s->mv_table[0])); if (!s->mv_table[i]) From patchwork Sun Jun 6 13:47:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28116 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2718985iof; Sun, 6 Jun 2021 06:54:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx32Ex7xBeqbe5AXbTjduLFB4/a+rt0fgVeF101Cr+5Vv6iKIlmrFqJojQCtjwH80gPREt3 X-Received: by 2002:a05:6402:416:: with SMTP id q22mr15315710edv.204.1622987663543; Sun, 06 Jun 2021 06:54:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622987663; cv=none; d=google.com; s=arc-20160816; b=CD52O0Rob05veXG2bqY/34tJcSwnNHN5borke/R/Pwh4Oa1SUYrqm6EPJvpHfTeERM T+IctWkgrFgIPVxqkWX7u7QxhFwLJ6rC21Iz02ArKr4mLyQ91xanbUUFE8IXWOd3UWxP S/pn9QdRB12bUDe5N/JhgHwKO/K8p+9mV3z8HUSaiMx32NW7bCsgYEL50ytj3Yjlg7uv tgVI1Ac8N+0sY55rufy7IIgydKZH9gcMaUPMnTkoJ+iUPg7wDeAmTCB8r3kmynrvYk8R 0HfbWpp0IDVZYPI+tv75eWcKhEKQ1SGSaM8cH4+bZexnR6AKMJdK0xsFAumxHGoIvaBQ PRlw== 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=LXf/GkxyQwa+WHjjKrqGKt104IOSk579X2nO1Rk/Meg=; b=WJcFNYmJ5Jl1yRZcWzSXr54vOymuqwZaW6jepmPqhsIoWcaVwy5xFEZ/SjaewKIumT Ata5BlPdm/PgRC+DxELaf+6iONg8c5d3rWTWFlNaTps/FDBnaX7QBSNX1OMuzYH+3owG kL2hv2Isy79XaZiM5MDqboQQD/Gmp3aLX98QZOwfWxs3UQHRecUFfXjOWBcR7GsVyzG7 1GWo0ZnR/szn0pA6QSpB1LelJHnmHPXfgvb799u3LKakwOOHiU0BWTa/VunBEYG7pn8L Bm2XsMBqe5xb+5XIAiTp4feiFJ46WH8nfW5hqY2pAQR2xQnMuRnx7EqcrvOpVs0ukhUe 5Jmw== 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 18si1466995ejj.568.2021.06.06.06.54.22; Sun, 06 Jun 2021 06:54:23 -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 C0D5B68A77B; Sun, 6 Jun 2021 16:54:15 +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 B30AC68A708 for ; Sun, 6 Jun 2021 16:54:09 +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 1lpt98-007PbG-1W for ffmpeg-devel@ffmpeg.org; Sun, 06 Jun 2021 15:48:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pt8AlYUk1ljeHpt8AlkgOq; Sun, 06 Jun 2021 15:47:58 +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=QUQ-vUW5j5_T36z7vS8A:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Jun 2021 15:47:56 +0200 Message-Id: <20210606134757.18919-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210606134757.18919-1-michael@niedermayer.cc> References: <20210606134757.18919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDa17lGcx04/olBunAzprRIRZdN8Bv+0woCy7t5JDAEJX/Zkipt9X3mSbnkQGzZpa0+cM+hgBROICrcs9Ltshey8lbLgqGbk0yJY9p1YxIJDasEqlHzc UZp6bP4NH0jDbsb/sZS/p8NgyzuW0p9MCrUQyTkTUCOFtswzTfRSOL1V Subject: [FFmpeg-devel] [PATCH 4/5] avfilter/vf_fftdnoiz: Use lrintf() in export_row8() 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: uDUrmHqygFco Fixes: 1.04064e+10 is outside the range of representable values of type 'int' Fixes: Ticket 8279 Signed-off-by: Michael Niedermayer --- libavfilter/vf_fftdnoiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 7f4a6d88cf..8dc50b776f 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -161,7 +161,7 @@ static void export_row8(FFTComplex *src, uint8_t *dst, int rw, float scale, int int j; for (j = 0; j < rw; j++) - dst[j] = av_clip_uint8(src[j].re * scale + 0.5f); + dst[j] = av_clip_uint8(lrintf(src[j].re * scale)); } static void import_row16(FFTComplex *dst, uint8_t *srcp, int rw) From patchwork Sun Jun 6 13:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2716763iof; Sun, 6 Jun 2021 06:49:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoAE9gKD874N2Hk4rbYUatp16XymM1XhTyrAB28xSn3qTHo02kRLum+f81y2LK4A5H29Ju X-Received: by 2002:a17:906:f285:: with SMTP id gu5mr13770897ejb.226.1622987351474; Sun, 06 Jun 2021 06:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622987351; cv=none; d=google.com; s=arc-20160816; b=JCMGSQQXIwc9kmlFvVVx6oLv37Bx3C06yQcrY6KHZz3MQXkg55jDCHGdg94AwAGZBr A6lNdQUGP8DsZGU+pikKT8mzCL2eyVW359N6FZyYPQahGrWJMXCWMPmBA2s75SnpdeNz KZufCMPFNxlsYvSFZKxTGlScFnVe7IdgsuIfQP87J0a5bwOl7Y2qdmhgRRsbPtNckVoi lGS2OIclOqeZWjuGNLdTMY1KGF9A5obPqWnucPLJLx9Ys6GIIvBTSgkfrK9RYGXPRJ9Q nqTsmn/SXgRMCN73E76JAUxYd3QEuYOZlmbbZXbS1EeL9mbg53X4EsBeCvgs/nqrFnDh q9Pg== 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=71KkmRk1x0e/jjCYbEI6bJQHBeJlLVZlnMAVvzhtZ4A=; b=r0jEZKCsA15uMS1kyf7ddU1jdLd8/6m281C4qb07DXGr4IowCW6pNlRoJv6xr7WYbJ kzPez+CS8XOvjLVqKVbqIJmXm7BfX/u2e9MUeRDoSgPxVJEbAkeyv/kmSLpVe7Kp4lNQ Lg+XT4QjjWWbL5ht1TBFnzwtfnResk4bb18p1CONVAKRWqttCbkWEs76UYs8fLITgwC8 wFL5UazhfjW7R94aBw4xk7hDkz6mrWAQ01P+zhvzgcW3s7dRnkyUbZQLWZ1JDCWSWCQ2 oZ40I0AOuWPWVvq0KxTqeYFGeEBOKRxnU8pRcE8a6QsZxIOyEy2SrZZWM6dOYjgyrI5f zzuw== 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 zh8si11938847ejb.109.2021.06.06.06.49.09; Sun, 06 Jun 2021 06:49:11 -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 D2C6268A42A; Sun, 6 Jun 2021 16:49:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE88068A42A for ; Sun, 6 Jun 2021 16:48:58 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lpt98-001DBC-1W for ffmpeg-devel@ffmpeg.org; Sun, 06 Jun 2021 15:48:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pt8AlYUkSljeHpt8AlkgP6; Sun, 06 Jun 2021 15:47:58 +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=qE2J4wEx0yT5OdOkMmIA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Jun 2021 15:47:57 +0200 Message-Id: <20210606134757.18919-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210606134757.18919-1-michael@niedermayer.cc> References: <20210606134757.18919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDa17lGcx04/olBunAzprRIRZdN8Bv+0woCy7t5JDAEJX/Zkipt9X3mSbnkQGzZpa0+cM+hgBROICrcs9Ltshey8lbLgqGbk0yJY9p1YxIJDasEqlHzc UZp6bP4NH0jDbsb/sZS/p8NgyzuW0p9MCrUQyTkTUCOFtswzTfRSOL1V Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/af_drmeter: Check that there is data 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: QgjNnU5Z0cpx Fixes: floating point division by 0 Fixes: -nan is outside the range of representable values of type 'int' Fixes: Ticket8307 Signed-off-by: Michael Niedermayer --- libavfilter/af_drmeter.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c index 3774259da3..58932fe6c5 100644 --- a/libavfilter/af_drmeter.c +++ b/libavfilter/af_drmeter.c @@ -167,6 +167,11 @@ static void print_stats(AVFilterContext *ctx) float chdr, secondpeak, rmssum = 0; int i, j, first = 0; + if (!p->nb_samples) { + av_log(ctx, AV_LOG_INFO, "No data, dynamic range not meassurable\n"); + return; + } + finish_block(p); for (i = 0; i <= 10000; i++) {