From patchwork Mon May 27 06:22:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13304 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 D1A33448F42 for ; Mon, 27 May 2019 09:22:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4476689D15; Mon, 27 May 2019 09:22:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6A296882CB for ; Mon, 27 May 2019 09:22:33 +0300 (EEST) Received: by mail-pg1-f177.google.com with SMTP id n27so8503871pgm.4 for ; Sun, 26 May 2019 23:22:33 -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:mime-version :content-transfer-encoding; bh=T5X5sNskGma6NYKQ2oVjvSQ9I/kAywrAhkRNePdxNgQ=; b=earz89hsIqSjh7ae8Ui3JResCygpEDN0b6wfnmJBOP0kTZJ6fslWXfgDdsHg0fxnPT t52e3DHiTisRXRrTX+1/aYytUfZMc7vhWabvWNWj4E5zAint+Da/+eZwq4aEre5ccfON ULwbHIB7/jKJKeXsVX4L9d8jXDI08oVwNrs4Xx9BfGak8Xe9MwYdkabvfl7myA3pEZZH /3Ypg1bL2bj7rdmweekO9Ztq1s25z0i4AtOPjzX2iTRUAr1okzMWxjmzL2TAVlPaCgJY GoBmC1L4HuMhyDZ9gfbVEvolu8BGPDmToGL12gk1BtUkgfFvfDC++0tpoYTHdS4nCQC0 oHkA== 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:mime-version :content-transfer-encoding; bh=T5X5sNskGma6NYKQ2oVjvSQ9I/kAywrAhkRNePdxNgQ=; b=rZqw67d+O8Y12Vi6Ecd5aq95B9jdb8CLFimcrfVTQB44itrPktZKufGdmuR9EIDzEJ LeYg/3FdPxEcOOo/ZG6YJCj/Dv4ghr8oEszqAM7ira26x4caQfB5jfv6BxJmtuS1gb6+ sxvDhf4fsBIztjsS7fgtEOQMt2YaExBmmECba+bX3uSdFl6lKds5uHpVcWJTXlZkJrt1 EpwZt9zSF1lnEOkEpOrbaYDFPD+5p9gna3lco84f+HYo6RUvw6QqVb7YCClfKI3WmxHN 7K/ga94hBttU5llHkwtxRNz43nCS9IBHgHVMwU0P/n4Cx99vQmUH/n1WC8ws5BKAfE25 rbIw== X-Gm-Message-State: APjAAAVmHsyBbAvmclscKZcX6RT0v0QCjICBIlx+w9QQsCpvrZc7Dqf8 lg6+EcoIhnB/iY3a02GyK++Zek7l X-Google-Smtp-Source: APXvYqyPT0oE5Qv4MBDCfFwukRkUS97EbSBL09FyPLtDJ+ztep+hgZBlZqQlleppZ7NnwZvW04eG9g== X-Received: by 2002:a63:1622:: with SMTP id w34mr21753608pgl.45.1558938151841; Sun, 26 May 2019 23:22:31 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p16sm13750252pfq.153.2019.05.26.23.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 May 2019 23:22:31 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 May 2019 14:22:11 +0800 Message-Id: <20190527062212.96201-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] libavfilter/vf_blend.c: remove duplicate code with same funcion 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: onemda@gmail.com, Limin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_blend.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 83f3d591a8..46e0518d26 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -582,9 +582,7 @@ void ff_blend_init(FilterParams *param, int depth) 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 = param->opacity == 1 ? blend_copytop_8 : - param->opacity == 0 ? blend_copybottom_8 : - blend_normal_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; @@ -621,9 +619,7 @@ void ff_blend_init(FilterParams *param, int depth) 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 = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_16bit; 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; @@ -660,9 +656,7 @@ void ff_blend_init(FilterParams *param, int depth) 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 = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_16bit; 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; @@ -699,9 +693,7 @@ void ff_blend_init(FilterParams *param, int depth) 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 = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_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; @@ -718,6 +710,11 @@ void ff_blend_init(FilterParams *param, int depth) if (param->opacity == 0 && param->mode != BLEND_NORMAL) { param->blend = depth > 8 ? blend_copytop_16 : blend_copytop_8; + } else if (param->mode == BLEND_NORMAL) { + if (param->opacity == 1) + param->blend = depth > 8 ? blend_copytop_16 : blend_copytop_8; + else if (param->opacity == 0) + param->blend = depth > 8 ? blend_copybottom_16 : blend_copybottom_8; } if (ARCH_X86)