From patchwork Mon Nov 20 19:59:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6231 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4353951jah; Mon, 20 Nov 2017 12:05:07 -0800 (PST) X-Google-Smtp-Source: AGs4zMauLYFId9pxjAlHU5ErfBJ3AEY4dHfHbyy0IxaeuDxQAgIXM5bxkNn8+U6O23JQSSbTIOpl X-Received: by 10.223.152.66 with SMTP id v60mr12683067wrb.277.1511208307810; Mon, 20 Nov 2017 12:05:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511208307; cv=none; d=google.com; s=arc-20160816; b=TNuTZMQz46eruQEIlhZDPHSNzutuNLICpoZRAWnKr3U3rNG8boGmiUQz7vcRzgesBz oiXl6eNW50b29N9+5HMIdgvJRKXKqG8Ivc2NFJNQIhre8gSLRWt/EWN+KOvekHrsGAmj hxn1opqpipK9CJrzUE7DQq/WBv5V2aaqbKkfDJz1SsC5+ZlTDLGwcEG6U/h18Yl9qlPB NJXTspoZfjZx8LXHtjszHT9Apd9449XnUT1CBXJBjJSYkCfKfr9LUB+FSzj4apx9+4PQ XcODcvaSvO/OM08OAGyB6yquMQ++nKonFB0b5mwM/o6kh2cQxrtAyMKtB1hwxojMqifR 6tLg== 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=GFffNmXvGHa1p1EOEpurxoXD42DgYsvqSK1TYQDy19E=; b=D51biNuFUir0AAlYV/5UsaQGnaT4cGRsAYMStkACCnvRM+DKlvNgWLRdnTbexVn8fB kpbxM646lGx9zW3BMZtBNji5Fc7hS4DI5Mw6ihw2rKA+LYKaD1csmf09crQN9BBIrZ4d M+lEQ6oxE/KTGtXLYx/FckWP7XdN9LLu8NEF5XzxZWS5ycTt5SqRoy0EmMD7kmCvCKfB t4C4bOE4fSyIvqFPGiDnjdxuXwM+uKmj/0b7EFqKKduj2XneM178S+7Sa/+oW+vQ2fGe 8B1E36oa9cFK4oVssODdttgB9vQNRxOFvKivFamnAxBZtLID4lBXL8swJ4BS05JYKdqx TQjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=krCJn45j; 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=NONE 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 j127si8228436wma.251.2017.11.20.12.05.07; Mon, 20 Nov 2017 12:05:07 -0800 (PST) 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=krCJn45j; 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=NONE 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 E53EE689C20; Mon, 20 Nov 2017 22:04:48 +0200 (EET) 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 A27386804BC for ; Mon, 20 Nov 2017 22:04:42 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id 128so12622548wmo.3 for ; Mon, 20 Nov 2017 12:05:00 -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=BamON6qyaGcpUmUvZIblxza9tM+jfYr1KmnoRzbLm1Y=; b=krCJn45jcusxIr7XAZ4M5FILFgcQpVp/TtoWt88Yx2Yb7iIBLKF8lrNDMG6UnnBAq1 xtklRkAZacOo9RX/FS9GeLxtutCQz1Ro6MwqscX7cV/uV10DDmNN2vrdCYYoOkVBO2rg 9ld002xdjjqU6apl124UNjTXHgCK4E9uDRCXjzFInelD9N14Hspp+oahADR06jOsODsD mP6XGsgAzUa0NsYRcfkPa/0BosdFjzGx0jJrdJT0pXZ3kxWTRzoHpVR/yphh6BtiofN0 SQVrfughhUO+xDzEctboJlUBnQLxE06Q3U2fSv9+nA3UUuvzYN4nVO66n9mRRgA8OVgv fq+A== 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=BamON6qyaGcpUmUvZIblxza9tM+jfYr1KmnoRzbLm1Y=; b=F5vX+CPjkpUD/4FpaaPkXNhzNzNDni9LU+Ndo1Pn4FMsi7V02peZIKS8jtCDC8xgIw T2a7416c29UWvLIDP2icMJ9NB3PwKPhOoJadUJQk1x2tPGlFdQj5p2SW/Y8RgwF5KgTP U7f/mxDUKiW0RWxQb71m963lLOlkks4O8n/rKUU6P8nNhH5QQ0U8JF3z/iS6kdO5VCDU nieEy5BjkP/Gy6JOnXqgjgaOiBpFlbEQPG8UqvHHYfWJfQ0lKHu2lfUtYIrIYHqpEKar kxYLvBBBSG7q5+psiYveftEEvfXaYEO0hyNj/swWo/82NkQaA24oVMKNrjOcFubWmD8V TILw== X-Gm-Message-State: AJaThX4IAyC3oNi+4Yf2nLx6mn0bZ5KHNmZGQFvdlzZrvUHXbfna0xoq c/I9zaa7EuwyCm9SeYUtd1A04g== X-Received: by 10.28.198.75 with SMTP id w72mr10929386wmf.2.1511207993029; Mon, 20 Nov 2017 11:59:53 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id m8sm8646911wrg.55.2017.11.20.11.59.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 11:59:52 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 20:59:09 +0100 Message-Id: <20171120195909.10253-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter: add mix 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 | 28 +++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_mix.c | 283 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 313 insertions(+) create mode 100644 libavfilter/vf_mix.c diff --git a/doc/filters.texi b/doc/filters.texi index 63ce899784..5fad742610 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10571,6 +10571,34 @@ Default method is @samp{fdiff}. Scene change detection threshold. Default is @code{5.0}. @end table +@section mix + +Mix several video input streams into one video stream. + +A description of the accepted options follows. + +@table @option +@item nb_inputs +The number of inputs. If unspecified, it defaults to 2. + +@item weights +Specify weight of each input video stream as sequence. +Each weight is separated by space. + +@item duration +Specifiy how end of stream is determined. +@table @samp +@item longest +The duration of the longest input. (default) + +@item shortest +The duration of the shortest input. + +@item first +The duration of the first input. +@end table +@end table + @section mpdecimate Drop frames that do not differ greatly from the previous frame in diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 71c6333a52..74212c11f3 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -241,6 +241,7 @@ OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync.o OBJS-$(CONFIG_MINTERPOLATE_FILTER) += vf_minterpolate.o motion_estimation.o +OBJS-$(CONFIG_MIX_FILTER) += vf_mix.o OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o OBJS-$(CONFIG_NLMEANS_FILTER) += vf_nlmeans.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 6d92b3ab5a..79379a38ea 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -251,6 +251,7 @@ static void register_all(void) REGISTER_FILTER(METADATA, metadata, vf); REGISTER_FILTER(MIDEQUALIZER, midequalizer, vf); REGISTER_FILTER(MINTERPOLATE, minterpolate, vf); + REGISTER_FILTER(MIX, mix, vf); REGISTER_FILTER(MPDECIMATE, mpdecimate, vf); REGISTER_FILTER(NEGATE, negate, vf); REGISTER_FILTER(NLMEANS, nlmeans, vf); diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c new file mode 100644 index 0000000000..c22a861412 --- /dev/null +++ b/libavfilter/vf_mix.c @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2017 Paul B. Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/avstring.h" +#include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" + +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "framesync.h" +#include "video.h" + +typedef struct MixContext { + const AVClass *class; + const AVPixFmtDescriptor *desc; + char *weights_str; + int nb_inputs; + int duration; + float *weights; + float wfactor; + + int depth; + int nb_planes; + int linesize[4]; + int height[4]; + + AVFrame **frames; + FFFrameSync fs; +} MixContext; + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *pix_fmts = NULL; + int fmt, ret; + + for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_HWACCEL || + desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && + (ret = ff_add_format(&pix_fmts, fmt)) < 0) + return ret; + } + + return ff_set_common_formats(ctx, pix_fmts); +} + +static av_cold int init(AVFilterContext *ctx) +{ + MixContext *s = ctx->priv; + char *p, *arg, *saveptr = NULL; + int i, ret; + + s->frames = av_calloc(s->nb_inputs, sizeof(*s->frames)); + if (!s->frames) + return AVERROR(ENOMEM); + + s->weights = av_calloc(s->nb_inputs, sizeof(*s->weights)); + if (!s->weights) + return AVERROR(ENOMEM); + + 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); + + if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) { + av_freep(&pad.name); + return ret; + } + } + + p = s->weights_str; + for (i = 0; i < s->nb_inputs; i++) { + if (!(arg = av_strtok(p, " ", &saveptr))) + break; + + p = NULL; + sscanf(arg, "%f", &s->weights[i]); + s->wfactor += s->weights[i]; + } + s->wfactor = 1 / s->wfactor; + + return 0; +} + +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, 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); + + if (s->depth <= 8) { + for (p = 0; p < s->nb_planes; p++) { + uint8_t *dst = out->data[p]; + + for (y = 0; y < s->height[p]; y++) { + for (x = 0; x < s->linesize[p]; x++) { + int val = 0; + + for (i = 0; i < s->nb_inputs; i++) { + uint8_t src = in[i]->data[p][y * s->linesize[p] + x]; + + val += src * s->weights[i]; + } + + dst[x] = val * s->wfactor; + } + + dst += out->linesize[p]; + } + } + } else { + for (p = 0; p < s->nb_planes; p++) { + uint16_t *dst = (uint16_t *)out->data[p]; + + for (y = 0; y < s->height[p]; y++) { + for (x = 0; x < s->linesize[p]; x++) { + int val = 0; + + for (i = 0; i < s->nb_inputs; i++) { + uint16_t src = AV_RN16(in[i]->data[p] + y * s->linesize[p] + x * 2); + + val += src * s->weights[i]; + } + + dst[x] = val * s->wfactor; + } + + dst += out->linesize[p] / 2; + } + } + } + + return ff_filter_frame(outlink, out); +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + MixContext *s = ctx->priv; + AVRational time_base = ctx->inputs[0]->time_base; + AVRational frame_rate = ctx->inputs[0]->frame_rate; + AVFilterLink *inlink = ctx->inputs[0]; + int height = ctx->inputs[0]->h; + int width = ctx->inputs[0]->w; + 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); + } + } + + s->desc = av_pix_fmt_desc_get(outlink->format); + if (!s->desc) + return AVERROR_BUG; + s->nb_planes = av_pix_fmt_count_planes(outlink->format); + s->depth = s->desc->comp[0].depth; + + outlink->w = width; + outlink->h = height; + outlink->time_base = time_base; + outlink->frame_rate = frame_rate; + + if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) + return ret; + + in = s->fs.in; + 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]; + + in[i].time_base = inlink->time_base; + in[i].sync = 1; + in[i].before = EXT_STOP; + in[i].after = (s->duration == 1 || (s->duration == 2 && i == 0)) ? EXT_STOP : EXT_INFINITY; + } + + return ff_framesync_configure(&s->fs); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + MixContext *s = ctx->priv; + 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); +} + +static int activate(AVFilterContext *ctx) +{ + MixContext *s = ctx->priv; + return ff_framesync_activate(&s->fs); +} + +#define OFFSET(x) offsetof(MixContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption mix_options[] = { + { "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=2}, 2, INT_MAX, .flags = FLAGS }, + { "weights", "set weight for each input", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, .flags = FLAGS }, + { "duration", "how to determine end of stream", OFFSET(duration), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, .flags = FLAGS, "duration" }, + { "longest", "Duration of longest input", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "duration" }, + { "shortest", "Duration of shortest input", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "duration" }, + { "first", "Duration of first input", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "duration" }, + { NULL }, +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(mix); + +AVFilter ff_vf_mix = { + .name = "mix", + .description = NULL_IF_CONFIG_SMALL("Mix video inputs."), + .priv_size = sizeof(MixContext), + .priv_class = &mix_class, + .query_formats = query_formats, + .outputs = outputs, + .init = init, + .uninit = uninit, + .activate = activate, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, +};