From patchwork Thu Nov 2 05:47:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 5830 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1662668jah; Wed, 1 Nov 2017 22:54:13 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TXmFmhiHhOUMadRb5Nh/AlYGHfwastNvK65Qmm8knN6ODHgbfUytuayDDbrgBdfrLY5v/j X-Received: by 10.28.52.193 with SMTP id b184mr634397wma.13.1509602053318; Wed, 01 Nov 2017 22:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509602053; cv=none; d=google.com; s=arc-20160816; b=AAFXo13wy+MXTe4YHyHCsrMz53NBUK4Q/V+nslWl7HtfpfUX7NlL7n/CamZ/eu4rnf z2gDdiHpXDyTb91FGeDlr1J44jwhvYSVDqWBaI7BRkytkjYKk11mkR2DMWSCsySnHrKn ckZ+fUCp90C9vSzML7XJ2cThVP5n73RZPzHJOmBdIJHFDPuzc7V6D8BMx3VEuoF0nT0S h8a+air3HFx+CJBZP8VCG2lKWvGRGXyYytX4nd5wWIjr+6sdEf2KlEdpmz06rxK7zZPC I7OKObsOOUuXudVKaqPFEQNIswv2j7NEenfkvfeACODBlkP4ondkgP0pehU/9fXZeD7a 2ZBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=0b1arByrU1z1yFfGfz0j/oULRXHhFLb3VzrGMiTyXoU=; b=ABS03AvQRxt48nq2R4Vsn2l8hkHOYJj3E6+rdcaVpfJFy1FPQ8GwE8I196gT6jYOwF jyuPSKSt3DK6laFd+8UsY85hnDL99q4oXiBosimwE+sKb61St32Z3pE35orHOL2fvFao jXer2aanHFKKs8P7HVRv26Gq9T6xlXw25+4YgnQJaQnbdiZ+VNXHcudqhJ5Bu4q63nJf CO9SpEsyqSN/+L/wu3wqs05/AUAWG6/F7ZV8Tk5+h1Iyv127XTAtVb8so0/fUubBNHsK o83clKagHdc2KLGUyhbynTBr92R8BL5JMPu55cqXJoX9iFjZqxWgCkbfjp71ofNVMKbG nHdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B1F/Z5zI; 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 s1si2057844wrf.301.2017.11.01.22.54.12; Wed, 01 Nov 2017 22:54:13 -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=B1F/Z5zI; 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 99BF268A321; Thu, 2 Nov 2017 07:54:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E5B168A27F for ; Thu, 2 Nov 2017 07:53:53 +0200 (EET) Received: by mail-io0-f195.google.com with SMTP id h70so11275001ioi.4 for ; Wed, 01 Nov 2017 22:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=x6sXxNmEabou2sRwduH4n3bwo7tn8vdgY4IzgbAoJkQ=; b=B1F/Z5zIcpsRFCRlLW92TdK+IZh5Bev+PzjUK2yP8qTl71k04yM0TfEYg+68PP+0gr u4Pi3HIk17wYrRSHfBL8xpYlF4ZcTAPHBK2LATPDTJ7cbeXv95YzEqgCO8MER0pQcG5s 3DlEWJAyl0z3JCeNuEhk9PYrXdsVPN87w3vTvk37ekD4gSx1a4bbWf6k+e+iZ4c4HI6O Ut1IdEnjIAWIy7PbMeekBpHp7+CdWvlupKxKV2abRUgMHuy79ExD0RySmHYaEPCMtnOP AaWAXLSS80LCetc4ciq854vPubmc2mShYEYZrHPXUC+kSVdoQmO8tfZMqJDRd3W42d1a vejQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=x6sXxNmEabou2sRwduH4n3bwo7tn8vdgY4IzgbAoJkQ=; b=RN5yRDZfsbATMfkPvJIqhRgGeOiY4tU6wPEemQ4LC5ieZ7BWef1t9d0N2PowoXDEwk kwu6eVuAuvzno18wKCKGxexCMGJOVH7m3kwOiZcqWQdwdDqhPqEdr7pFJKUH6eDW6Kmd z1gogHOgMs0c/KzMd0cKRJDB5L0GLPWFiiz3WBesR0TKxN9JptAXe/GxhF+fRE0/OiCf WL7Mpigxhfh3dKhvinkFIvEfSddfNArx0wUyHO5FvTsXny4AFu0R+8wU+IovDCObcWZ8 ruwyGaIbCInAlnKrYW7ZnPk9kMSzpSq2m9MTQojmRX30tw9ZSpI3+AxwGcO9u12Ii0Xm 19mg== X-Gm-Message-State: AJaThX5Ub3u5yDDPCFVNzG4dEbHwX9O6cUJ+UZizGcjNF6V/ND2UxtFB l5XdAC7gTj9KGKbCmoE5QAICkHcD X-Received: by 10.107.15.170 with SMTP id 42mr2842377iop.141.1509601632243; Wed, 01 Nov 2017 22:47:12 -0700 (PDT) Received: from [192.168.1.9] ([103.206.134.22]) by smtp.gmail.com with ESMTPSA id u84sm1058538ioi.53.2017.11.01.22.47.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Nov 2017 22:47:10 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <2eea667c-a37f-65f5-b329-3ef49f775b43@gmail.com> Date: Thu, 2 Nov 2017 11:17:05 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] lavfi/drawtext: change minimum value for timecode_rate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Prompted by an issue reported at StackExchange, patch changes minimum value for timecode_rate to 1. The user-supplied value for timecode_rate is rounded to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0. This throws a misleading error message that says "Timecode frame rate must be specified". Regards, Gyan From 24d9c412d136c80b09f7168e971446bc400e8554 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Thu, 2 Nov 2017 11:08:21 +0530 Subject: [PATCH] lavfi/drawtext: change minimum value for timecode_rate The user-supplied value for timecode_rate is rounded to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0. This throws a misleading error message that says "Timecode frame rate must be specified". Changed minimum acceptable value to 1. Tested locally. Documented the change and also noted supported framerates for drop TC. --- doc/filters.texi | 4 +++- libavfilter/vf_drawtext.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6f6dfcff48..61e27fea6f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7365,7 +7365,9 @@ format. It can be used with or without text parameter. @var{timecode_rate} option must be specified. @item timecode_rate, rate, r -Set the timecode frame rate (timecode only). +Set the timecode frame rate (timecode only). Value will be rounded to nearest +integer. Minimum value is "1". +Drop-frame timecode is supported for frame rates 30 & 60. @item tc24hmax If set to 1, the output of the timecode option will wrap around at 24 hours. diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index f6151443bb..251d453e0b 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -233,9 +233,9 @@ static const AVOption drawtext_options[]= { {"timecode", "set initial timecode", OFFSET(tc_opt_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS}, {"tc24hmax", "set 24 hours max (timecode only)", OFFSET(tc24hmax), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, - {"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}, + {"timecode_rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=1}, 1, INT_MAX, FLAGS}, + {"r", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=1}, 1, INT_MAX, FLAGS}, + {"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=1}, 1, INT_MAX, FLAGS}, {"reload", "reload text file for each frame", OFFSET(reload), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, 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=1}, 0, 1, FLAGS},