From patchwork Tue Jun 11 06:46:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13497 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 65F4C449025 for ; Tue, 11 Jun 2019 09:46:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44D3468A6D1; Tue, 11 Jun 2019 09:46:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41EE168A661 for ; Tue, 11 Jun 2019 09:46:46 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id t16so6766101pfe.11 for ; Mon, 10 Jun 2019 23:46:46 -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=T5X5sNskGma6NYKQ2oVjvSQ9I/kAywrAhkRNePdxNgQ=; b=T+KHc45IDgo9gScZ1Xz+jLIuXt8pD6xHcTVtGpAI3bCdcnHEH0KAJejKVkNX99yuPt oFwJGFwC2zw2bCMzUQNeNngFSYyBeMaWOzg6459qArBvUBr/r0VFQyTcJYa9TfV7FMe1 yIN91ftpWBXcRQaH+S26U6TTICKcTjvVqYn+U0kLo1ABF4hn1YiyOtz62nEo6gAdDUa8 COsLFTZCgqyRicrjvz1txRxRUqUJCgOJjochwSCoz274O8uyE1Mr26+rajM5ijWh/6xl snwJaasfZEWMxMl8010u8Koa/d38GMk8FC9uLPCjTpL0BWRgSRvMutQOWueA8b2pTU20 Z/JQ== 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=T5X5sNskGma6NYKQ2oVjvSQ9I/kAywrAhkRNePdxNgQ=; b=eqhM8A7HOy5qKbAcyv88LiWJfciRWr5QiTcACQBQOkaiFQr63O6FnFvmCgD7dKKZV8 urqM7Jjt9qlYn467VJ2OiBo5C+OmBVVBZKLHLwDb0SjxUUvfGDRRzGYMeCtqyOgRf4oS bkXL91nSfIKWS3lO6/v4U5ySxaaCv4VfDjB4o1i+mK1v1LUD1mRMExlBG68vgDITSK0K n/nHuC0h3q7fnrpSMbB6eQ1ACWpbfWd290RRt28lD0/5H3/EyOaqVKRUofv/snQuC83c KIpIpRDFubl2nzCtztzhABSR/ui9WsJBbQcSOM4uvevi5lIy0ZgOVqPlsQb793Xu9q7x j+tg== X-Gm-Message-State: APjAAAUbBGKLooRDCFQPIj9qr7XlRNbJtcq+wZkdW5S6/5AznaD1gTXj j+tZV+SLqfy30b1/P3ou/xfSBn995ik= X-Google-Smtp-Source: APXvYqyPpsKqo/sAup3u5TIOI+n1GhSslYZQ4rgVtJ5cZ5PTKs55O4DckEMdyOLZZQjHl5wpKb8FsQ== X-Received: by 2002:a62:1990:: with SMTP id 138mr78659583pfz.133.1560235604210; Mon, 10 Jun 2019 23:46:44 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 144sm11230099pfa.180.2019.06.10.23.46.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jun 2019 23:46:43 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2019 14:46:15 +0800 Message-Id: <20190611064616.22234-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190527062212.96201-1-lance.lmwang@gmail.com> References: <20190527062212.96201-1-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] libavfilter/vf_blend.c: remove duplicate code with same 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 | 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)