From patchwork Mon Feb 28 07:28:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 34542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp2460829nkx; Sun, 27 Feb 2022 23:29:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPUYZLD/mkqIqHT6yQCpFhRqKNtvAuBFP/5C4diiraZqo0izWkTMeWVt6Zx6RRNZ6G9u+3 X-Received: by 2002:a17:907:920d:b0:6ce:a6fc:1ad8 with SMTP id ka13-20020a170907920d00b006cea6fc1ad8mr14439516ejb.448.1646033367340; Sun, 27 Feb 2022 23:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646033367; cv=none; d=google.com; s=arc-20160816; b=OIunP98jo1pkbgPzPlVY5jFywfvUCzKtqE/hci04qVQijb39bPDPXIuQQDub7MwOX8 +7vgbg1VxNEzfVvxaF2bLhvd6DxNc9DVe4aXgbZU0u0Y1KURqj5PE5uWGgNLolgzx+eX gwD35LUckHEdNsJu5fms00ZSJkaGrqDJ+MgMAi78DJK0ciQmMWwe3Kod9u8j42Ge4eLr Bbht+xeSt563rDF3Yqaw9ZGG9dcmuZqCQSqaOm0sc5xk1BUolK2S+OTkVHepDp0R17Xf Ea2yVsp6AKyN7pKvXSDiAfINi93KtLFBOCFdkxvr8sniwRQItjft4w0hlO3mb4T3E5R5 q6Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=kvHU0zU4FTM6ZoFnoEceSySQ8K/MKb0r7XjzPCDQBIY=; b=d802fIl+lnTQqw+yknjO6zoyW/UlPn1PjnNk8gj6701HjDRC0JtudbUA4qF+J84LNI sErfBbzOpra6kRmfm3yp1To+CjoRp7yB7k4+AseNbIUtSOugXnwqAVqjRV+js3gz2K7G oEBElyoV/Wh3f4zjPzHGARe2kL4ewpLitPikzODK3qb1ExX98s1byRhxqz3LwqAiL/Wa GTU51iFI5Rvolow/J75KOzmPj6hg2Ss9JNHJeQbqTOltcOgwLLSk4O9RQOUNOtvfo02U cYLi17KbMLf/V5A9YBbaTWRlAfcr/RHmHkJX5a/3Mlm2FxX0lhc+yAjj/O0YqP8TSSEE UBcA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m16-20020aa7c490000000b0041124e66867si5967258edq.542.2022.02.27.23.29.26; Sun, 27 Feb 2022 23:29:27 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D49B368B233; Mon, 28 Feb 2022 09:29:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8083768B195 for ; Mon, 28 Feb 2022 09:29:15 +0200 (EET) Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4K6X7Z4hXjz9sQF for ; Mon, 28 Feb 2022 08:29:14 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Feb 2022 12:58:44 +0530 Message-Id: <20220228072844.5542-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/drawtext: make reload value an interval X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SidbluFFrc8T Allows user to specify a frame interval at which textfile is reloaded. --- doc/filters.texi | 6 ++++-- libavfilter/vf_drawtext.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b3ae139613..1ecc03eeae 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11271,8 +11271,10 @@ text data in detection bboxes of side data. So please do not use this parameter if you are not sure about the text source. @item reload -If set to 1, the @var{textfile} will be reloaded before each frame. -Be sure to update it atomically, or it may be read partially, or even fail. +The @var{textfile} will be reloaded at specified frame interval. +Be sure to update @var{textfile} atomically, or it may be read partially, +or even fail. +Range is 0 to INT_MAX. Default is 0. @item x @item y diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 2a88692cbd..6ba3f6622a 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -198,7 +198,7 @@ typedef struct DrawTextContext { AVRational tc_rate; ///< frame rate for timecode AVTimecode tc; ///< timecode context int tc24hmax; ///< 1 if timecode is wrapped to 24 hours, 0 otherwise - int reload; ///< reload text file for each frame + int reload; ///< reload text file at specified frame interval int start_number; ///< starting frame number for n/frame_num var char *text_source_string; ///< the string to specify text data source enum AVFrameSideDataType text_source; @@ -245,7 +245,7 @@ static const AVOption drawtext_options[]= { {"timecode_rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS}, {"r", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS}, {"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS}, - {"reload", "reload text file for each frame", OFFSET(reload), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, + {"reload", "reload text file at specified frame interval", OFFSET(reload), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS}, { "alpha", "apply alpha while rendering", OFFSET(a_expr), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS }, {"fix_bounds", "check and fix text coords to avoid clipping", OFFSET(fix_bounds), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, {"start_number", "start frame number for n/frame_num variable", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS}, @@ -1565,7 +1565,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } } - if (s->reload) { + if (s->reload && !(inlink->frame_count_out % s->reload)) { if ((ret = load_textfile(ctx)) < 0) { av_frame_free(&frame); return ret;