From patchwork Thu Jun 6 07:09:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13429 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 D5576447A64 for ; Thu, 6 Jun 2019 10:10:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3CB4680BCE; Thu, 6 Jun 2019 10:10:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9691068087C for ; Thu, 6 Jun 2019 10:10:31 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id v9so795854pgr.13 for ; Thu, 06 Jun 2019 00:10:31 -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=qhMFp0YVx/MyXc7jYS3xNHPFbKMKYuO/v3koPCt4SF4=; b=a3d0VxuRYPgGbHNp4lILe2T05qoRQIaAhVwWssbmIw3NhueSXfyfCEelVGjAUv7Uee iTTzpBsE/EEle3vWpDX+vQLm/o3VVMV+jYURuYiym3el35OgUoxrZ6tk08rT0zuWyk2k IaR7iPeTCyXtPvHkJd2Ysx8gpRdvdzdY/fbAa4JhUPVzTjbrwbjuUn5C2rqL2ETGtlBI NwqS12J0H+7so5f8ELBTcM1M1lin87NFwa8fMbJNFel0PQHMI6oxIXbeyMotCb31BVfi JpLRjKRzDLmmDeu3Or9rmP5GqPKm4Rz/K/sqsIK2fuiWFR3Zf3GxkZ0wNUhxlCVgxovI FAyQ== 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=qhMFp0YVx/MyXc7jYS3xNHPFbKMKYuO/v3koPCt4SF4=; b=V0Rzep2dLqT3JMMcJaUOAAdNY7gXfWsq9iW4fNjAB3hnxZFA0x4bEZCRv0LU+IFbTR IDmYHTop45e0WCiv5iwbA7P4uUvfej1Rkg3MB/JqATQNY4VcY5Bt+132w0OG6KJhyIdR 1cbIWg0SiLbrrJ9n3k5/Amx4iEqmTavEMaY6V/dlx7O2iA+AfJtJmddZTjVOzZTfvaY9 Tp2VAXVe6nrOnDHXQxwBkd+jt6cCfmBULrPhobiWoqXE+D/MAXDovdrRZL3A9mHB6yNH p08bQYIwvebdpicquiZqwnVTDXCSz9jwmAMzAt85FzDVYh2xX3p7xOdLxxYs6lImHG8W WBmw== X-Gm-Message-State: APjAAAUlSG6m4ppOh51xx0J/yqtSolG7O/W/YHriSX05zFB/i2E90kAY 0Cu73YypkC/DhpVFXzKv9p9rsU6c3F8= X-Google-Smtp-Source: APXvYqz9X3MPC7x2osa+Cmith693Tvho5Oz28ouy6ltdtYH9W21UTlGmmGlEsuAtfuHPpsqoXA8k5g== X-Received: by 2002:a17:90a:e397:: with SMTP id b23mr21988543pjz.140.1559805029400; Thu, 06 Jun 2019 00:10:29 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e6sm1009863pfi.42.2019.06.06.00.10.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jun 2019 00:10:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2019 15:09:54 +0800 Message-Id: <20190606070959.9608-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190526000750.79563-5-lance.lmwang@gmail.com> References: <20190526000750.79563-5-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/6] libavfilter/vf_overlay.c: change the comment style for the following 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: lq@chinaffmpeg.org, Limin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: 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;