From patchwork Wed Nov 29 19:02:44 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: 6454 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4866182jah; Wed, 29 Nov 2017 11:09:53 -0800 (PST) X-Google-Smtp-Source: AGs4zMb67mErIffCOxhhywPwoDJUPTni8Ua3D/zeTJoiE/LMdliN0qjkI7eRzz5xAvvKlfuH+Lqe X-Received: by 10.223.199.70 with SMTP id b6mr3111605wrh.25.1511982593321; Wed, 29 Nov 2017 11:09:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511982593; cv=none; d=google.com; s=arc-20160816; b=1DjUoBIXcsuxm41UIgRXgXYcw+doFyJqSdYkXBK68W7lJ9xteRNHoA91XtYODg4Pp6 OqTkFBVHNeDgIPhCoHsKVPJODgmwKjf0efmvV8nW1sm86mH1JQonLfa9bEDC8FA/zeNh kAhABHgvEZ0UGLgCNssNE7NTOZ4S2GrlQ0JW9QdWlqzwgL1hGgBaXZM6Y4zk6BGPOw7q lJMOAlZsPdD24fIDDewWgiMu5qlJB2z2r2oMdPKVexfTrzUku6kX+zQ5EsM5V7+RIWjI ZA/qOsGH0XXn7Gxnx2OA5BkofjiSv4/0cVv0tHWUuD4wbKfz527qtzKyVY7xvRP80FdZ VN9g== 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=OjNSIpmnT3dXUrIuuPCNJytrx1FehL7BXbRTk+RZPXM=; b=d/uFcSaEETD5cLLa16wSV2sFqyDxBSpzJfX7GNZ/V3cyqEdyRXnak04sMB0LNj/JBz KV9a4jjesOexuqMjM3jdJ7W30SG+PUrSbyZwMjETWIEMw8kC3GXIRXkejBlV9vkl/5yW WFDh/RaYuccSXsfPGhnVsZMbemZ+Vdc3xyysT+IhRCCNYppfHzqRTRbwfNsnYASINPCS O6lsOxCsk4ikB5QHYf/1JLeRaYeFkvEm0VOM1AWpLGYMwg5toHis5P7+9nIfNZg1idWv Bl4uj1+qWR7LwTkeBLr3l4XbUs2siaRQK6lRAZVsybwSmhptovqMk2otBVvX8k7GsBy+ NcVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P1iwG0xa; 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 132si1739794wmw.155.2017.11.29.11.09.52; Wed, 29 Nov 2017 11:09:53 -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=P1iwG0xa; 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 3439068A4A8; Wed, 29 Nov 2017 21:09:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CA0F68A4A1 for ; Wed, 29 Nov 2017 21:09:41 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id z34so4379731wrz.10 for ; Wed, 29 Nov 2017 11:09:44 -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=x/RzwS+dg/6m5aGW9B2ePtnngJeDZ4pVACpLgqrTWKo=; b=P1iwG0xa6jE65788XN3z71H1Sg+ozbXCQH0iEBGSMTaDNP43OQdwXetvkHZLdwDC5/ irxYRRy3H3vn4gjN/Cg3Bm5P4RrQem8/OzlbVCOGDOGHVE5RHvwt7z2iDQQLJciZJZYd UXVhsPERkI46339gC6osSLxOBKeUE6ajw4wbmCudE7o/FlK+EcmBrHmsbclM5/dKz8Ab sezheSPdgGQ8YTBzQJc4UedyoOUgKBsNebLKGXO5hw4Xr1IM5jX21K9HgQJWqZMTthYH mT/Ivv82EmvYKXLqbN/S1coInxyC8Jd6Hr+mkuJQxfAaI8m+Jdd8wpjytwnzRSa/ADPn NKQA== 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=x/RzwS+dg/6m5aGW9B2ePtnngJeDZ4pVACpLgqrTWKo=; b=sUXEPZ7SlG+9R5+sDrPzc2XqtNlwycFosllbuTC/rIvkKVjNed6+r+CJ97emdHkb0J kokO0NtMXsfLOj5y+0Zbwb+4d3u84crkYsALwlj6ueH8cQnZ/Q5J4HhGGmB3Ih2OS0hF IKrHg5WOn/eqKWmDfLo6ptHt/nSL8ppg14KmQUAR0cCPxeY7y4rUSad078asm2jwm1m7 3KEy42iGL/Qs0ARpVM2PDGP1otsklVK8Z85hGyOBJ60KTw/hMjFEaKlXFWkZ0nCTQQWm DX9DgP7s+9dpRn911JSQTbdLkKJDPLeMyO77Hr0fmizpAVHu8Tgn+OXK/uOEgtqizU/x APkg== X-Gm-Message-State: AJaThX6sdQBUlehKv/9ciy+BWZXkIQ9gCkQGKeA/AuoI6Wv9sJNpjIHR GbOnQWea02yM6aUwOSo+EIxtug== X-Received: by 10.223.145.80 with SMTP id j74mr3437981wrj.250.1511982209184; Wed, 29 Nov 2017 11:03:29 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h10sm1306736wrf.47.2017.11.29.11.03.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 11:03:28 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Nov 2017 20:02:44 +0100 Message-Id: <20171129190244.16550-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_tile: add init_padding option 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 | 4 ++++ libavfilter/vf_tile.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 4a4efc70c8..4eb302448b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14637,6 +14637,10 @@ is "black". @item overlap Set the number of frames to overlap when tiling several successive frames together. The value must be between @code{0} and @var{nb_frames - 1}. + +@item init_padding +Set the number of input frames to initially pad before displaying first output frame. +The value must be between @code{0} and @var{nb_frames - 1}. @end table @subsection Examples diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index 7717ce12e7..c347939cce 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -38,6 +38,7 @@ typedef struct TileContext { unsigned margin; unsigned padding; unsigned overlap; + unsigned init_padding; unsigned current; unsigned nb_frames; FFDrawContext draw; @@ -62,6 +63,8 @@ static const AVOption tile_options[] = { { "color", "set the color of the unused area", OFFSET(rgba_color), AV_OPT_TYPE_COLOR, {.str = "black"}, .flags = FLAGS }, { "overlap", "set how many frames to overlap for each render", OFFSET(overlap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, + { "init_padding", " set how many frames to initially pad", OFFSET(init_padding), + AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, { NULL } }; @@ -99,6 +102,12 @@ static av_cold int init(AVFilterContext *ctx) tile->overlap = tile->nb_frames - 1; } + if (tile->init_padding >= tile->nb_frames) { + av_log(ctx, AV_LOG_WARNING, "init_padding must be less than %d\n", tile->nb_frames); + } else { + tile->current = tile->init_padding; + } + return 0; } @@ -201,7 +210,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) tile->out_ref->height = outlink->h; /* fill surface once for margin/padding */ - if (tile->margin || tile->padding) + if (tile->margin || tile->padding || + (tile->init_padding != 0 && !tile->prev_out_ref)) ff_fill_rectangle(&tile->draw, &tile->blank, tile->out_ref->data, tile->out_ref->linesize,