From patchwork Tue Jun 11 06:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13498 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 6C26F449025 for ; Tue, 11 Jun 2019 09:46:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 54D2F68AB7C; Tue, 11 Jun 2019 09:46:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1E2E68AAA8 for ; Tue, 11 Jun 2019 09:46:50 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id j2so6781465pfe.6 for ; Mon, 10 Jun 2019 23:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cHykf7syzFjWl3464DbBr93MmlAlsTnL8OipteTruEQ=; b=UbTGFxx832XOeGYPO+FW+Eb2HWvarWppi5GuPWhvlZX7nRtGabqlfdRi38aWE4JNU8 H7qq7l7PeHlstWTd7/KrZA0JRRymTqLuK5L6MHJOXVWueV8hONgZQ2Wm33anTDJDTWzq yg9pVbQIXEDP3wVg+i3MkqXX1KCmGZ5wn9wjk/1JHT5GVQsb2AxJMYSSiUPHO5EUEQ0S OcCem+lycJlX8LfTxCtbjTLEXJGuyNVnQA2LP1nL8/aGNqXztL1w9RnfDLldMCwkXUXW 3obQjxhiB+XywNzSwjpUy5R8OK7q0s+kcn40iy4akvcUXOcdbRaw3oDz4EeQDdc8/B7h 8Y2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cHykf7syzFjWl3464DbBr93MmlAlsTnL8OipteTruEQ=; b=WDFCM2X1sFwFXkbBU1kzPXkTq5Or7bjDAL8fiMCYZ/OWmlBszhzoGmzqSjotllhT9A 90PvbakeBm3/7EkZ0niKwSmWU2ioHNQjfCq/70/MMXrnBdewZCExKY8MOiITm7c24DXN UrheYocBL8VxyFAqOzvp9bKALPoFI+gBJKkxh4dlatuWQkGPmcEN8z0v21FrY7puuz5r e8q2b3NhU606QEXZX1maHOb3c173ysDHEKYvPEeu2WJNuJW9Epqb0rErtWCjSPx5+v7S TREzM8aEq2rsqpnAt941GpMTSUhYVv11aYCwH/Em37jebMGvLA7UafWQJWUR0sZaoYRV hQmA== X-Gm-Message-State: APjAAAXtjPUZSqLp6+RCc5LiNcC6VcjnQdClK/dbh/WgYp/kvAWUdhbo Ie0H+45JPPGWv21tVTs8us1VNPkO+00= X-Google-Smtp-Source: APXvYqw+fzWuYKlh0p4Ryjfq0Jhw3dr/wJaMqQpJqXZM/vo3pXm5pSH6boaCkfB2zMd5ClVYivAv4Q== X-Received: by 2002:a17:90a:1b0c:: with SMTP id q12mr25464317pjq.76.1560235609014; Mon, 10 Jun 2019 23:46:49 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 144sm11230099pfa.180.2019.06.10.23.46.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jun 2019 23:46:48 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2019 14:46:16 +0800 Message-Id: <20190611064616.22234-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190611064616.22234-1-lance.lmwang@gmail.com> References: <20190527062212.96201-1-lance.lmwang@gmail.com> <20190611064616.22234-1-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] libavfilter/vf_blend.c: remove duplicate code with macro-defined function 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 Cc: Limin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_blend.c | 188 +++++++++++------------------------------ 1 file changed, 48 insertions(+), 140 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 46e0518d26..cf71200773 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -555,156 +555,64 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->params[i].e); } +#define DEFINE_INIT_BLEND_FUNC(depth, nbits) \ +static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) \ +{ \ + switch (param->mode) { \ + case BLEND_ADDITION: param->blend = blend_addition_##depth##bit; break; \ + case BLEND_GRAINMERGE: param->blend = blend_grainmerge_##depth##bit; break; \ + case BLEND_AND: param->blend = blend_and_##depth##bit; break; \ + case BLEND_AVERAGE: param->blend = blend_average_##depth##bit; break; \ + case BLEND_BURN: param->blend = blend_burn_##depth##bit; break; \ + case BLEND_DARKEN: param->blend = blend_darken_##depth##bit; break; \ + case BLEND_DIFFERENCE: param->blend = blend_difference_##depth##bit; break; \ + case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_##depth##bit; break; \ + case BLEND_DIVIDE: param->blend = blend_divide_##depth##bit; break; \ + case BLEND_DODGE: param->blend = blend_dodge_##depth##bit; break; \ + case BLEND_EXCLUSION: param->blend = blend_exclusion_##depth##bit; break; \ + case BLEND_EXTREMITY: param->blend = blend_extremity_##depth##bit; break; \ + case BLEND_FREEZE: param->blend = blend_freeze_##depth##bit; break; \ + case BLEND_GLOW: param->blend = blend_glow_##depth##bit; break; \ + case BLEND_HARDLIGHT: param->blend = blend_hardlight_##depth##bit; break; \ + case BLEND_HARDMIX: param->blend = blend_hardmix_##depth##bit; break; \ + case BLEND_HEAT: param->blend = blend_heat_##depth##bit; break; \ + case BLEND_LIGHTEN: param->blend = blend_lighten_##depth##bit; break; \ + case BLEND_LINEARLIGHT:param->blend = blend_linearlight_##depth##bit;break; \ + case BLEND_MULTIPLY: param->blend = blend_multiply_##depth##bit; break; \ + case BLEND_MULTIPLY128:param->blend = blend_multiply128_##depth##bit;break; \ + case BLEND_NEGATION: param->blend = blend_negation_##depth##bit; break; \ + case BLEND_NORMAL: param->blend = blend_normal_##nbits##bit; break; \ + case BLEND_OR: param->blend = blend_or_##depth##bit; break; \ + case BLEND_OVERLAY: param->blend = blend_overlay_##depth##bit; break; \ + case BLEND_PHOENIX: param->blend = blend_phoenix_##depth##bit; break; \ + case BLEND_PINLIGHT: param->blend = blend_pinlight_##depth##bit; break; \ + case BLEND_REFLECT: param->blend = blend_reflect_##depth##bit; break; \ + case BLEND_SCREEN: param->blend = blend_screen_##depth##bit; break; \ + case BLEND_SOFTLIGHT: param->blend = blend_softlight_##depth##bit; break; \ + case BLEND_SUBTRACT: param->blend = blend_subtract_##depth##bit; break; \ + case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit; break; \ + case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ + } \ +} +DEFINE_INIT_BLEND_FUNC(8, 8); +DEFINE_INIT_BLEND_FUNC(10, 16); +DEFINE_INIT_BLEND_FUNC(12, 16); +DEFINE_INIT_BLEND_FUNC(16, 16); + void ff_blend_init(FilterParams *param, int depth) { switch (depth) { case 8: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_8bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_8bit; break; - case BLEND_AND: param->blend = blend_and_8bit; break; - case BLEND_AVERAGE: param->blend = blend_average_8bit; break; - case BLEND_BURN: param->blend = blend_burn_8bit; break; - case BLEND_DARKEN: param->blend = blend_darken_8bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_8bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_8bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_8bit; break; - case BLEND_DODGE: param->blend = blend_dodge_8bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_8bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_8bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_8bit; break; - case BLEND_GLOW: param->blend = blend_glow_8bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_8bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_8bit; break; - case BLEND_HEAT: param->blend = blend_heat_8bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_8bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_8bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_8bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_8bit;break; - case BLEND_NEGATION: param->blend = blend_negation_8bit; break; - case BLEND_NORMAL: param->blend = blend_normal_8bit; break; - case BLEND_OR: param->blend = blend_or_8bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_8bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_8bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_8bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_8bit; break; - case BLEND_SCREEN: param->blend = blend_screen_8bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_8bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_8bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_8bit; break; - case BLEND_XOR: param->blend = blend_xor_8bit; break; - } + init_blend_func_8_8bit(param); break; case 10: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_10bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_10bit; break; - case BLEND_AND: param->blend = blend_and_10bit; break; - case BLEND_AVERAGE: param->blend = blend_average_10bit; break; - case BLEND_BURN: param->blend = blend_burn_10bit; break; - case BLEND_DARKEN: param->blend = blend_darken_10bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_10bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_10bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_10bit; break; - case BLEND_DODGE: param->blend = blend_dodge_10bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_10bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_10bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_10bit; break; - case BLEND_GLOW: param->blend = blend_glow_10bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_10bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_10bit; break; - case BLEND_HEAT: param->blend = blend_heat_10bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_10bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_10bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_10bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_10bit;break; - case BLEND_NEGATION: param->blend = blend_negation_10bit; break; - case BLEND_NORMAL: param->blend = blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_10bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_10bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_10bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_10bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_10bit; break; - case BLEND_SCREEN: param->blend = blend_screen_10bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_10bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_10bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_10bit;break; - case BLEND_XOR: param->blend = blend_xor_10bit; break; - } + init_blend_func_10_16bit(param); break; case 12: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_12bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_12bit; break; - case BLEND_AND: param->blend = blend_and_12bit; break; - case BLEND_AVERAGE: param->blend = blend_average_12bit; break; - case BLEND_BURN: param->blend = blend_burn_12bit; break; - case BLEND_DARKEN: param->blend = blend_darken_12bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_12bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_12bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_12bit; break; - case BLEND_DODGE: param->blend = blend_dodge_12bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_12bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_12bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_12bit; break; - case BLEND_GLOW: param->blend = blend_glow_12bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_12bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_12bit; break; - case BLEND_HEAT: param->blend = blend_heat_12bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_12bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_12bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_12bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_12bit;break; - case BLEND_NEGATION: param->blend = blend_negation_12bit; break; - case BLEND_NORMAL: param->blend = blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_12bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_12bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_12bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_12bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_12bit; break; - case BLEND_SCREEN: param->blend = blend_screen_12bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_12bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_12bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_12bit;break; - case BLEND_XOR: param->blend = blend_xor_12bit; break; - } + init_blend_func_12_16bit(param); break; case 16: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_16bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_16bit; break; - case BLEND_AND: param->blend = blend_and_16bit; break; - case BLEND_AVERAGE: param->blend = blend_average_16bit; break; - case BLEND_BURN: param->blend = blend_burn_16bit; break; - case BLEND_DARKEN: param->blend = blend_darken_16bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_16bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_16bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_16bit; break; - case BLEND_DODGE: param->blend = blend_dodge_16bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_16bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_16bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_16bit; break; - case BLEND_GLOW: param->blend = blend_glow_16bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_16bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_16bit; break; - case BLEND_HEAT: param->blend = blend_heat_16bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_16bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_16bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_16bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_16bit;break; - case BLEND_NEGATION: param->blend = blend_negation_16bit; break; - case BLEND_NORMAL: param->blend = blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_16bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_16bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_16bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_16bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_16bit; break; - case BLEND_SCREEN: param->blend = blend_screen_16bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_16bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_16bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_16bit;break; - case BLEND_XOR: param->blend = blend_xor_16bit; break; - } + init_blend_func_16_16bit(param); break; }