From patchwork Thu Jul 5 09:58:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9627 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1699855jad; Thu, 5 Jul 2018 02:58:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpefLou8YqL04Z7o4gXCpkTcsbVQ1jktk/3y9L+QHc1vZvpc1+o/oEL5SLOslHd70OWwB07S X-Received: by 2002:adf:d142:: with SMTP id b2-v6mr3958661wri.17.1530784735063; Thu, 05 Jul 2018 02:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530784735; cv=none; d=google.com; s=arc-20160816; b=OFGSEoib/j384j/WcJHibU+qPny09bfjfbAp05qsK8Rx5UElFrV6U6HI5STDKQ6de2 r2nAPzS6WLFw8+fF2L2i3KVx+fab0BIY1ZTCcVts+YIS6gUQWBBuEr79+ZxdAZMCEmRE hOuiIKfzQ53AnoNZV77GUw0ZxeWuvF/VDcLt3k5mMPTDYeZnosnTgSl3fel8AMbqFbYl hV++IoX/msyI9Rn76MBP/9Yg0pS5J72pKj18CIFFLzvlRYZk9C6EhqU5iutXOLnn2WLB QsQ4hQ+Jm4yqKU+TN2vJjwA1yxPoe9fSzafuBLIC1t0FEt+grmquIAj5M7ycUw4Hf8+v G6EA== 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:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=yNyAxW48qij3dhhcRR1flaDmWF+lFexef78dZzaj/A0=; b=JanyHmTytqr5RKywsMTjUbMsAUQe2JocC2+EnALDnyZXXtd/F7CY1yMu7LVJhskjva aVGkkdKmmXK3o7YW5nPJPOXNOmZD7/DKu7H08JOWJ9PT7QyUbAs3zNiYt1HWT2gZiFnb aNkyGrHY1JyOKiM6WGNtIg78bRcxApGjYPHvxQXJ2zlYxHiTbPXQ1oNnmmzyrw/m1ANg n/cHTZl0ltrW6FcgPiSNsCuWPdUSDRsAo3NO8F8cWzOmXH9I88gj7eUxJoNIK1t98jEv RUrVrA18ytJhkWz5Q4ZHm57ywQ0PjVqzsYK5L/WQuPkZHXWUzW6qfUPrd1vX0G4s68fk hYpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UjGf07Go; 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=QUARANTINE 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 i2-v6si4998254wra.332.2018.07.05.02.58.54; Thu, 05 Jul 2018 02:58:55 -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=UjGf07Go; 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=QUARANTINE 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 7061C68A70A; Thu, 5 Jul 2018 12:58:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7367868AA19 for ; Thu, 5 Jul 2018 12:58:40 +0300 (EEST) Received: by mail-pf0-f193.google.com with SMTP id q7-v6so3833063pff.2 for ; Thu, 05 Jul 2018 02:58:45 -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=SYoe+CjmARDgLBC80sFV6Rx0EQ7FnLY5zoIG6qBp7Fw=; b=UjGf07Godsr8361hR3HjBcpWuIjxIbKJU3esXwRq7x7yDSiID33zzK0ry+HCjgGMAA 36n03rJOSzMR1tRKbxP8CnoK7iw0+vfgwjgKl1ybFPedPTzLqzsfNdBfZqo+no3nGstR zoGMMdcSFoKdhLdDGsi3QFDvBfATpS3IJ7Qkw/7o43XNv9I8EvGVsaFR+/jjpCkHdHNW AszwNgcqmKjMhCI+25Vyy5GzsZxIUoUQ95RerF4ABnUtouySYh4rcxTfmt+Q5jr/Gl0f bIiNzHp/cu8fj8lIaFI7PDwQkOX+4SPLIqwDzXJ7gkDIu6v09Rqi16t+jq0Tb63bIX0C P9vA== 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=SYoe+CjmARDgLBC80sFV6Rx0EQ7FnLY5zoIG6qBp7Fw=; b=gcMrdkbAzmaePu8b5cOx2M0eRnlGwmPEIZOTFnx0wriGnvCzDAhe0l9HgWAz1jizYA p8ylggI7HkSCqY/Lg/BmnOxvt1fnCXbZyGNKTKoZJI6mOOnF2l4KkA4aFj1vBUzaId9q 15mKhbGAmlzq853abckPQRU7mEMb444mWH6TDTqwtZTZExqGzfP1XM8Dnh6CUj7pM79L reJevwl/K3mTDZoPCXEmoWVOGxFlmgE7sM17noIKehLT9JJkxSMV6s6uD6/8eFDYzvWx ckJYDzD+qt4mfrMDwvA2MnMYn0s/Si6OrZqTa4z7LTvmJXj/XZ7Gcrcu8Uvhy6vG5AIY G5PQ== X-Gm-Message-State: APt69E2naRx2sYlvgn/Te3yzUjvbfx+gCIpfJplAhLJeu6Gilhzmti5o LMkwofymBJwhN59S59qbofU3DqXv X-Received: by 2002:a62:ec41:: with SMTP id k62-v6mr5697175pfh.206.1530784723548; Thu, 05 Jul 2018 02:58:43 -0700 (PDT) Received: from [192.168.1.225] ([183.87.90.217]) by smtp.gmail.com with ESMTPSA id b1-v6sm5642063pgb.16.2018.07.05.02.58.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 02:58:42 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Thu, 5 Jul 2018 15:28:40 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0001-avfilter-setpts-add-FR-shorthand-for-FRAME_RATE.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avfilter/setpts: add FR shorthand for FRAME_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" From 5012a823d34cecaac2bc19ef60062e6eedcdda6e Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Thu, 5 Jul 2018 15:24:55 +0530 Subject: [PATCH] avfilter/setpts: add FR shorthand for FRAME_RATE --- doc/filters.texi | 2 +- libavfilter/setpts.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index fb5f3eef4b..b697a829c4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -19387,7 +19387,7 @@ The expression is evaluated through the eval API and can contain the following constants: @table @option -@item FRAME_RATE +@item FRAME_RATE, FR frame rate, only defined for constant frame-rate video @item PTS diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 4505498bf3..800ba6a83f 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -57,6 +57,7 @@ static const char *const var_names[] = { "RTCSTART", ///< wallclock (RTC) time at the start of the movie in micro seconds "S", // Number of samples in the current frame "SR", // Audio sample rate + "FR", ///< defined only for constant frame-rate video NULL }; @@ -81,6 +82,7 @@ enum var_name { VAR_RTCSTART, VAR_S, VAR_SR, + VAR_FR, VAR_VARS_NB }; @@ -127,7 +129,8 @@ static int config_input(AVFilterLink *inlink) setpts->var_values[VAR_SAMPLE_RATE] = setpts->type == AVMEDIA_TYPE_AUDIO ? inlink->sample_rate : NAN; - setpts->var_values[VAR_FRAME_RATE] = inlink->frame_rate.num && + setpts->var_values[VAR_FRAME_RATE] = + setpts->var_values[VAR_FR] = inlink->frame_rate.num && inlink->frame_rate.den ? av_q2d(inlink->frame_rate) : NAN;