From patchwork Mon Feb 28 15:49:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp2825738nkx; Mon, 28 Feb 2022 07:49:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMLkGw0FpNJbrs//GsOZyxnEI/C5oUZfqmhxiwOKPq+4usIUN7g/61vD5gF112PHm10XeE X-Received: by 2002:a17:907:2a53:b0:6ce:e4fe:3f92 with SMTP id fe19-20020a1709072a5300b006cee4fe3f92mr15245581ejc.389.1646063391575; Mon, 28 Feb 2022 07:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646063391; cv=none; d=google.com; s=arc-20160816; b=qtrrisr8cWZTiv7wD7PXPC9LGb4FoaWR30DSAD3JdIYuilaAtww/o4ZmPVZY500zZU 8YpCQtrTGSS1uU4AR8Ax7CvOXseS7wjKSm0j+eCsPuTX/W8CL7NbiKhp9DmNTzS2+0Le f+niO0MrR3WPhs3VPJc33kZ0MQdL3QDz/7b5UExV9t4WltHtaDV5Rhp/I2JCoGZcaiqf af6ROw7MyxEdJfDnHMTRKC5lJ0fxv203o4AtjFJhSTPsfs1b902XM8AzoZmppEP2Z5uK sSi0zH3TtzUtJ/rJCqylm7M0W2bwverFrSky2JC8O6xGVNzMDMTKD/qyGTN8gz3DpRnS lkWg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=M0DQKwdgk9hQMQE/oyyCqoRi/pVfJeXm9Kx23NAxIDQ=; b=VHhq2bxgeOaocdx/NO0RXXvitIYg8JmPH9Q/PWj04cPqujgipQFI3PXcXOLQ5jCWQM bL1zAwurP5w9S/s1sH72LESGn2gfAZX6eeW39G+VN0WHUJqGS0yBHRWZHH/MzLkQsSZR 6qhuG4VaPkpfT2KgI4KwDypUcEYQrWNFBTGNc1Al6J1hI1z+V91PPSwfg1oclatxmy/n gVT/m9lxEP11FehmJsjDK4MAA7kvFyFplfOtgum8A/6MrpCcuo3UlMWk5fAlopj4MRaU 7yM7u1MzXs3YsBbYtPzMC1aWnYW/L0eBTdOAp1XBgjyH1YI9l4Qu2nCsBdG5ZpxcLjnA MsbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HPdP+SkR; 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 d9-20020a170906640900b006d343d69d42si6117521ejm.329.2022.02.28.07.49.51; Mon, 28 Feb 2022 07:49:51 -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=20210112 header.b=HPdP+SkR; 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 92C43689A2B; Mon, 28 Feb 2022 17:49:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0293968A2FB for ; Mon, 28 Feb 2022 17:49:30 +0200 (EET) Received: by mail-oi1-f173.google.com with SMTP id ay7so13551737oib.8 for ; Mon, 28 Feb 2022 07:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MS2C/WWvZX1zhJlceC8txy3MCpUBZRTGTDpthuHYgSc=; b=HPdP+SkRMFL/g8KpeCEpzvl66/C54gskOy3/wPo2zKURRvAyRop32fFANcq9mjuXUF msbrIGCKxstlvSrlYqt+Clh21vH2m2vIuP0BJY+2PBCrpaUATaIPG1itT05KFCZpbCA9 SLd8hTo467AamfZqv9DjXye7AsQHMZrS3UwlfiCKtDXGSeiuVrZD31Le8kDOCZ1I0ixs T2rChEOLSrFK/fzqgCwBpqpr4bv2Sx4WHM7yUSZLIAKP4eClA5nrmQSjJjYbutS56fKE Nul9Xm4C+d6Pzxb5uEhMsPlpYiq2e6MtoDhN8gy7ZLqmkj+wSMIM12+cEjBEDAhsXydC D9Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MS2C/WWvZX1zhJlceC8txy3MCpUBZRTGTDpthuHYgSc=; b=xl6hm1yrLvczsOcOfd2UaSjWIBgtJbcnXzigjS0LP4FcNgX1uCttxXYV8mYShlP87b XKr3BXmTWruGJANPBOirxE72rL9fq5xaqidZ19jXD5Tkpib/PlWPULsanV5v1fHP/qTL OOhsw6MPO1kQGD8VtTbzmPyFnaexpc19Z0YKKkXdyDfGZ15XaK1UlU/cbmt4ncaqZGcD n+D32I8rYpX3+p2/ap1rZ3HxorEclK29OANP+GKV5vvhfoVQlHBf9eLoi79A2v9h2o7t ltb50lfa2QIPcdjt++J1VBND44f/J4QsAcUR0waAmEww1PTcQSPhB0jwikAUw+YebjTg MqDw== X-Gm-Message-State: AOAM530u87LbFU7/6+/+a+L96IUQYzDLh3SgATE7+u5UbSGJzPxL4fLM YhG+0J4Nlf8mr2fVCOWvl5ccCMNXgOGOdQ== X-Received: by 2002:aca:220a:0:b0:2d7:a170:e243 with SMTP id b10-20020aca220a000000b002d7a170e243mr1847812oic.84.1646063368283; Mon, 28 Feb 2022 07:49:28 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a27-20020a4ae93b000000b0031be7c7d2d3sm5018131ooe.0.2022.02.28.07.49.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 07:49:27 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Feb 2022 12:49:06 -0300 Message-Id: <20220228154906.1602-2-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220228154906.1602-1-jamrial@gmail.com> References: <20220228154906.1602-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/setts_bsf: add an option to set output time base 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: x3KF84YUF0l4 And a relevant constant to use it in expressions. Signed-off-by: James Almer --- doc/bitstream_filters.texi | 3 +++ libavcodec/setts_bsf.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 87c984185d..b11d357941 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -800,6 +800,9 @@ The next input duration. @item TB The timebase of stream packet belongs. +@item TB_OUT +The output timebase. + @item SR The sample rate of stream packet belongs. diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index d574449838..e2c1997d0c 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -47,7 +47,8 @@ static const char *const var_names[] = { "DURATION", ///< original duration in the file of the frame "STARTPTS", ///< PTS at start of movie "STARTDTS", ///< DTS at start of movie - "TB", ///< timebase of the stream + "TB", ///< input timebase of the stream + "TB_OUT", ///< output timebase of the stream "SR", ///< sample rate of the stream "NOPTS", ///< The AV_NOPTS_VALUE constant NULL @@ -72,6 +73,7 @@ enum var_name { VAR_STARTPTS, VAR_STARTDTS, VAR_TB, + VAR_TB_OUT, VAR_SR, VAR_NOPTS, VAR_VARS_NB @@ -90,6 +92,8 @@ typedef struct SetTSContext { int64_t start_pts; int64_t start_dts; + AVRational time_base; + double var_values[VAR_VARS_NB]; AVExpr *ts_expr; @@ -141,11 +145,15 @@ static int setts_init(AVBSFContext *ctx) } } + if (s->time_base.den) + ctx->time_base_out = s->time_base; + s->frame_number= 0; s->start_pts = AV_NOPTS_VALUE; s->start_dts = AV_NOPTS_VALUE; s->var_values[VAR_NOPTS] = AV_NOPTS_VALUE; s->var_values[VAR_TB] = ctx->time_base_in.den ? av_q2d(ctx->time_base_in) : 0; + s->var_values[VAR_TB_OUT]= ctx->time_base_out.den ? av_q2d(ctx->time_base_out) : 0; s->var_values[VAR_SR] = ctx->par_in->sample_rate; return 0; @@ -251,6 +259,7 @@ static const AVOption options[] = { { "pts", "set expression for packet PTS", OFFSET(pts_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "dts", "set expression for packet DTS", OFFSET(dts_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "duration", "set expression for packet duration", OFFSET(duration_str), AV_OPT_TYPE_STRING, {.str="DURATION"}, 0, 0, FLAGS }, + { "time_base", "set output timebase", OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, 0, FLAGS }, { NULL }, };