From patchwork Sat May 16 17:51:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 19716 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D3A5D44B503 for ; Sat, 16 May 2020 20:59:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B038A68A60C; Sat, 16 May 2020 20:59:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7712C680AE2 for ; Sat, 16 May 2020 20:59:42 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id z4so4138984wmi.2 for ; Sat, 16 May 2020 10:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=tY7//4TnHdgDoKsmO7F15JF2pfvxu/FvLfxhRe0e13g=; b=ouODDg668o/PPjb/Ckx+kVks4V0Nwhcm6uyed+u9SP/I9xz0MAX+nTJoKdiizxoHzR HMyUcdvzeQCyRu+q2qb5zpksHrVDvfdggDOLzqXE6VB6OPuyFpCZG6vyfnKjIuCC8d0k Mnu8IebE8Ycq+hrRpWXwLUYSli6mjcMVTpwuA8pvnG0HXdwG1PBPTbyLGjbuhBjsOdN3 rCDFC3exIDKiyAFajMLd5z7U5GEM40eH8gMIuyPnbRTVBbGcAjIjnaKWCS8BBXZ5A9qS SEMiKmeX+bDmmy5oCkKEFNKdD4Pm/VAovE1xgCNtROuTD/1lN8pvs/5rOhc7aHxWaI6k YXLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=tY7//4TnHdgDoKsmO7F15JF2pfvxu/FvLfxhRe0e13g=; b=nFAFO43CFoJOPKe0EyXEMZgcufrp6GZbJKF6RrAUU453lu/BdtGcrRA2lMtii+XKWl bEPoZXFxD413q1EtdiZjHWnSJ5vJpEFghIBesl+VNotgl6Bx4vjfo2Jf4hwrTY00IW4A AqYNul6dBKAQRzn2BI6G4/1p04iL62pcrnOv0SNpsSTULHkfQT54Y04GbD6MZn84EAEO J2vVxh7G3bCvlfha8awf32JljfZn71Fbvmqax8lIDfzexb7yy2+LCNhG1wt/tcxvhPy8 ettwfnH0WUfu4oXKJTSNCQ8XO2uqIghvF5Ho69T5UCyd4BT1JDpBl3aCQyB3Se6x+feu ektA== X-Gm-Message-State: AOAM530FavmQhnYEq0ZEPY9k3dBuYl6Jm7+Y8pn05wYnBPwy2Gqf9KR6 H1l/3RyzsF6r74iCueURF6f9FSuP X-Google-Smtp-Source: ABdhPJzqCnJ/7F45ku5SJL9rWgKbvCaGBFVpri9vB28j+n/HpmzeaZM0MHT50cnZp4zU3ptdER6GIQ== X-Received: by 2002:a1c:f014:: with SMTP id a20mr10036203wmb.86.1589651499173; Sat, 16 May 2020 10:51:39 -0700 (PDT) Received: from localhost.localdomain ([37.244.244.100]) by smtp.gmail.com with ESMTPSA id t6sm9009819wma.4.2020.05.16.10.51.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2020 10:51:38 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 May 2020 19:51:29 +0200 Message-Id: <20200516175130.18868-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_colorkey: fix formula for calculation of difference X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Also fixes colorhold filtering. Signed-off-by: Paul B Mahol --- libavfilter/vf_colorkey.c | 2 +- tests/ref/fate/ffmpeg-filter_colorkey | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index 7af426a61e..0ac847c633 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -45,7 +45,7 @@ static uint8_t do_colorkey_pixel(ColorkeyContext *ctx, uint8_t r, uint8_t g, uin int dg = (int)g - ctx->colorkey_rgba[1]; int db = (int)b - ctx->colorkey_rgba[2]; - double diff = sqrt((dr * dr + dg * dg + db * db) / (255.0 * 255.0)); + double diff = sqrt((dr * dr + dg * dg + db * db) / (255.0 * 255.0 * 3.0)); if (ctx->blend > 0.0001) { return av_clipd((diff - ctx->similarity) / ctx->blend, 0.0, 1.0) * 255.0; diff --git a/tests/ref/fate/ffmpeg-filter_colorkey b/tests/ref/fate/ffmpeg-filter_colorkey index 490a0f9aa6..25c3fc0912 100644 --- a/tests/ref/fate/ffmpeg-filter_colorkey +++ b/tests/ref/fate/ffmpeg-filter_colorkey @@ -3,13 +3,13 @@ #codec_id 0: rawvideo #dimensions 0: 720x576 #sar 0: 0/1 -0, 0, 0, 1, 622080, 0x78efb628 -0, 1, 1, 1, 622080, 0x641f2564 -0, 2, 2, 1, 622080, 0x348f25c3 -0, 3, 3, 1, 622080, 0x6afc485a -0, 4, 4, 1, 622080, 0xe949107f -0, 5, 5, 1, 622080, 0x171716e5 -0, 6, 6, 1, 622080, 0x2985a01f -0, 7, 7, 1, 622080, 0xc5ddabd7 -0, 8, 8, 1, 622080, 0xb4dd2b7f -0, 9, 9, 1, 622080, 0x6e75ba82 +0, 0, 0, 1, 622080, 0x5775bb12 +0, 1, 1, 1, 622080, 0x84d8395a +0, 2, 2, 1, 622080, 0x599d3a6b +0, 3, 3, 1, 622080, 0x1df1e9dc +0, 4, 4, 1, 622080, 0xf3255836 +0, 5, 5, 1, 622080, 0xf46bc26e +0, 6, 6, 1, 622080, 0x76d491da +0, 7, 7, 1, 622080, 0x2c9f3ca6 +0, 8, 8, 1, 622080, 0x5713e203 +0, 9, 9, 1, 622080, 0x47776493 From patchwork Sat May 16 17:51:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 19715 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 345D844BBC1 for ; Sat, 16 May 2020 20:51:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 109C568A517; Sat, 16 May 2020 20:51:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD7AD68A4D4 for ; Sat, 16 May 2020 20:51:40 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id l17so7094724wrr.4 for ; Sat, 16 May 2020 10:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=fnmKyObkUvPhPf5M54y6up2QsV0XI1SDwznV4d3tceo=; b=rLFj7750avCMCfozoYEbLxXcEPTfEuzf1VJlMSlFYBJvHtUP6PmsgHTgbNhYN/Ow6V zvDoouNBfcsELifatejr0kZQGqD4awzxibmHwVnzD6/GbpbsoTnCl/O3RexteCXB2eJQ 9Eoymxdky2t3AvyMLmzf9dTbEoOB+iOdJ7u0ul2EhVj1IiQQC3Gw8H+q9nib8GjxBnv4 GKOz4EzvygH0Uyxi/Rm7Ewj03x8w7whuYH4emE9e6K/NA619MztrGmG0AEnkaD90MOog 6WjrAG6XTQTuA9Kccl7d9C3LZJxezZaA+nPvwB/OE5Ox2t3ATq0+zUrHCmaF4VLgdeeN rLKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fnmKyObkUvPhPf5M54y6up2QsV0XI1SDwznV4d3tceo=; b=ShF0HWHZZSXxkhB39ZTodE/pNWBQaTyWEmt8N6UV2nRO29XAorW9mTanBBiOhrcI6e 6d/gdw/JEDwPafwvIxgmZ5GE92tQQ5vmSAfSOisEyYF1IQWb++f9xdSzUlgQm0Ac2OqC RSiP7pb6kYjWIyZEllUd85dJ3fVqq2SJqFmWUgRjDZMpLrehWTkdMn3n/hjidvMM0m28 iY6ZlG2sA7KTkuJ1UTVJFHhF1UOHQGjNz04jVrVRFN2poH9kc1Of10NvfnzKJDwUnbLs uVgGwB8uw+IcXS/mpKCVYURfQpGlS/rojp1bcMwyBEirybCiYU+GFEj1ec2hDZmsTY4C UUvA== X-Gm-Message-State: AOAM5319LlDXaOUY5WlD9TdOfWglowgEDG8E4Uqe7nQJycv7FMzCgtYj bzj27NFujDj1722s9pCMfIE1saDR X-Google-Smtp-Source: ABdhPJxBx/emVAEmG3+3QJHRdszlUerfNshMcSRbUhgR0EYlqoC+yE42dS8oA1DBbilSUDIV0k3NGg== X-Received: by 2002:a5d:4ccd:: with SMTP id c13mr10793775wrt.415.1589651499989; Sat, 16 May 2020 10:51:39 -0700 (PDT) Received: from localhost.localdomain ([37.244.244.100]) by smtp.gmail.com with ESMTPSA id t6sm9009819wma.4.2020.05.16.10.51.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2020 10:51:39 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 May 2020 19:51:30 +0200 Message-Id: <20200516175130.18868-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200516175130.18868-1-onemda@gmail.com> References: <20200516175130.18868-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_chromakey: fix formula for calculation of difference X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Paul B Mahol --- libavfilter/vf_chromakey.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index ce8003657c..4b1669d084 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -56,7 +56,7 @@ static uint8_t do_chromakey_pixel(ChromakeyContext *ctx, uint8_t u[9], uint8_t v du = (int)u[i] - ctx->chromakey_uv[0]; dv = (int)v[i] - ctx->chromakey_uv[1]; - diff += sqrt((du * du + dv * dv) / (255.0 * 255.0)); + diff += sqrt((du * du + dv * dv) / (255.0 * 255.0 * 2)); } diff /= 9.0; @@ -78,7 +78,7 @@ static uint16_t do_chromakey_pixel16(ChromakeyContext *ctx, uint16_t u[9], uint1 du = (int)u[i] - ctx->chromakey_uv[0]; dv = (int)v[i] - ctx->chromakey_uv[1]; - diff += sqrt((du * du + dv * dv) / (max * max)); + diff += sqrt((du * du + dv * dv) / (max * max * 2)); } diff /= 9.0;