From patchwork Fri Nov 17 20:34:37 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: 6143 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1071401jah; Fri, 17 Nov 2017 12:41:44 -0800 (PST) X-Google-Smtp-Source: AGs4zMaqCtPMiF1co/yX7UEIMbhDjKUZrak1nn2yiC7T6Ub9jibP92Crl21oijIEy+lZx5qBD07B X-Received: by 10.28.57.11 with SMTP id g11mr4512413wma.92.1510951304046; Fri, 17 Nov 2017 12:41:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510951304; cv=none; d=google.com; s=arc-20160816; b=QPFxBP8jiThMYT/aZD4E+XBlK418o/1isMYbNinO+58i4Dmi/ADnjtrT1y4LKp0tzY HONmIOdlkTz4vsLV0/NCKEFy4ZXjWkc/5b6OtmBeG/ilHkLNbK0LPvFVemfkUQi2EhLr LnFXVbHof/wKihJ+aS0AdBfcvJmY6ldejd8EF1/O6eZz/kTOHyom4bQcD8R+eLTF+8eX LTHequrEc2JE4biCPu6iGspXKB6AGvstO9AeFwPK5mgroQDq+clFNihtFITODaSnEWOL TM9JdsYCTDtYmURrFdmTGb9QMtCvNOgs+tmHqceFvhJq/MmKVU0Emi1ky+2UgF0V70aT oMxw== 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=qvdijVF1al3WG05birEkPU3VM6qKF19rxPH4W6JRJgA=; b=bJA59SajIeXkqObVJc8RsP1aHeqYFGhLgYz5KMTnRhOyRcqYpgqDsmlbysvaXUIBop GxiIhh3W9cMoJDEF5Lt5QIVVxmM1lT5kLOe4GH8TPCeROWM7l9u8kk+/bhD8BxPPtS8W SjN4aLgF/35LU6rbtGOIF5/B7HIeRLkrRra4pqc0uaUx7tDtxI0iKGUd8vzkIsEsD67o XH2pu+uE0FG96XBMv684jGcG2akPN3Dp5rH5kHaOdu7Is6hKvFs5MZ6pkE6n7Fu70sNr nse50JrJFyefa7zX237kPfmmjUvUaq8TbTaLxaqIPLR8ZKKouM+V8MmZJP0HLZCwR4XH ZE7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gMdhkKC1; 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 a69si3333166wme.11.2017.11.17.12.41.43; Fri, 17 Nov 2017 12:41:43 -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=gMdhkKC1; 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 8E67A6899C4; Fri, 17 Nov 2017 22:41:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8714768066B for ; Fri, 17 Nov 2017 22:41:19 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id r68so8797648wmr.1 for ; Fri, 17 Nov 2017 12:41:35 -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=bNWhr59Mg7Qn9zuV7Z6S4f0NvoGHWr4qqcKp0yjKXkI=; b=gMdhkKC1owTDxamLX5wFDWZWvl8cFKQ75MzRDWQfWyXP8lW13J9Qb9tUCcgcAwuKJh PPuKX3mMwrkcOYoGg7+4SDrLOEWUCpM162AjpHn9qxoGzugu/hPugtbR5YVuBxeNdTDy eKCRN1gmZeQKdzmBgWcUwU45Z3kLf46/vT+QwKrwbisRuprCGVhOujVcfa0xaOtBb9Mw z0M0rhVS4dsc2j6UBI+iUoipxaZVDR2ArG1RkQtZSNaxNPkqoJu9gb+7cbGwJcrnrAJL rphjjyeYyjb9TAcJPD4CD5vvcWOEsoKm7NwdGTCuaFOdWepj33yaQ/ulmbIMoeDQ/WjI HI+w== 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=bNWhr59Mg7Qn9zuV7Z6S4f0NvoGHWr4qqcKp0yjKXkI=; b=RkVkidM1EjSxcQ4ZxpHspaC5QLpc9UKeIPY/JUqz4xpTCnoL6jHre+NZ77OKBeYkvI YytiOemoSfqC3O6COfrsB/HRxNxTkiPqcrPV5rwkg71crJmN2a888VeGprM0n/0joBty iD2/eWqWy5UnC9yvjKn0Ozh39yGm887evTvaXmtIG0trj3ORH/93PtmTHX+83f9OgPDl Hj3Fs4jaWz1GWqEUfAKNqyN0y0ck2LCRhIAyNt9lmuVS6yJCAENG7jwOnmG7zP99X+xm 8CVRZB6T6VQtR898EhOQdWOYQc8mFmxklOf1fOTbdPn1fWjLoz1r5xMN8d5YMZODWct9 UpzQ== X-Gm-Message-State: AJaThX78ml+fctzM/4QL/qwIYy6OY715f2FPBU8h6A+eDpu20T9M5+5V pU1qmIY4oE9H6SVfuZCq5TBOfw== X-Received: by 10.80.140.237 with SMTP id r42mr8854413edr.299.1510950892314; Fri, 17 Nov 2017 12:34:52 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 33sm3485107edt.75.2017.11.17.12.34.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 12:34:51 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 21:34:37 +0100 Message-Id: <20171117203437.24145-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_tile: add queue 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 | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 5d99437871..7eeeafab8e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14461,6 +14461,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 queue +Set the number of frames to initially queue when displaying first frame. +The value must be between @code{0} and @var{nb_frames}. @end table @subsection Examples diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index 7717ce12e7..dfc9377569 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 queue; 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 }, + { "queue", " set how many frames to initially queue", OFFSET(queue), + AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, { NULL } }; @@ -99,6 +102,19 @@ static av_cold int init(AVFilterContext *ctx) tile->overlap = tile->nb_frames - 1; } + if (!tile->queue) { + tile->queue = tile->nb_frames; + tile->current = 0; + } else { + if (tile->queue > tile->nb_frames) { + av_log(ctx, AV_LOG_WARNING, "queue must be less than or equal to %d\n", tile->nb_frames); + tile->queue = tile->nb_frames; + tile->current = 0; + } else { + tile->current = tile->nb_frames - tile->queue; + } + } + return 0; } @@ -201,7 +217,7 @@ 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->queue != tile->nb_frames) ff_fill_rectangle(&tile->draw, &tile->blank, tile->out_ref->data, tile->out_ref->linesize,