From patchwork Tue Feb 9 23:50:44 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: 25528 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 94146443E6E for ; Wed, 10 Feb 2021 01:51:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75A5F68A192; Wed, 10 Feb 2021 01:51:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAD046807B4 for ; Wed, 10 Feb 2021 01:50:53 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id lg21so631829ejb.3 for ; Tue, 09 Feb 2021 15:50:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=IkUNFHkAyDuG9HTbjQOWQpq3J9oRpHCogPqja/LG/aI=; b=Ad5k07pq0Xit8W56DAB5qY+gsZxyu0SEljy3n2MyyRJT4boNhboZVR3RpqGsx+x9jV 8ev8eycLRMxunm2a4FQZpPtuGGES+NtJ7IweW8iqHMe8tML3TduZgkTzMXg0tK3VqEhM +GtYxbCF0rh0HwL4J1Avb7bnTWw3/NiD7lOA51u1DA4pwwfVfRhU6Fogk789Xkh1l9JX Xh88j+9u9MO1dnZY0B+r4ndPjiNxAi6NKAcn5f5QTbEUonv4w5Ustcr0+pkq6GYAZEPr aLN+VkP50NY0NzJ4TPdMjj0x864O6iA+RHtec19rtt0gm45B1+lblhe3hp/0cN2qjknH jtmw== 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=IkUNFHkAyDuG9HTbjQOWQpq3J9oRpHCogPqja/LG/aI=; b=IcB9higFbhkiyfvQ/V5ARAEfMR5yw0U4A1WZ5PEUSyxLT2CIx5484Jamp3UqxkwcNn iw4LuMGc+X/pUPV0lV220fzkuQ+YKQP3BSshm6TXcwiGN5u5JtkSsS6gliPU6s/vPfO8 e4CzMIYT1aG5ImvcQp5SXwYVwCuy0N1HDgZ/Ee912hTj1K4tOI7jF+1sLGP0kCFXpwbr Ba4OfQ5LxLyDyT2fiJdn08eQk1Y9S7Pyg/OHWYAKWwarH/Sm82nj1I65Fe+0mUJftzKZ Pj1SpXJWHLIVXdX4wpiKodV9eijJ8sxS3A5443XVfo7RA5zCY2Vd5yr6WDFc7CTVZ14O QFLA== X-Gm-Message-State: AOAM532R+2H5Za+KDJfSfOp+7liUZgngZ5yA+EW2WmNSshskA8lc3r8e HfUiqZhT9eY/HuuaDZv4oWZ8Lm8UAcaykA== X-Google-Smtp-Source: ABdhPJxgYMKF2FmscEhsp5jEbC3Sxkl5G4EbR7t0PeUibDDAtFsZtkl51iz18ORssc1gg3CpgJFgCg== X-Received: by 2002:a17:906:8690:: with SMTP id g16mr171808ejx.113.1612914653166; Tue, 09 Feb 2021 15:50:53 -0800 (PST) Received: from localhost.localdomain ([212.15.167.195]) by smtp.gmail.com with ESMTPSA id r9sm123645eju.74.2021.02.09.15.50.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 15:50:52 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Feb 2021 00:50:44 +0100 Message-Id: <20210209235044.5556-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec: add setts bitstream filter 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" Signed-off-by: Paul B Mahol --- doc/bitstream_filters.texi | 54 ++++++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/setts_bsf.c | 218 +++++++++++++++++++++++++++++++++ 4 files changed, 274 insertions(+) create mode 100644 libavcodec/setts_bsf.c --- now with timebase variable diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8a2f55cc41..beecbd2172 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -675,6 +675,60 @@ Remove extradata from all frames. @end table @end table +@section setts +Set PTS and DTS in packets. + +It accepts the following parameters: +@table @option +@item ts +@item pts +@item dts +Set expressions for PTS, DTS or both. +@end table + +The expressions are evaluated through the eval API and can contain the following +constants: + +@table @option +@item N +The count of the input packet. Starting from 0. + +@item TS +The demux timestamp in input in case of @code{ts} or @code{dts} option or presentation +timestamp in case of @code{pts} option. + +@item POS +original position in the file of the packet, or undefined if undefined +for the current packet + +@item DTS +The demux timestamp in input. + +@item PTS +The presentation timestamp in input. + +@item STARTDTS +The DTS of the first packet. + +@item STARTPTS +The PTS of the first packet. + +@item PREV_INDTS +The previous input DTS. + +@item PREV_INPTS +The previous input PTS. + +@item PREV_OUTDTS +The previous output DTS. + +@item PREV_OUTPTS +The previous output PTS. + +@item TB +The timebase of stream packets belongs. +@end table + @anchor{text2movsub} @section text2movsub diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b6f5c5608f..dff446a10b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1164,6 +1164,7 @@ OBJS-$(CONFIG_OPUS_METADATA_BSF) += opus_metadata_bsf.o OBJS-$(CONFIG_PCM_RECHUNK_BSF) += pcm_rechunk_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o +OBJS-$(CONFIG_SETTS_BSF) += setts_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o OBJS-$(CONFIG_TRUEHD_CORE_BSF) += truehd_core_bsf.o mlp_parse.o mlp.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index b26d6a910e..02d33abb18 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -53,6 +53,7 @@ extern const AVBitStreamFilter ff_opus_metadata_bsf; extern const AVBitStreamFilter ff_pcm_rechunk_bsf; extern const AVBitStreamFilter ff_prores_metadata_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; +extern const AVBitStreamFilter ff_setts_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; extern const AVBitStreamFilter ff_trace_headers_bsf; extern const AVBitStreamFilter ff_truehd_core_bsf; diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c new file mode 100644 index 0000000000..d33cc4fd2a --- /dev/null +++ b/libavcodec/setts_bsf.c @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2021 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Change the PTS/DTS timestamps. + */ + +#include "libavutil/opt.h" +#include "libavutil/eval.h" + +#include "avcodec.h" +#include "bsf.h" +#include "bsf_internal.h" + +static const char *const var_names[] = { + "N", ///< frame number (starting at zero) + "TS", + "POS", ///< original position in the file of the frame + "PREV_INPTS", ///< previous input PTS + "PREV_INDTS", ///< previous input DTS + "PREV_OUTPTS", ///< previous output PTS + "PREV_OUTDTS", ///< previous output DTS + "PTS", ///< original PTS in the file of the frame + "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 + NULL +}; + +enum var_name { + VAR_N, + VAR_TS, + VAR_POS, + VAR_PREV_INPTS, + VAR_PREV_INDTS, + VAR_PREV_OUTPTS, + VAR_PREV_OUTDTS, + VAR_PTS, + VAR_DTS, + VAR_STARTPTS, + VAR_STARTDTS, + VAR_TB, + VAR_VARS_NB +}; + +typedef struct SetTSContext { + const AVClass *class; + + char *ts_str; + char *pts_str; + char *dts_str; + + int64_t frame_number; + + int64_t start_pts; + int64_t start_dts; + int64_t prev_inpts; + int64_t prev_indts; + int64_t prev_outpts; + int64_t prev_outdts; + + double var_values[VAR_VARS_NB]; + + AVExpr *ts_expr; + AVExpr *pts_expr; + AVExpr *dts_expr; +} SetTSContext; + +static int setts_init(AVBSFContext *ctx) +{ + SetTSContext *s = ctx->priv_data; + int ret; + + if ((ret = av_expr_parse(&s->ts_expr, s->ts_str, + var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error while parsing ts expression '%s'\n", s->ts_str); + return ret; + } + + if (s->pts_str) { + if ((ret = av_expr_parse(&s->pts_expr, s->pts_str, + var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error while parsing pts expression '%s'\n", s->pts_str); + return ret; + } + } + + if (s->dts_str) { + if ((ret = av_expr_parse(&s->dts_expr, s->dts_str, + var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error while parsing dts expression '%s'\n", s->dts_str); + return ret; + } + } + + s->frame_number= 0; + s->start_pts = AV_NOPTS_VALUE; + s->start_dts = AV_NOPTS_VALUE; + s->prev_inpts = AV_NOPTS_VALUE; + s->prev_indts = AV_NOPTS_VALUE; + s->prev_outpts = AV_NOPTS_VALUE; + s->prev_outdts = AV_NOPTS_VALUE; + + return 0; +} + +static int setts_filter(AVBSFContext *ctx, AVPacket *pkt) +{ + SetTSContext *s = ctx->priv_data; + int64_t new_ts, new_pts, new_dts; + int ret; + + ret = ff_bsf_get_packet_ref(ctx, pkt); + if (ret < 0) + return ret; + + if (s->start_pts == AV_NOPTS_VALUE) + s->start_pts = pkt->pts; + + if (s->start_dts == AV_NOPTS_VALUE) + s->start_dts = pkt->dts; + + s->var_values[VAR_N] = s->frame_number++; + s->var_values[VAR_TS] = pkt->dts; + s->var_values[VAR_POS] = pkt->pos; + s->var_values[VAR_PTS] = pkt->pts; + s->var_values[VAR_DTS] = pkt->dts; + s->var_values[VAR_PREV_INPTS] = s->prev_inpts; + s->var_values[VAR_PREV_INDTS] = s->prev_indts; + s->var_values[VAR_PREV_OUTPTS] = s->prev_outpts; + 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_TB] = av_q2d(ctx->time_base_out); + + new_ts = llrint(av_expr_eval(s->ts_expr, s->var_values, NULL)); + + if (s->pts_str) { + s->var_values[VAR_TS] = pkt->pts; + new_pts = llrint(av_expr_eval(s->pts_expr, s->var_values, NULL)); + } else { + new_pts = new_ts; + } + + if (s->dts_str) { + s->var_values[VAR_TS] = pkt->dts; + new_dts = llrint(av_expr_eval(s->dts_expr, s->var_values, NULL)); + } else { + new_dts = new_ts; + } + + s->var_values[VAR_PREV_INPTS] = pkt->pts; + s->var_values[VAR_PREV_INDTS] = pkt->dts; + s->var_values[VAR_PREV_OUTPTS] = new_pts; + s->var_values[VAR_PREV_OUTDTS] = new_dts; + + pkt->pts = new_pts; + pkt->dts = new_dts; + + return ret; +} + +static void setts_close(AVBSFContext *bsf) +{ + SetTSContext *s = bsf->priv_data; + + av_expr_free(s->ts_expr); + s->ts_expr = NULL; + av_expr_free(s->pts_expr); + s->pts_expr = NULL; + av_expr_free(s->dts_expr); + s->dts_expr = NULL; +} + +#define OFFSET(x) offsetof(SetTSContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_SUBTITLE_PARAM|AV_OPT_FLAG_BSF_PARAM) + +static const AVOption options[] = { + { "ts", NULL, OFFSET(ts_str), AV_OPT_TYPE_STRING, {.str="TS"}, 0, 0, FLAGS }, + { "pts", NULL, OFFSET(pts_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "dts", NULL, OFFSET(dts_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { NULL }, +}; + +static const AVClass setts_class = { + .class_name = "setts_bsf", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVBitStreamFilter ff_setts_bsf = { + .name = "setts", + .priv_data_size = sizeof(SetTSContext), + .priv_class = &setts_class, + .init = setts_init, + .close = setts_close, + .filter = setts_filter, +};