From patchwork Thu Jan 28 14:48:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25229 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 4E2F544B62E for ; Thu, 28 Jan 2021 16:48:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 307B668A477; Thu, 28 Jan 2021 16:48:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07D03689E53 for ; Thu, 28 Jan 2021 16:48:25 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id gx5so8139754ejb.7 for ; Thu, 28 Jan 2021 06:48:25 -0800 (PST) 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=0TD78pLrTUPcCVGMJsSQn3Dnwgkh+6j4nViJtx/rnSk=; b=b3jzCZIKYB3HurP1P72Bhg2fj1VM11aToFp+WINsOn/y1FIQzAGLwTc+G5JVcWY4Gd DVW1iAFdXyT0v160ut9354Z3/B3piLafu/gS6p3D2JMf5ZjsejSKC5JYkSYh32WnizcP M4u0Z/QWctbjMWZg1vkIvibLrjUQplK6u+sP97ZHlOd5NZOCJQPtjN8qcTj6WzJYaFWo 2IbA/eYGpAwSQBE7mqRi95pVPLIQp8hYt0IFxlLNdDr0xMQzBA3VQG5ug0LPN2lhjWQ7 OkDTOwvbAGqCEOrkLjCio+gA8XhcFVqz7S+aXzCp1EVPOXt9T2VZmoPSABbFgT4TWt19 BqDQ== 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=0TD78pLrTUPcCVGMJsSQn3Dnwgkh+6j4nViJtx/rnSk=; b=b5L12GsNzCi5H3BKhBr9hidf8Mit5QEWoiKT6ysz62iLMmG6ojeE1mEvgSqPpHV5lm O48ET02iXZHBn85ioz73Tq+ILpRurzhG8wS4+6xMnLGca9dCY2jg08oQQmaCDsWDkQVg 38rJj4hkdyif/Aag48e/TRS73lDBfXwMxV2cwm54JPmjNfMaYB64lpKHWr4/f6Sj5MlY 0xNJ58Ck3aFZMpT9xV64Sntw8ljaMXEO1j0eX1+nO8A5OSSCnUjuxp3dikUdgDc7a/wv RbilMHquBZXwHybN2c1WWKCUeSuPRKmPArH6mitp3uz2qQwnjDhwwmoiCM+gsW0297m5 Tyqw== X-Gm-Message-State: AOAM531qe7RMWK9QXHr7Xwm9r9o5+QuQD5zHQayJ/N7wzPn3LbLUvsFV RaJmhJRw3sTPRPuQYJ6kZffu8rpGgC+j9g== X-Google-Smtp-Source: ABdhPJyzsQ57UnooyPmZO3mA9WKKuKH8FV5PlA324xHCsLFwqTrJTPt6GKoVlOlGJ2hgHYeZRNFhcA== X-Received: by 2002:a17:906:ace:: with SMTP id z14mr3296417ejf.53.1611845304624; Thu, 28 Jan 2021 06:48:24 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id di28sm3112293edb.71.2021.01.28.06.48.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 06:48:24 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jan 2021 15:48:12 +0100 Message-Id: <20210128144813.4919-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210128144813.4919-1-onemda@gmail.com> References: <20210128144813.4919-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_pseudocolor: use macro for code that repeats 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_pseudocolor.c | 67 +++++++++--------------------------- 1 file changed, 17 insertions(+), 50 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 655b2a5111..c06edc1812 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -792,6 +792,13 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } +#define PCLIP(v, max, dst, src, x) \ + if (v >= 0 && v <= max) { \ + dst[x] = v; \ + } else { \ + dst[x] = src[x]; \ + } + static void pseudocolor_filter(int max, int width, int height, const uint8_t *index, const uint8_t *src, @@ -807,11 +814,7 @@ static void pseudocolor_filter(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -834,11 +837,7 @@ static void pseudocolor_filter_11(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y << 1) * ilinesize + (x << 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -860,11 +859,7 @@ static void pseudocolor_filter_11d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y >> 1) * ilinesize + (x >> 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -886,11 +881,7 @@ static void pseudocolor_filter_10(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x << 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -913,11 +904,7 @@ static void pseudocolor_filter_10d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x >> 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -943,11 +930,7 @@ static void pseudocolor_filter_16(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -973,11 +956,7 @@ static void pseudocolor_filter_16_10(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x << 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -1003,11 +982,7 @@ static void pseudocolor_filter_16_10d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x >> 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -1037,11 +1012,7 @@ static void pseudocolor_filter_16_11(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y << 1) * ilinesize + (x << 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -1070,11 +1041,7 @@ static void pseudocolor_filter_16_11d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y >> 1) * ilinesize + (x >> 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize;