From patchwork Thu Sep 21 14:55:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 5227 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2040477jaa; Thu, 21 Sep 2017 07:56:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCkJC6jGyypDVK6SGSpK5inO17ZrQUxCNzLikraAfAkXB1Z2BU6DJFEEeXa6iwav+KMOM8R X-Received: by 10.28.86.67 with SMTP id k64mr1343246wmb.143.1506005775925; Thu, 21 Sep 2017 07:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506005775; cv=none; d=google.com; s=arc-20160816; b=NfjIAzhdOId3D74ECqDhZKuqay+YtFx453gP4TxnB3F3p58aLJkFZiT7PpJD/+hc+4 FE1HTxyVgRI7UtHlCdIhjDz5UgJmCEE5ZzG0r1ZvUf4MQYHo5YFIbjvXXXvBiIWf0TdK ukraKhR91XBJj5KNGx3/K5hJMRQrX6sgV4jCQ5zHiv5ibcMR3qlGX8M9jw4er2Wm3hDP Exmgcqa5jiIGJCz2lrnTVh1UJhG2JJvL+dFO0OkOxtaK5e9ds5oDdv0EEIiLh+mGbeVQ 41XACAJrN0gYmEO6FSmU/Hmm2LqvFPDGRUnh1uP5RyvxfSCxPPYmnAf5kp0Z+q2WMQ8r 5EUw== 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:delivered-to :arc-authentication-results; bh=Q47qle/xOGsHhsNimXZhCjbz04bc14FKeNYDrt63/Y4=; b=X/B0GCXD8b/iWdmw/bhr/6cEMWlgIRtxJ3JrwfWiN/L2DbpPkainkbHGApvO+obCj8 zcZ7AsuYyIVtqp9mJHBCZYILj80AVOtGw2itdrgGX007EERgO/A02rzkpyo/XLRm+PvM 98LLgirXFhZrL1f4s7EwKue2UjYcYmU8sXsjb6TI4TICRtxDzuOdxCE/tLKYrTAa6cyW dQ9Rlmhc9l8RFQIYe6xxZYiVORDc7VAwP7TJcVm1ahxtKRJOwHCuSBykyevJ9mi8cS5e UA1zmuluXnglaws+vu6kJ7jcQ5xtZ8FwUItVfncHRWQXrjGK/cSQD+KUYzZArL0gNS6Y XWQg== 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 i133si1412693wmf.180.2017.09.21.07.56.15; Thu, 21 Sep 2017 07:56:15 -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; 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 5F4916883D2; Thu, 21 Sep 2017 17:56:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx01.mail.netstorage.at (mx01.mail.netstorage.at [89.207.144.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7099B680D29 for ; Thu, 21 Sep 2017 17:55:58 +0300 (EEST) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx01.mail.netstorage.at (Postfix) with ESMTPS id EBB50A2982 for ; Thu, 21 Sep 2017 16:55:52 +0200 (CEST) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 912218268A for ; Thu, 21 Sep 2017 16:55:52 +0200 (CEST) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Thu, 21 Sep 2017 16:55:52 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2017 16:55:51 +0200 Message-Id: <1506005752-14650-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 X-PPP-Message-ID: <20170921145552.25331.35520@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: EBB50A2982.A6262 X-NetStorage-MailScanner: Found to be clean X-NetStorage-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (nicht zwischen gespeichert, Wertung=-0.5, benoetigt 6, autolearn=not spam, BAYES_00 -0.50) X-NetStorage-MailScanner-From: t.rapp@noa-archive.com X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_fps: clean-up filter options 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" Align order of "start_time" option to documentation and add missing AV_OPT_FLAG_FILTERING_PARAM flag. Fix indent of "round" named constants and clear unused field values. Also fix some documentation cosmetics. Signed-off-by: Tobias Rapp --- doc/filters.texi | 4 ++-- libavfilter/vf_fps.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 830de54..96b3dfd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8670,12 +8670,12 @@ It accepts the following parameters: The desired output frame rate. The default is @code{25}. @item round -Rounding method. +Timestamp (PTS) rounding method. Possible values are: @table @option @item zero -zero round towards 0 +round towards 0 @item inf round away from 0 @item down diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 1e5d07e..0db2b48 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -65,13 +65,13 @@ typedef struct FPSContext { #define F AV_OPT_FLAG_FILTERING_PARAM static const AVOption fps_options[] = { { "fps", "A string describing desired output framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "25" }, 0, INT_MAX, V|F }, - { "start_time", "Assume the first PTS should be this value.", OFFSET(start_time), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX}, -DBL_MAX, DBL_MAX, V }, { "round", "set rounding method for timestamps", OFFSET(rounding), AV_OPT_TYPE_INT, { .i64 = AV_ROUND_NEAR_INF }, 0, 5, V|F, "round" }, - { "zero", "round towards 0", OFFSET(rounding), AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_ZERO }, 0, 5, V|F, "round" }, - { "inf", "round away from 0", OFFSET(rounding), AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_INF }, 0, 5, V|F, "round" }, - { "down", "round towards -infty", OFFSET(rounding), AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_DOWN }, 0, 5, V|F, "round" }, - { "up", "round towards +infty", OFFSET(rounding), AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_UP }, 0, 5, V|F, "round" }, - { "near", "round to nearest", OFFSET(rounding), AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_NEAR_INF }, 0, 5, V|F, "round" }, + { "zero", "round towards 0", 0, AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_ZERO }, 0, 0, V|F, "round" }, + { "inf", "round away from 0", 0, AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_INF }, 0, 0, V|F, "round" }, + { "down", "round towards -infty", 0, AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_DOWN }, 0, 0, V|F, "round" }, + { "up", "round towards +infty", 0, AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_UP }, 0, 0, V|F, "round" }, + { "near", "round to nearest", 0, AV_OPT_TYPE_CONST, { .i64 = AV_ROUND_NEAR_INF }, 0, 0, V|F, "round" }, + { "start_time", "Assume the first PTS should be this value.", OFFSET(start_time), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX}, -DBL_MAX, DBL_MAX, V|F }, { NULL } };