From patchwork Fri May 24 09:36:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13274 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 DBC59444BBF for ; Fri, 24 May 2019 12:44:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF21E68A495; Fri, 24 May 2019 12:44:29 +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 667AF6809F2 for ; Fri, 24 May 2019 12:44:23 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id t1so4781147pgc.2 for ; Fri, 24 May 2019 02:44:23 -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=pe8KjubTz2FFmHSWyDJvRZiPz9utSxM3GG425CySAUc=; b=qPNKWbPt349rlkTQLwAJonVbN5wwaSEolsWliZGZnPliOVpE2x38YuH4EGtPZo8iOn HaIF1uL/m2zywjAAFk1IKpfdBeeiK7QKhs2naOVAcwesxuAZlo22KaBbBP9gBf9OfUcP eLrz+RsvLGWlKE4NqpfPBf1MTZG+3N5n5ITtPXl+PhrfBbwklELpLCs17yuYJDe7eGcn OgLtDNXgmFHiHXb0ocO0ZQTDoYiTO0gsKVcBe3MwfjI7b9imwliHrwKBx0WjyXJWJ7Zp Ov8cVRT6DX5xt808rfZpU8T6gcyOHHDb/Zr/eKyVRtUSBSV7Zaseiw/hIS0DYptaccov BxyA== 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=pe8KjubTz2FFmHSWyDJvRZiPz9utSxM3GG425CySAUc=; b=sHRc61x/3qj2U3+njbcUVcaLBPQt6GLtSykuu76iiIYTVze/RgY4AuINzuBiS2v/Vw lSFtvO9ZjTcLTzpN/oRoxL3IRRvYdcB1a+QfKavKALvffY3K0nssO+OYMgsH14L3ugly NG4cPE5glMst1rb4SHL/BWeRjHF/QfgzG7u5MMP+s1tFltIjDejQduxhC7Mm2OVRMxH1 I4kmWDp65TGI1k0Q3ggqyKZcz4fKVhZwcSSqBIYcXyHk9B76Z60iibKZFyifL18yrAHa bYqP8tM0CMr8LqrKktKD8zAnXXtmenbEwMpR6t+8loqRU1+if/IE75+cM8nfnSLDI76k xmjQ== X-Gm-Message-State: APjAAAV5nQiMqY0uEuXSieabblloT8C1ACj5DVIFHCbYOe5MQFGcg9cW nGXaEoFwG32y15H1MIsq8D0yI0yW3Rg= X-Google-Smtp-Source: APXvYqz5DIC+QQArpV8Z9v8jOZVIvolO8Z3DQVuYrBxCxfjuvi10v1ejTMtxf0AzTlhIcHYMrykQgA== X-Received: by 2002:a63:171c:: with SMTP id x28mr104502123pgl.12.1558690606161; Fri, 24 May 2019 02:36:46 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id x7sm1951254pfm.82.2019.05.24.02.36.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 May 2019 02:36:45 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2019 17:36:12 +0800 Message-Id: <20190524093616.74647-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190524093616.74647-1-lance.lmwang@gmail.com> References: <20190524093616.74647-1-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] libavfilter/vf_overlay.c: Add '\' for every line of the alpha_composite 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 | 92 ++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index c1abd3e1b2..f36be1601b 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -550,52 +550,52 @@ static av_always_inline void blend_plane(AVFilterContext *ctx, } } -static inline void alpha_composite(const AVFrame *src, const AVFrame *dst, - int src_w, int src_h, - int dst_w, int dst_h, - int x, int y, - int jobnr, int nb_jobs) -{ - 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; - - imax = FFMIN(-y + dst_h, src_h); - slice_start = (imax * jobnr) / nb_jobs; - slice_end = ((imax * (jobnr+1)) / nb_jobs); - - i = FFMAX(-y, 0); - sa = src->data[3] + (i + slice_start) * src->linesize[3]; - da = dst->data[3] + (y + i + slice_start) * dst->linesize[3]; - - for (i = i + slice_start; i < slice_end; i++) { - j = FFMAX(-x, 0); - s = sa + j; - d = da + x+j; - - for (jmax = FFMIN(-x + dst_w, src_w); j < jmax; j++) { - alpha = *s; - if (alpha != 0 && alpha != 255) { - uint8_t alpha_d = *d; - alpha = UNPREMULTIPLY_ALPHA(alpha, alpha_d); - } - switch (alpha) { - case 0: - break; - case 255: - *d = *s; - break; - default: - /* apply alpha compositing: main_alpha += (1-main_alpha) * overlay_alpha */ - *d += FAST_DIV255((255 - *d) * *s); - } - d += 1; - s += 1; - } - da += dst->linesize[3]; - sa += src->linesize[3]; - } +static inline void alpha_composite(const AVFrame *src, const AVFrame *dst, \ + int src_w, int src_h, \ + int dst_w, int dst_h, \ + int x, int y, \ + int jobnr, int nb_jobs) \ +{ \ + 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; \ + \ + imax = FFMIN(-y + dst_h, src_h); \ + slice_start = (imax * jobnr) / nb_jobs; \ + slice_end = ((imax * (jobnr+1)) / nb_jobs); \ + \ + i = FFMAX(-y, 0); \ + sa = src->data[3] + (i + slice_start) * src->linesize[3]; \ + da = dst->data[3] + (y + i + slice_start) * dst->linesize[3]; \ + \ + for (i = i + slice_start; i < slice_end; i++) { \ + j = FFMAX(-x, 0); \ + s = sa + j; \ + d = da + x+j; \ + \ + for (jmax = FFMIN(-x + dst_w, src_w); j < jmax; j++) { \ + alpha = *s; \ + if (alpha != 0 && alpha != 255) { \ + uint8_t alpha_d = *d; \ + alpha = UNPREMULTIPLY_ALPHA(alpha, alpha_d); \ + } \ + switch (alpha) { \ + case 0: \ + break; \ + case 255: \ + *d = *s; \ + break; \ + default: \ + /* apply alpha compositing: main_alpha += (1-main_alpha) * overlay_alpha */ \ + *d += FAST_DIV255((255 - *d) * *s); \ + } \ + d += 1; \ + s += 1; \ + } \ + da += dst->linesize[3]; \ + sa += src->linesize[3]; \ + } \ } static av_always_inline void blend_slice_yuv(AVFilterContext *ctx, \