From patchwork Fri May 24 09:36:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13273 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 C6CC2449BD5 for ; Fri, 24 May 2019 12:42:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FBAE689E33; Fri, 24 May 2019 12:42:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 698106809F2 for ; Fri, 24 May 2019 12:42:26 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id f12so3948772plt.8 for ; Fri, 24 May 2019 02:42:26 -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=iYlVaBAfALcQ+vQ6vjjuQ96NpiVnIAkJsW4YMUWQ428=; b=ozcEQ/Fiva3eSDDigSITO/Cz0Bd0d4Nh/YuDgXD/fdDl+GnaXLL1MCVYm2D04TbkKH U555xJwq3CeZF2KNA4iL6HUvVUl3yBaGDkvaF/He1TwcQz2b7HYZRnSj7pc6F0A2upaQ zZLMnVSfFdHS+kitG/puBbliyT0I0/ixWJ9aNw5wz1bAIqZPoFq8n54RjvwcPRSewpVD ipHrJ+t9umo6lAGbC5WfswNprYz52o3AM/+ZjX0alro7pk8LltKWnJv0AL5/uxuerh3G EL23EXKutMFnfzPI8M9yZUzjs1YlX1AWxVhydwdIdbWYW5LODDbMppeVLou9W3L9bNIN As/w== 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=iYlVaBAfALcQ+vQ6vjjuQ96NpiVnIAkJsW4YMUWQ428=; b=ME70G7nu72cRkpOYVDf18hCxh0WVIzHNBAefxJJNLwKIYBek36yY58w6jau+c2kMo+ 6eF5EFEH6TxnC8w7tdM8Prtue0PNN5Pr/VlzGSYhSpZ4bqOh6jTqCrHSo1DWIqh4Yi9C pDP9VNPOdDnCcsr/SJz7Xx9Posl40wCjRKK8vuXG4ws+ITggYS7u+5ICkv2J0WAzJ1h/ 7JOpnLvmSeOQx6v5oJb3uZCx3Jt5jTvtZKOytOWtw/t1jhDZcEiUFTigblhAOaL+kKx+ 9Ni0GP545sTl2pMUc583IOi0Gy5HZL7a97pjHrkk2pNL/8ZzWqFTLQAAgVMmgzUtSrsK WZvQ== X-Gm-Message-State: APjAAAVIJtdTIFGFBkUAGrsd2+88pDI+hsJZ4Qpd/ocVLS1bQ+RVjFUR JGIvuYo6QiGbPHrLJFRE6xeqZZ0sre4= X-Google-Smtp-Source: APXvYqyCzND4kydK4/uxzMwRP8JUlIWh1+uXDKFJkYgNXmIJPgiEGDiDG1EyaAV/iXJ3rPfeWeFdjA== X-Received: by 2002:a17:902:b713:: with SMTP id d19mr43638417pls.123.1558690600410; Fri, 24 May 2019 02:36:40 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id x7sm1951254pfm.82.2019.05.24.02.36.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 May 2019 02:36:39 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2019 17:36:10 +0800 Message-Id: <20190524093616.74647-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] libavfilter/vf_overlay.c: change the commands style for the 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: onemda@gmail.com, Limin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang --- libavfilter/vf_overlay.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 0a8f089c0d..b468cedf2e 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -500,7 +500,7 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, for (; k < kmax; k++) { int alpha_v, alpha_h, alpha; - // average alpha for color components, improve quality + /* average alpha for color components, improve quality */ if (hsub && vsub && j+1 < src_hp && k+1 < src_wp) { alpha = (a[0] + a[src->linesize[3]] + a[1] + a[src->linesize[3]+1]) >> 2; @@ -512,10 +512,10 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, alpha = (alpha_v + alpha_h) >> 1; } else alpha = a[0]; - // if the main channel has an alpha channel, alpha has to be calculated - // to create an un-premultiplied (straight) alpha value + /* if the main channel has an alpha channel, alpha has to be calculated */ + /* to create an un-premultiplied (straight) alpha value */ if (main_has_alpha && alpha != 0 && alpha != 255) { - // average alpha for color components, improve quality + /* average alpha for color components, improve quality */ uint8_t alpha_d; if (hsub && vsub && j+1 < src_hp && k+1 < src_wp) { alpha_d = (da[0] + da[dst->linesize[3]] + @@ -556,7 +556,7 @@ static inline void alpha_composite(const AVFrame *src, const AVFrame *dst, int x, int y, int jobnr, int nb_jobs) { - uint8_t alpha; ///< the amount of overlay to blend on to main + uint8_t alpha; /* the amount of overlay to blend on to main */ uint8_t *s, *sa, *d, *da; int i, imax, j, jmax; int slice_start, slice_end; @@ -587,7 +587,7 @@ static inline void alpha_composite(const AVFrame *src, const AVFrame *dst, *d = *s; break; default: - // apply alpha compositing: main_alpha += (1-main_alpha) * overlay_alpha + /* apply alpha compositing: main_alpha += (1-main_alpha) * overlay_alpha */ *d += FAST_DIV255((255 - *d) * *s); } d += 1;