From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1BEF846989 for ; Mon, 31 Jul 2023 13:38:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E37BA68C3FC; Mon, 31 Jul 2023 16:38:24 +0300 (EEST) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68CBC68C19C for ; Mon, 31 Jul 2023 16:38:16 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-76595a7b111so310466785a.2 for ; Mon, 31 Jul 2023 06:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1690810694; x=1691415494; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=vYf4ig1MTZLtcEEhJLyoI2e39wcVu8GMKZrvgIkSuDA=; b=W9dEzoad5rYBAP/Pm1zF/BzQM0oHtuc/jO7ZdFBB/q/gX888lYS9ZAVf/X8ESYu6Nb 1HiIbonSIqtpbeY3KPJcLkx0P0t3cKaz8vNtk7cwayUTSDG5cUou5XbtY6cEf4nSMLdk RT5o/YAl93DcqIq4DwoEPPF5W2yeQJEQ53RIkit0dErfngKHIAGnZuHSuzcj0172aCNO 6ZJKdTUtiwYkSK3D0uG41HR0zzAvPFl6V8zOYOhWJD2Jl03ZWMMYZ6zLxQJsoFd6jA1c XNhOIA5fqwLqoaNFWLDivUGokGpCy3IrM/C79deeiAUCGpod8VteSIcErYxUJBgGwCHv sHjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690810694; x=1691415494; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vYf4ig1MTZLtcEEhJLyoI2e39wcVu8GMKZrvgIkSuDA=; b=L1Q85U8EYB8hkN4ggeLf6wAEULPqxwu/LCgW2ak4bhuFrgzWouaQA4SCX3/lSQGIdp wqLOsQvKcfg7pUMsT3EGd4OAFjlAX/hpW8FLDr47Uc6J784yyuOIF4w7RBGT9YB2e/VT AMB1A5ZzLaqhuNgRMVxoTDmPIzsGYMZfpTlECcJf5rvFrA7mQy4NmxkMF1ZNztXjBsPG kSubAs5Qz4V1EqTPb3QLdLJyDfsk/EVHd7vBZK97hphEAAOumZwFGXVELH00uOgnKUOM VEIuFD1bCaDKcMj/GP9OW0OR1TByndt8c5SP23qSnagjAJ8MhYsocXXaDrejvUMNp4BC pWaA== X-Gm-Message-State: ABy/qLYibsXb6UYSIobhrkm2wXQlroI3mOIw7n7FSh1lQ4fs5lFqbfZP 7KqjFoD9OxKOG0AGrV211e8df+65Nn64U9kXKaY= X-Google-Smtp-Source: APBJJlEqvpqWR0fN/S7aswKFOzNxkZVxQyvWfByurjdT+N76l8UqOBrG+bRxVzNV/1uelZmWKx5x2A== X-Received: by 2002:a05:620a:4727:b0:75e:bf51:29a6 with SMTP id bs39-20020a05620a472700b0075ebf5129a6mr11218881qkb.65.1690810694594; Mon, 31 Jul 2023 06:38:14 -0700 (PDT) Received: from ltnt-nyc-580testdevin.livetimenet.com (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id o9-20020a05620a110900b0076c84240467sm2504235qkk.52.2023.07.31.06.38.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2023 06:38:13 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 09:38:06 -0400 Message-Id: <1690810686-4723-5-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1690810686-4723-1-git-send-email-dheitmueller@ltnglobal.com> References: <1690810686-4723-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH v4 4/4] bsf: Add new bitstream filter to set SCTE-35 pts_adjustment when reclocking 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 Cc: Devin Heitmueller MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Because SCTE-35 messages are represented in TS streams as sections rather than PES packets, we cannot rely on ffmpeg's standard mechanisms to adjust PTS values if reclocking the stream. This filter will leverage the SCTE-35 pts_adjust field to compensate for any change in the PTS values in the stream. See SCTE-35 2019 Sec 9.6 for information about the use of the pts_adjust field. This filter also tweaks the mpegtsenc mux to automatically add it so the user doesn't have to include it manually. Thanks to Andreas Rheinhardt and James Almer for providing feedback/suggestions on improving the patch. Signed-off-by: Devin Heitmueller --- doc/bitstream_filters.texi | 9 ++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/scte35ptsadjust_bsf.c | 100 +++++++++++++++++++++++++++++++++++++++ libavformat/mpegtsenc.c | 2 + 5 files changed, 113 insertions(+) create mode 100644 libavcodec/scte35ptsadjust_bsf.c diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index c63c203..068b0c9 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -797,6 +797,15 @@ Remove extradata from all frames. @end table @end table +@section scte35ptsadjust +This bitstream filter makes use of side data injected by the MPEG-TS demux +in order to rewrite the PTS adjust field within SCTE-35 packets. This +ensures the pts_adjust field contains a valid value if the caller changes +the timebase of the stream. + +The bitstream filter is added automatically by the mpegtsenc mux, and no +action is required on the part of the user. + @section setts Set PTS and DTS in packets. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3c16b51..efe0ae9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1253,6 +1253,7 @@ OBJS-$(CONFIG_PCM_RECHUNK_BSF) += pcm_rechunk_bsf.o OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF) += pgs_frame_merge_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o av1_parse.o +OBJS-$(CONFIG_SCTE35PTSADJUST_BSF) += scte35ptsadjust_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 diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 1e9a676..60ed164 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -57,6 +57,7 @@ extern const FFBitStreamFilter ff_pcm_rechunk_bsf; extern const FFBitStreamFilter ff_pgs_frame_merge_bsf; extern const FFBitStreamFilter ff_prores_metadata_bsf; extern const FFBitStreamFilter ff_remove_extradata_bsf; +extern const FFBitStreamFilter ff_scte35ptsadjust_bsf; extern const FFBitStreamFilter ff_setts_bsf; extern const FFBitStreamFilter ff_text2movsub_bsf; extern const FFBitStreamFilter ff_trace_headers_bsf; diff --git a/libavcodec/scte35ptsadjust_bsf.c b/libavcodec/scte35ptsadjust_bsf.c new file mode 100644 index 0000000..b8bf48d --- /dev/null +++ b/libavcodec/scte35ptsadjust_bsf.c @@ -0,0 +1,100 @@ +/* + * SCTE-35 PTS fixup bitstream filter + * Copyright (c) 2023 LTN Global Communications, Inc. + * + * Author: Devin Heitmueller + * + * Because SCTE-35 messages are represented in TS streams as sections + * rather than PES packets, we cannot rely on ffmpeg's standard + * mechanisms to adjust PTS values if reclocking the stream. + * This filter will leverage the SCTE-35 pts_adjust field to + * compensate for any change in the PTS values in the stream. + * + * See SCTE-35 2019 Sec 9.6 for information about the use of + * the pts_adjust field. + * + * 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 + */ + +#include "bsf.h" +#include "bsf_internal.h" +#include "defs.h" +#include "libavutil/intreadwrite.h" + +static int scte35ptsadjust_filter(AVBSFContext *ctx, AVPacket *pkt) +{ + const AVTransportTimestamp *transport_ts; + int64_t cur_pts_adjust; + int ret = 0; + + ret = ff_bsf_get_packet_ref(ctx, pkt); + if (ret < 0) + return ret; + + /* Retrieve the original PTS, which will be used to calculate the pts_adjust */ + transport_ts = (AVTransportTimestamp *) av_packet_get_side_data(pkt, AV_PKT_DATA_TRANSPORT_TIMESTAMP, NULL); + if (transport_ts == NULL) { + /* No original PTS specified, so just pass the packet through */ + return 0; + } + + /* The pts_adjust field is logically buf[4]-buf[8] of the payload */ + if (pkt->size < 9) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + + /* Extract the current pts_adjust value from the packet */ + cur_pts_adjust = ((int64_t)(pkt->data[4] & 1) << 32 ) | + AV_RB32(pkt->data + 5); + + av_log(ctx, AV_LOG_DEBUG, "pts=%" PRId64 "(%d/%d) orig_pts=%" PRId64 "(%d/%d) pts_adjust=%" PRId64 "\n", + pkt->pts, pkt->time_base.num, pkt->time_base.den, + transport_ts->pts, transport_ts->time_base.num, transport_ts->time_base.den, cur_pts_adjust); + + /* Compute the new PTS adjust value */ + cur_pts_adjust -= av_rescale_q(transport_ts->pts, transport_ts->time_base, (AVRational){1, 90000}); + cur_pts_adjust += av_rescale_q(pkt->pts, pkt->time_base, (AVRational){1, 90000}); + cur_pts_adjust &= 0x1FFFFFFFFLL; + + av_log(ctx, AV_LOG_DEBUG, "new pts_adjust=%" PRId64 "\n", cur_pts_adjust); + + ret = av_packet_make_writable(pkt); + if (ret < 0) + goto fail; + + /* Insert the updated pts_adjust value */ + pkt->data[4] &= 0xfe; /* Preserve top 7 unrelated bits */ + pkt->data[4] |= cur_pts_adjust >> 32; + AV_WB32(pkt->data + 5, cur_pts_adjust); + +fail: + if (ret < 0) + av_packet_unref(pkt); + + return ret; +} + +static const enum AVCodecID codec_ids[] = { + AV_CODEC_ID_SCTE_35, AV_CODEC_ID_NONE, +}; + +const FFBitStreamFilter ff_scte35ptsadjust_bsf = { + .p.name = "scte35ptsadjust", + .p.codec_ids = codec_ids, + .filter = scte35ptsadjust_filter, +}; diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index c6cd1fd..48d7833 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -2337,6 +2337,8 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st, (st->codecpar->extradata_size > 0 && st->codecpar->extradata[0] == 1))) ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); + } else if (st->codecpar->codec_id == AV_CODEC_ID_SCTE_35) { + ret = ff_stream_add_bitstream_filter(st, "scte35ptsadjust", NULL); } return ret; -- 1.8.3.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".