From patchwork Sun Aug 22 12:40:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 29724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1241949iov; Sun, 22 Aug 2021 05:41:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx12v+EM1/5mVTwqWMEK/n4eIRPjanCiZ6pwwtfZNUeulx3FpOHjAllTUJ21euRYLqp1ZVe X-Received: by 2002:a17:906:f90c:: with SMTP id lc12mr30021314ejb.96.1629636064225; Sun, 22 Aug 2021 05:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629636064; cv=none; d=google.com; s=arc-20160816; b=xp6MWJSrQAkjd75EnVeKiQCRnbe6gBwn51UqFX+gynJSqxiq/1xZW620N5Wsas5ir3 TC8pcd3EojZRAcMLh8+iHc4IgdRBnv1FKNrQuCXPgkF1T3N1K3leckz+Kp2lXO2v0N3+ fJ2/OnWdqAhSMM6ipdmmQDURq1FEXHdMpNWrr1OqrmSUpa7mlcJKHKYWd2iM8OGsEUXv s/EgiEtAil3gWNiiYAjhqUyeTpobUDS+IO0AFlKj5NbTyQkdE8eTBTAtoZUYNiU5/qjv kcZn8T1gfJB3h18GMzHwzWZ/RXBVIITyOYSCjYbGy58aWZ30shdCnYxnzWO4ShVJpXw8 dDgg== 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:dkim-signature :delivered-to; bh=wIVbVhOB0L/A2vkvbD1JA52PKXRBfhKJ1iZKT4kGufU=; b=agsMY9sqxKfSodx3T6Y9BnymOp8IuHTtZQIOz9RVX6w3I+LiAWTyHs4AoDilUWY6m1 tPhSBdHPizwyZ2kJYlv4cg1Y5WOyAcrpjn7/at1yXuGj1+Tj98jpk3HDvdXzTEIGnoHx BkMX1T1Drzwmig3SUYJR/tPO97fwad96qmAFxPW2r0lx6F4kFVI2xEp7rheWN5bBWb/e l+egqdWjNB6FWG3pOPFDjEIxTXVteMSRwDEOqxFhwDgyovuOOWgpSbF08k3IfDUrNxGC wH0tZVWS/YrxvwpTzV7n/JgvlXV9TS6OIrQm6IYLjFWGSwhuzsIIPLI6e5oumStDx3LF FLpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="rOuz/r4U"; 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 r9si12251221edb.253.2021.08.22.05.41.03; Sun, 22 Aug 2021 05:41:04 -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="rOuz/r4U"; 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 29408689F3A; Sun, 22 Aug 2021 15:41:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02A16689963 for ; Sun, 22 Aug 2021 15:40:53 +0300 (EEST) Received: by mail-ed1-f51.google.com with SMTP id b7so21693089edu.3 for ; Sun, 22 Aug 2021 05:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fxpb1AfL/9/Xboi13K0W/el3ogJEmG0k4uJQn3WV/V0=; b=rOuz/r4Uln1RmmlMSei+BGZ+Tyj78qotPaTxgCG+kDVkzpfv3K8wGEYUKJbht36i+n nyNrpXll5smEag1lghIi8ktGvKh/2Fmj7Zf5kLUTkOVuMHiG9kjb0P8rqCS2LVDT+W6t Wc3x5PYSZdKj61xNhN6gJXbHgXLUs5BkRF0wI9myiax4n8ffUJyXq+t+ZDDx/7B9bnkh BlTeVRjCeqYOgZa1XU9atO9OFvRKr5RuMEc3qaeUFoJG7yGmN69PZWjurX949I/AxJM1 4MEo1/zQey1JEGPmCF2KsnC26NoPBsu0r3oIdnd/GnsPGemZeqEoQTyzlNYjjCE4Ssmc S1VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fxpb1AfL/9/Xboi13K0W/el3ogJEmG0k4uJQn3WV/V0=; b=rODrzCncb8FLq8SyHKZFsnFKZAbxIZ+xZalCKyqqSy7JtuYKcE+SmbkMiuyy5/eaES rN4Y795I4L/ovXPhyvHyOYOhmc4tPd3lA8kNbhdHcN6yTtajZI/tw4dh+kPP8Haujhjo qfoFxCUKCzQyJpXPtz8jqbdHcUtbfV32FRAZUkffPaWMHneOyjbxmjT/nrtY95xUwX6Q e6ofPXuBAFOcDZFRGtJB84OAPEWo+Tb3FHYpHCvPwOsIhgMVhQIvxt9AjfHnAIAYSb4S uMzBsingNyAAOvzVa5WdOC1SRBLxmGZxNIipaPlfp7ApiFc0gI5TimDX54aUqYIQ6L9Y yUAg== X-Gm-Message-State: AOAM532NMWj8nz/hoT5CiBeqULf4Y4K2wkB6u1G5kbM0WKWru6OjZL3O iTUO1eQZsYHWg8ep32i5X4eZg8qecDQ= X-Received: by 2002:a05:6402:22b0:: with SMTP id cx16mr32127082edb.185.1629636053333; Sun, 22 Aug 2021 05:40:53 -0700 (PDT) Received: from localhost.localdomain ([95.168.120.44]) by smtp.gmail.com with ESMTPSA id dg24sm7229255edb.6.2021.08.22.05.40.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Aug 2021 05:40:52 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 14:40:45 +0200 Message-Id: <20210822124045.16579-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/setts_bsf: allow to use input stream timebase too 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YEiB0LRrVTVQ Signed-off-by: Paul B Mahol --- doc/bitstream_filters.texi | 5 ++++- libavcodec/setts_bsf.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 1900eb4352..b5a0be8ca2 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -777,8 +777,11 @@ The previous output DTS. @item PREV_OUTPTS The previous output PTS. +@item ITB +The input timebase of stream packet belongs. + @item TB -The timebase of stream packet belongs. +The output timebase of stream packet belongs. @item SR The sample rate of stream packet belongs. diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index d604f91f71..965c999500 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -41,7 +41,8 @@ static const char *const var_names[] = { "DTS", ///< original DTS in the file of the frame "STARTPTS", ///< PTS at start of movie "STARTDTS", ///< DTS at start of movie - "TB", ///< timebase of the stream + "ITB", ///< input timebase of the stream + "TB", ///< output timebase of the stream "SR", ///< sample rate of the stream "NOPTS", ///< The AV_NOPTS_VALUE constant NULL @@ -59,6 +60,7 @@ enum var_name { VAR_DTS, VAR_STARTPTS, VAR_STARTDTS, + VAR_ITB, VAR_TB, VAR_SR, VAR_NOPTS, @@ -154,6 +156,7 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt) s->var_values[VAR_PREV_OUTDTS] = s->prev_outdts; s->var_values[VAR_STARTPTS] = s->start_pts; s->var_values[VAR_STARTDTS] = s->start_dts; + s->var_values[VAR_ITB] = ctx->time_base_in.den ? av_q2d(ctx->time_base_in) : 0; s->var_values[VAR_TB] = ctx->time_base_out.den ? av_q2d(ctx->time_base_out) : 0; s->var_values[VAR_SR] = ctx->par_in->sample_rate;