From patchwork Sun Nov 5 16:10:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 5867 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2026122jah; Sun, 5 Nov 2017 08:10:58 -0800 (PST) X-Google-Smtp-Source: ABhQp+SGt4L0RgvhNmg7vaw0+EeA6mljUYjffziGdrj1lyKt88FYOXvTwbJvnrQsQaXRFCEvOqQj X-Received: by 10.28.206.142 with SMTP id e136mr3716503wmg.27.1509898258076; Sun, 05 Nov 2017 08:10:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509898258; cv=none; d=google.com; s=arc-20160816; b=nYuUEC4vNMvpuD8fFrc7mUsXKfiDGzTmGBcnHkV5hK1RYybSspd9Ct2dIZr7Y2VusJ 9jZgazvUTOpK7sk7PETekvk3zpfH8SXillUm7r3tdTIP0Fs/HFJ+hnMkBHgUeIFLWaxy E2Kl/OHmxdUx4mBNuJH0DI+8O+Mw/ICB74sAK8OXGdbArWa4pWRO8CJGFkR9bqA9KqsL n2GJwWRz8vz0bTiLPNR5xraJ1Jac1KwCoorSjSU5Bsl6l86SfS6LPqH7dYxlId2lZ1Tx urL1cr9jT1s63J5fCg3Ea0BPe9CgBG7WonGtBmP3R5aHyi/v0yTrROe6IC8fyYvalgWT K61g== 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=5aNeHxsjkyoE+esEZ001uMswJ69STSiaArsmw9YXZ8s=; b=eNA4GlPmDvMFfHJwZqzK7ZjgfAPuZNktkLnG4EqcDTqfwmO7sycm4qtlF1lpZSv9oo 4jmu9qhQbyFEIkn1O/MY6t5pt7LSEx+EGRKlv+N6AcmKmEq6jxZ9XDk+yMvBJ8nbAlzk WtdI/QNKC9ZbaQLfi7ag4laUMFLxuU1boYVSPXz5/GHpeKzhswK0XLm8FJzIdLkfw2ji wOREfr9h4cggzjH2K3PFj7HdS6AXJBxvmhPXHzxpJ6APmpgn1oq+h6y2m1Y9TG1ytt98 NCiE2aybCOleP8DD881ZC2XWA/AUvQDBlFf3Wlc2ecShwC1BEdf4kjMEHE9dIoJW1cSw QWug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nYVqYY6Y; 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 s25si9629591wrb.484.2017.11.05.08.10.57; Sun, 05 Nov 2017 08:10:58 -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=nYVqYY6Y; 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 2776D689DB5; Sun, 5 Nov 2017 18:10:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B69DE6898CF for ; Sun, 5 Nov 2017 18:10:37 +0200 (EET) Received: by mail-pg0-f53.google.com with SMTP id b192so6337563pga.2 for ; Sun, 05 Nov 2017 08:10:49 -0800 (PST) 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=pI0YF2d9FrnJp1OFmhySWbddcmUx6kxCuBXg2ccyPFA=; b=nYVqYY6YzgZk0ih+bZBowcgY6tKnnSvt+o2ZAs7wAGBTuQERaucie+woxvz7B5y2eJ jipOUSk8nhmAUv22O1Zn76sIhQI3DpxcbWc9UnLgtBAFVIywnEP8nhXkleTNqUMeVlmX y/XVyhGCU24uboBJx6HTdbiFLfbFU5q6rcR4C7AxP0xWYuAS+/M6yXP0wfiC4QfJPb6O mzXX8HWkYznQYlwOgik3ZBAToI3zsUyecXfZggCjcXL3/UKRP96pK/ur2QnYOdxTQXoI A/vI9Hzhc547xrk4sLgXLs2pLhFnJOYMeOTgZURWtrlZcnVJg0AqrruRaEuX5pHHI9Mh o/hw== 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=pI0YF2d9FrnJp1OFmhySWbddcmUx6kxCuBXg2ccyPFA=; b=ogODC8cPngaLFWQdS6s5TjxAKMEydNMMqxyNBD1aSKHQanp1znkk++D9R6VYmlWtW0 o7RRVg2vAhZgCx/d9E4Cdt1/7MM96/pIw+9VYgbGlmqi/uDqkWKI52ONO1LoAah/g6mK nBjfPnTAdKAdpflas7Y94qEMfC/zMSh84b3qmmxJ8QiXY1nQE0e8uHdNb1x+phb4Q/47 bMhuaOZLF1kJOi4p8c4BII3kJ/9taeN6VAGoQ+Y+b16F9YIqp7pUkE3MkeSL5JWmkto+ cmSO/wZOaOl/4Zw9ggOB20w3gK3IkgyyON37jxn4ZD9PwfvshRTS3ISqEMhOrJkkpm1Y UObA== X-Gm-Message-State: AMCzsaUlDY+5B2wM1dEHFio/stp+kJedpbFFaipdNhBnXuMZaaqcqU9e 7SOsz1dPZQvMsV+wB9I4Jza7mNLf X-Received: by 10.84.142.129 with SMTP id 1mr12173674plx.427.1509898247113; Sun, 05 Nov 2017 08:10:47 -0800 (PST) Received: from [192.168.1.9] ([45.126.171.50]) by smtp.gmail.com with ESMTPSA id k11sm19648937pfh.134.2017.11.05.08.10.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Nov 2017 08:10:45 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Sun, 5 Nov 2017 21:40:41 +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] lavu/timecode: clarify error msg 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 error message for timecode_rate values below 1. The user-supplied value for timecode_rate in drawtext is rounded to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0. This throws a misleading error message which says "Timecode frame rate must be specified". Changed message to account for values under one. Also noted supported framerates for drop TC. Regards, Gyan From ef152e77da4d1ea40d452b9cc86dcc51df1e20a7 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sun, 5 Nov 2017 21:29:22 +0530 Subject: [PATCH] lavu/timecode: clarify error msg for timecode_rate The user-supplied value for timecode_rate in drawtext is rounded to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0. This throws a misleading error message which says "Timecode frame rate must be specified". Changed message to account for values under one. Also noted supported framerates for drop TC. --- doc/filters.texi | 4 +++- libavutil/timecode.c | 2 +- 2 files changed, 4 insertions(+), 2 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/libavutil/timecode.c b/libavutil/timecode.c index c0c67c8478..e9d8504ee7 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -155,7 +155,7 @@ static int check_fps(int fps) static int check_timecode(void *log_ctx, AVTimecode *tc) { if ((int)tc->fps <= 0) { - av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate must be specified\n"); + av_log(log_ctx, AV_LOG_ERROR, "Valid timecode frame rate must be specified. Minimum value is 1\n"); return AVERROR(EINVAL); } if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) {