From patchwork Tue Nov 19 13:10:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 16333 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 D64974464F8 for ; Tue, 19 Nov 2019 15:10:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF6EF68A106; Tue, 19 Nov 2019 15:10:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF0E16880E2 for ; Tue, 19 Nov 2019 15:10:42 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id q15so10959028wrw.7 for ; Tue, 19 Nov 2019 05:10:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=sTi1xf8CL9HFbZ05wYjosgqLHaFVDNbbD6hlE9mMLD4=; b=mFVfLPyruuyL/0oQNtVaqGtBeRu7egQOJ9GZaM/mxJzM5i/97M+jfnPznENzW+1kbW 0xG2y+qx7Myxm7rG4YIg14BjtN2+EosskBYFFUnOIXAtAewNs2DXl7Qhc95JE7nbIVxU lZ7Vp9pj/sgJqFM1XEfLZkE8OVzEzIh77MZj/VMl4eRDYsPbpXOP0uGDTKL+GAIF5sqW 4h43a7Hq7AxuumWWEKC/KO2GINbegaIxc0QpBNdOAJJ5qtBJ2uofxIHL3iGJaVRKCyrQ huicwoj6Rgb7ua6IXm7uECpVnQvdEA1Npj+zOdlANcmPDw6M8blZFtdJvjzxw5tnSk6g 795g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=sTi1xf8CL9HFbZ05wYjosgqLHaFVDNbbD6hlE9mMLD4=; b=BJjiGjwlPPgVrE/pTvwUa6VVnNM+fpqeGBFo65vZ4JL51pE/mKKrFkMBSH3MVekihr u30B+wX66ULNXORaHDU6lNPc2c2SB+u2QKqZg4r0uU1iSvcxCM+4RUNV8QBTa/XGjD0k k07jU/9va4znCh3ZXF29aVzvYBMxUgr/Rx0thlEYEKrc0ArACyiaHJvIbRGy6UPzSkk9 1NjKsFATOxIkQVDxEjlM/KEXcWyt6fwfb0sS0uzIzhySO8XH9oDhFfQvxNVV2iz8IFW0 KMR1sjCKvEtpQ6XCKC7DhvMfcYIiOWERyquwbuRsV58iHQyEa2MR3Js4nYRc8cEcRQFH 43Vg== X-Gm-Message-State: APjAAAVzkA9dv0lZeF7osdMSM/IzaFwvdMCF4DEVnXmXoRpVdOTJkseb EpaKFKI2dvIJCEhabhLaidIs1lj6 X-Google-Smtp-Source: APXvYqxIxxnM6nOyFO5MOIZj8dDtUOzCE5p0x4MPKoUNPgNbXWbIzYDg+riFh4Xdd4xlg+A3qUJjKQ== X-Received: by 2002:a5d:5391:: with SMTP id d17mr5594929wrv.382.1574169041837; Tue, 19 Nov 2019 05:10:41 -0800 (PST) Received: from localhost.localdomain ([94.250.173.190]) by smtp.gmail.com with ESMTPSA id x9sm26379331wru.32.2019.11.19.05.10.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 05:10:41 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Nov 2019 14:10:32 +0100 Message-Id: <20191119131032.22353-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_fade: add support for gbrp/gbrap formats 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_fade.c | 49 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index bec765a09e..12b0d0c876 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -56,9 +56,11 @@ typedef struct FadeContext { int start_frame, nb_frames; int hsub, vsub, bpp; unsigned int black_level, black_level_scaled; + uint8_t is_rgb; uint8_t is_packed_rgb; uint8_t rgba_map[4]; int alpha; + int is_planar; uint64_t start_time, duration; enum {VF_FADE_WAITING=0, VF_FADE_FADING, VF_FADE_DONE} fade_state; uint8_t color_rgba[4]; ///< fade color @@ -107,23 +109,27 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_rgb[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_alpha[] = { AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_rgba[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; AVFilterFormats *fmts_list; @@ -159,11 +165,15 @@ static int config_props(AVFilterLink *inlink) s->hsub = pixdesc->log2_chroma_w; s->vsub = pixdesc->log2_chroma_h; + ff_fill_rgba_map(s->rgba_map, inlink->format); + s->bpp = pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR ? 1 : av_get_bits_per_pixel(pixdesc) >> 3; s->alpha &= !!(pixdesc->flags & AV_PIX_FMT_FLAG_ALPHA); - s->is_packed_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; + s->is_planar = pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR; + s->is_rgb = pixdesc->flags & AV_PIX_FMT_FLAG_RGB; + s->is_packed_rgb = !s->is_planar && s->is_rgb; /* use CCIR601/709 black level for studio-level pixel non-alpha components */ s->black_level = @@ -199,6 +209,29 @@ static av_always_inline void filter_rgb(FadeContext *s, const AVFrame *frame, } } +static av_always_inline void filter_rgb_planar(FadeContext *s, const AVFrame *frame, + int slice_start, int slice_end, + int do_alpha) +{ + int i, j; + const uint8_t *c = s->color_rgba; + + for (i = slice_start; i < slice_end; i++) { + uint8_t *pg = frame->data[0] + i * frame->linesize[0]; + uint8_t *pb = frame->data[1] + i * frame->linesize[1]; + uint8_t *pr = frame->data[2] + i * frame->linesize[2]; + uint8_t *pa = frame->data[3] + i * frame->linesize[3]; + for (j = 0; j < frame->width; j++) { +#define INTERPP(c_name, c_idx) av_clip_uint8(((c[c_idx]<<16) + ((int)c_name - (int)c[c_idx]) * s->factor + (1<<15)) >> 16) + pr[j] = INTERPP(pr[j], 1); + pg[j] = INTERPP(pg[j], 0); + pb[j] = INTERPP(pb[j], 2); + if (do_alpha) + pa[j] = INTERPP(pa[j], 3); + } + } +} + static int filter_slice_rgb(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { @@ -207,7 +240,11 @@ static int filter_slice_rgb(AVFilterContext *ctx, void *arg, int jobnr, int slice_start = (frame->height * jobnr ) / nb_jobs; int slice_end = (frame->height * (jobnr+1)) / nb_jobs; - if (s->alpha) filter_rgb(s, frame, slice_start, slice_end, 1, 4); + if (s->is_planar && s->alpha) + filter_rgb_planar(s, frame, slice_start, slice_end, 1); + else if (s->is_planar) + filter_rgb_planar(s, frame, slice_start, slice_end, 0); + else if (s->alpha) filter_rgb(s, frame, slice_start, slice_end, 1, 4); else if (s->bpp == 3) filter_rgb(s, frame, slice_start, slice_end, 0, 3); else if (s->bpp == 4) filter_rgb(s, frame, slice_start, slice_end, 0, 4); else av_assert0(0); @@ -224,8 +261,9 @@ static int filter_slice_luma(AVFilterContext *ctx, void *arg, int jobnr, int slice_end = (frame->height * (jobnr+1)) / nb_jobs; int i, j; + for (int k = 0; k < 1 + 2 * (s->is_planar && s->is_rgb); k++) { for (i = slice_start; i < slice_end; i++) { - uint8_t *p = frame->data[0] + i * frame->linesize[0]; + uint8_t *p = frame->data[k] + i * frame->linesize[k]; for (j = 0; j < frame->width * s->bpp; j++) { /* s->factor is using 16 lower-order bits for decimal * places. 32768 = 1 << 15, it is an integer representation @@ -234,6 +272,7 @@ static int filter_slice_luma(AVFilterContext *ctx, void *arg, int jobnr, p++; } } + } return 0; } @@ -348,7 +387,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if (s->alpha) { ctx->internal->execute(ctx, filter_slice_alpha, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); - } else if (s->is_packed_rgb && !s->black_fade) { + } else if (s->is_rgb && !s->black_fade) { ctx->internal->execute(ctx, filter_slice_rgb, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); } else { @@ -356,7 +395,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) ctx->internal->execute(ctx, filter_slice_luma, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); - if (frame->data[1] && frame->data[2]) { + if (frame->data[1] && frame->data[2] && !s->is_rgb) { /* chroma planes */ ctx->internal->execute(ctx, filter_slice_chroma, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(ctx)));