From patchwork Sat Jul 3 06:16:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 28743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2281892ios; Fri, 2 Jul 2021 23:17:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzplGVTOoRa9wZRmsNvkouwnGmm7bH7EeBvJ7s26O/fDa21dO5ehwg+3R2TBBKurcnkyYHh X-Received: by 2002:aa7:c857:: with SMTP id g23mr3516280edt.100.1625293026668; Fri, 02 Jul 2021 23:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625293026; cv=none; d=google.com; s=arc-20160816; b=JYELlzGpVr0dT8t+TPvN/8sVAVUW7dabtzPI1+OhZYagNXHndXtaEYBKbkHqnPygaM pFUrA2GRmEmmYAqHV1cP0+I2lZ6Q7WCCgCUPtmxm+FAhA6YX08dA+HJMxNOULKVmuAWz GsBjaSlhZyIgToRVdHjWAC2czYbpMbhAqMF6JewMeWorM7siGOGfVIbiQU/RjKYwZvJ2 t0H6f3pxafiuRIWGsjkL9AVyBipzMKd72vAc3L4dnOS+NjpTk9y8TrffNuRD9VyD/7qM hvbraWa4S0uEsSxyNdDWJPt70B21oer2pZqtP0UVnKxDHgIXfyx9NHX2nqCi4MOcA2Ua /HWQ== 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=pu+EieaCZy2HKtmbaiQbZY2lit87wkT/I9sK8Wi8gO8=; b=OgESJUwiPJhLU7M1ktZZhrv7Tj0NxQbY9UTXylBT5c9TQC82hkrxsLPVBGYlCqvzqy zZ7MkX4bztnlyj/98JPS/3PpF4yRiqwNevJWdpbe4XEDnp8FwV8mrHDcAnxjqzuvgnbr aZq1T1Lb/jCHO+Bt/pPyg/zNLGMI55B5L2Qh/5UkStE6Z2rtuiNyvDXB/7Aa91JF/1mI f5d4meoz5RZ4v5oPnPFYWYf3dfTfOZbvW3mHUT1bm5iHb/tycCkW7C0pLAqhwaAsUMGZ db7aK/mAzHELYZjhYI0BGCldH6o0SHdykJgY+Bry66VaPuYreitX2WPyHgFU6bcIydqo xgXA== 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 c12si4999138ede.611.2021.07.02.23.17.05; Fri, 02 Jul 2021 23:17:06 -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 B9CCF68A284; Sat, 3 Jul 2021 09:17:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8318C689D32 for ; Sat, 3 Jul 2021 09:16:54 +0300 (EEST) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2: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-101.mailbox.org (Postfix) with ESMTPS id 4GH1ts4G06zQk1k for ; Sat, 3 Jul 2021 08:16:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id PGWSwKU38UDf for ; Sat, 3 Jul 2021 08:16:49 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jul 2021 11:46:32 +0530 Message-Id: <20210703061632.570-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.32 / 15.00 / 15.00 X-Rspamd-Queue-Id: A9B38180C X-Rspamd-UID: 011a96 Subject: [FFmpeg-devel] [PATCH] avfilter/fps: remove unconventional acronyms 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: ovQCRyTXMj1e In dd770883e9, support for expressions was added. Among the constants added were labels of qnstc, qpal, sntsc & spal. These were added in ba2a8cb40b to represent parameter permutations where only the resolution is different. They don't have any usage currency and don't represent any industry standards or convention in terms of framerate. --- doc/filters.texi | 4 ++-- libavfilter/vf_fps.c | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index eaf23e3736..d991c06628 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12341,10 +12341,10 @@ constants: @item source_fps The input's frame rate -@item ntsc, qntsc, sntsc +@item ntsc NTSC frame rate of @code{30000/1001} -@item pal, qpal, spal +@item pal PAL frame rate of @code{25.0} @item film diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 29588a5f6e..fbc845da1b 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -47,10 +47,6 @@ static const char *const var_names[] = { "source_fps", "ntsc", "pal", - "qntsc", - "qpal", - "sntsc", - "spal", "film", "ntsc_film", NULL @@ -60,10 +56,6 @@ enum var_name { VAR_SOURCE_FPS, VAR_FPS_NTSC, VAR_FPS_PAL, - VAR_FPS_QNTSC, - VAR_FPS_QPAL, - VAR_FPS_SNTSC, - VAR_FPS_SPAL, VAR_FPS_FILM, VAR_FPS_NTSC_FILM, VARS_NB @@ -71,10 +63,6 @@ enum var_name { static const double ntsc_fps = 30000.0 / 1001.0; static const double pal_fps = 25.0; -static const double qntsc_fps = 30000.0 / 1001.0; -static const double qpal_fps = 25.0; -static const double sntsc_fps = 30000.0 / 1001.0; -static const double spal_fps = 25.0; static const double film_fps = 24.0; static const double ntsc_film_fps = 24000.0 / 1001.0; @@ -194,10 +182,6 @@ static int config_props(AVFilterLink* outlink) var_values[VAR_SOURCE_FPS] = av_q2d(inlink->frame_rate); var_values[VAR_FPS_NTSC] = ntsc_fps; var_values[VAR_FPS_PAL] = pal_fps; - var_values[VAR_FPS_QNTSC] = qntsc_fps; - var_values[VAR_FPS_QPAL] = qpal_fps; - var_values[VAR_FPS_SNTSC] = sntsc_fps; - var_values[VAR_FPS_SPAL] = spal_fps; var_values[VAR_FPS_FILM] = film_fps; var_values[VAR_FPS_NTSC_FILM] = ntsc_film_fps; ret = av_expr_parse_and_eval(&res, s->framerate,