From patchwork Tue Apr 24 12:53:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8626 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1821808jad; Tue, 24 Apr 2018 06:00:00 -0700 (PDT) X-Google-Smtp-Source: AIpwx49Yw8r9q4Bs4AL4Xlea0mWdx5PkQ6kCKVQhw77mNaWTx9cdRVaDZH0v8gXKTdsGZ+9bVYax X-Received: by 10.28.124.5 with SMTP id x5mr8576443wmc.7.1524574800628; Tue, 24 Apr 2018 06:00:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524574800; cv=none; d=google.com; s=arc-20160816; b=1GBxJ2xE/TgytIpwSnNtqCCL4kmMvH72NhAsktnJIEpPyLdICP7HKvWY4bm7kn7DmZ 7Ql9Aa47QZXbBZtPrNQye4lCN1nipEGGPK1OdP0tVKuuxjXsUfUpheS6gfNHJVIl3dPI NFRhtIpvZlmJ4VPqheAYOh7p3L0wYHTWVkgk3MDslknT63vbSjHXn1ObLNvj1+FINQiy mnti/UX7qDazqS7rj9ebZrew6YofBosEbH23ZvXU+aRSLS7tGpZeChSko9rFMhGnaHZ5 dqvZ52RNl39nTjVA2TmZUsOJNRJRlnlV+fGxfzBTAS/7LTmJ3ZsT46JDiurQDXl65Tde XBcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=x3UC+O/PSxMC2G1atjbeC7TTlIgAcfeCAu6r0rZVvgw=; b=iQhx0LqkUxCoYQwqAsJRJvDGBDOy8MHsIdUaSv+WsTMHPtuHtL+qGhj+wySJaojaSz RFglpn3oQfCCKk5iM1IDZeL9jA8Dk+tCduPtR87Qc7DIe7sgYXLtUUag4J/z4bBZ9PfY 5WyYj8FydGbzjm9B3OuEgXIEAW3ebDUrZedJF47ieHA/KqVybZkKNOvi8/O0BgMUR4tT 72t7rwhvDqhjSfWIzoWgRRoJXB3Hx/7QGGh6sp4F71DqqLWl3jkTEDjHqZ7dCvoccYOD YHWFTQ13/IPLJtMcGjRU+pfL1hh6teOb8xsfmweLUgQMTyUgGfVsLs0as4k29ZBYyUav yndQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GN4eNlWM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k203si1582424wma.184.2018.04.24.05.59.59; Tue, 24 Apr 2018 06:00:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GN4eNlWM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B90DA689FB7; Tue, 24 Apr 2018 15:59:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1CA1680877 for ; Tue, 24 Apr 2018 15:59:20 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id n10so690472wmc.1 for ; Tue, 24 Apr 2018 05:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=0jPyNlDx3E8CLNXZZ/96RgyBgbWaa/ojlfAbX+Pn5Ag=; b=GN4eNlWME72pFddNruiNrNuPlKgDngUPMtrJFYbJLKy+rC9k+hAKL5sVVUvgvyxpaR t3uVY1fdJgjjImpPtIIUb9H59uyoPSQTMcYS3xNAxfNFSGfOT794lQHw8Jf54oBJAbP7 SPLRBZ9tZexODtzYX7R3/E3EW7h5CEMb6AqlSSXkJDGF9vISkxwsCOm75KFYvP0jxqir 3vZgSCtiISnk7CYNona3weQ2bsaPUV86iGs59jOeEwjLKhXh6a3o0E3BjRpZ4QVzOUWP lNAI6/eUBnAskJ6Eb7Rk0pB8h6C53yFq6lKjbCw1I/t2zY2LT1cPlbFeymDEoEmALtcO PFJQ== 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=0jPyNlDx3E8CLNXZZ/96RgyBgbWaa/ojlfAbX+Pn5Ag=; b=nzTmBpBipM1989FCCwh3FVJ74L8dHYLimMW71L7fooMjLLIE0K+zRvT8eTCv9C+IqG TeuoqViymZV7bYlVZ3ccwnnDSzXA7yiLAc9oLR5BGlwZ4FPXT2RU6vyPnTJ0/PNN6aaV YyM3pURZy9cQ7q/+5JCj1Ulfqgf+X3YXdycUBBHv8chQ8jQZsWx5VpqWnV+E1hl3Ixpk irlGC2/NgTCmOkLRHoytUDioKRqqOTj2eO+aUK6yaIgQIrvoCpwuDdBH0qoYxxCM4N6Q 68cJGzuZ3ejOjK8ET25Av8CZfhg6IrOgALGIJqmX+WbrY4R0zm8eoHopmybBIjfZG+dS H1Bg== X-Gm-Message-State: ALQs6tBMm3H7I85p71jab0/kTKFUsjMfkxp57OJJgIh/vxt89juuiaph RBSKX3Z1zaVBT8EMpt34++m/QQ== X-Received: by 10.28.3.8 with SMTP id 8mr12009169wmd.77.1524574454800; Tue, 24 Apr 2018 05:54:14 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 44-v6sm12727982wrl.83.2018.04.24.05.54.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 05:54:14 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Apr 2018 14:53:28 +0200 Message-Id: <20180424125329.21212-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter: add tmix filter 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 --- doc/filters.texi | 15 +++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_mix.c | 158 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 136 insertions(+), 39 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c4318c5b6f..23d6063ef4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15561,6 +15561,21 @@ Vertical low-pass filtering can only be enabled for @option{mode} @end table +@section tmix + +Mix successive video frames. + +A description of the accepted options follows. + +@table @option +@item frames +The number of successive frames to mix. If unspecified, it defaults to 3. + +@item weights +Specify weight of each input video frame. +Each weight is separated by space. +@end table + @section tonemap Tone map colors from different dynamic ranges. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 8f41805527..7f8317c2f2 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -345,6 +345,7 @@ OBJS-$(CONFIG_THUMBNAIL_CUDA_FILTER) += vf_thumbnail_cuda.o vf_thumbnail OBJS-$(CONFIG_TILE_FILTER) += vf_tile.o OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o OBJS-$(CONFIG_TLUT2_FILTER) += vf_lut2.o framesync.o +OBJS-$(CONFIG_TMIX_FILTER) += vf_mix.o framesync.o OBJS-$(CONFIG_TONEMAP_FILTER) += vf_tonemap.o OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_TRIM_FILTER) += trim.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 643eec287d..35e12d595f 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -336,6 +336,7 @@ extern AVFilter ff_vf_thumbnail_cuda; extern AVFilter ff_vf_tile; extern AVFilter ff_vf_tinterlace; extern AVFilter ff_vf_tlut2; +extern AVFilter ff_vf_tmix; extern AVFilter ff_vf_tonemap; extern AVFilter ff_vf_transpose; extern AVFilter ff_vf_trim; diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 261ab066ef..3690b03cf8 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -39,6 +39,9 @@ typedef struct MixContext { float *weights; float wfactor; + int tmix; + int nb_frames; + int depth; int nb_planes; int linesize[4]; @@ -71,6 +74,8 @@ static av_cold int init(AVFilterContext *ctx) char *p, *arg, *saveptr = NULL; int i, ret; + s->tmix = !strcmp(ctx->filter->name, "tmix"); + s->frames = av_calloc(s->nb_inputs, sizeof(*s->frames)); if (!s->frames) return AVERROR(ENOMEM); @@ -79,17 +84,19 @@ static av_cold int init(AVFilterContext *ctx) if (!s->weights) return AVERROR(ENOMEM); - for (i = 0; i < s->nb_inputs; i++) { - AVFilterPad pad = { 0 }; + if (!s->tmix) { + for (i = 0; i < s->nb_inputs; i++) { + AVFilterPad pad = { 0 }; - pad.type = AVMEDIA_TYPE_VIDEO; - pad.name = av_asprintf("input%d", i); - if (!pad.name) - return AVERROR(ENOMEM); + pad.type = AVMEDIA_TYPE_VIDEO; + pad.name = av_asprintf("input%d", i); + if (!pad.name) + return AVERROR(ENOMEM); - if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); - return ret; + if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) { + av_freep(&pad.name); + return ret; + } } } @@ -107,24 +114,9 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int process_frame(FFFrameSync *fs) +static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out) { - AVFilterContext *ctx = fs->parent; - AVFilterLink *outlink = ctx->outputs[0]; - MixContext *s = fs->opaque; - AVFrame **in = s->frames; - AVFrame *out; - int i, p, ret, x, y; - - for (i = 0; i < s->nb_inputs; i++) { - if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0) - return ret; - } - - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) - return AVERROR(ENOMEM); - out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); + int i, p, x, y; if (s->depth <= 8) { for (p = 0; p < s->nb_planes; p++) { @@ -167,6 +159,28 @@ static int process_frame(FFFrameSync *fs) } } } +} + +static int process_frame(FFFrameSync *fs) +{ + AVFilterContext *ctx = fs->parent; + AVFilterLink *outlink = ctx->outputs[0]; + MixContext *s = fs->opaque; + AVFrame **in = s->frames; + AVFrame *out; + int i, ret; + + for (i = 0; i < s->nb_inputs; i++) { + if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0) + return ret; + } + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) + return AVERROR(ENOMEM); + out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); + + mix_frames(s, in, out); return ff_filter_frame(outlink, out); } @@ -183,10 +197,12 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int i, ret; - for (i = 1; i < s->nb_inputs; i++) { - if (ctx->inputs[i]->h != height || ctx->inputs[i]->w != width) { - av_log(ctx, AV_LOG_ERROR, "Input %d size (%dx%d) does not match input %d size (%dx%d).\n", i, ctx->inputs[i]->w, ctx->inputs[i]->h, 0, width, height); - return AVERROR(EINVAL); + if (!s->tmix) { + for (i = 1; i < s->nb_inputs; i++) { + if (ctx->inputs[i]->h != height || ctx->inputs[i]->w != width) { + av_log(ctx, AV_LOG_ERROR, "Input %d size (%dx%d) does not match input %d size (%dx%d).\n", i, ctx->inputs[i]->w, ctx->inputs[i]->h, 0, width, height); + return AVERROR(EINVAL); + } } } @@ -196,6 +212,15 @@ static int config_output(AVFilterLink *outlink) s->nb_planes = av_pix_fmt_count_planes(outlink->format); s->depth = s->desc->comp[0].depth; + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) + return ret; + + s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); + s->height[0] = s->height[3] = inlink->h; + + if (s->tmix) + return 0; + outlink->w = width; outlink->h = height; outlink->time_base = time_base; @@ -208,12 +233,6 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) - return ret; - - s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); - s->height[0] = s->height[3] = inlink->h; - for (i = 0; i < s->nb_inputs; i++) { AVFilterLink *inlink = ctx->inputs[i]; @@ -232,11 +251,16 @@ static av_cold void uninit(AVFilterContext *ctx) int i; ff_framesync_uninit(&s->fs); - av_freep(&s->frames); av_freep(&s->weights); - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); + if (!s->tmix) { + for (i = 0; i < ctx->nb_inputs; i++) + av_freep(&ctx->input_pads[i].name); + } else { + for (i = 0; i < s->nb_frames; i++) + av_frame_free(&s->frames[i]); + } + av_freep(&s->frames); } static int activate(AVFilterContext *ctx) @@ -281,3 +305,59 @@ AVFilter ff_vf_mix = { .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; + +static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + MixContext *s = ctx->priv; + AVFrame *out; + + if (s->nb_frames < s->nb_inputs) { + s->frames[s->nb_frames] = in; + s->nb_frames++; + return 0; + } else { + av_frame_free(&s->frames[0]); + memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1)); + s->frames[s->nb_inputs - 1] = in; + } + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) + return AVERROR(ENOMEM); + out->pts = s->frames[0]->pts; + + mix_frames(s, s->frames, out); + + return ff_filter_frame(outlink, out); +} + +static const AVOption tmix_options[] = { + { "frames", "set number of successive frames to mix", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=3}, 2, 128, .flags = FLAGS }, + { "weights", "set weight for each frame", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1 1"}, 0, 0, .flags = FLAGS }, + { NULL }, +}; + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = tmix_filter_frame, + }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(tmix); + +AVFilter ff_vf_tmix = { + .name = "tmix", + .description = NULL_IF_CONFIG_SMALL("Mix successive video frames."), + .priv_size = sizeof(MixContext), + .priv_class = &tmix_class, + .query_formats = query_formats, + .outputs = outputs, + .inputs = inputs, + .init = init, + .uninit = uninit, +};