From patchwork Fri Jun 16 22:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 42160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1831736pzb; Fri, 16 Jun 2023 14:15:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BRQ2a8OpH0d+KNfSVWa/efsmjadqme0h8o8njtihpfFuocUdAb402CrvMzzFfUIcUpVE6 X-Received: by 2002:a17:906:eecb:b0:958:4c75:705e with SMTP id wu11-20020a170906eecb00b009584c75705emr2777807ejb.17.1686950154862; Fri, 16 Jun 2023 14:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686950154; cv=none; d=google.com; s=arc-20160816; b=wQeQU/al3s/4j2WSj0u+ITnHSy4jK3kLiRpUz4d5RiCvdly9ltm54dvabXaKM7ZnJZ BzBWNJqURpOlQDr+iLhaxcYYA1SO+s5A6KbewOJEFrIy2mPqE+sW/iXJCl67EZ/Fk9mT 3ybLTdHx7wpsFteRei8SbrpKvg2IXy3wvDF+qn/LPf6Xj0/rJODzPj7Px907EOrSXqPd LAMhLi20g9/AdON7JoPgfPHyZW8mF7v/Tu+QIENqwHa8WyYbT6MB3h2nr7y478TuCWKC q3Z44wL10VAFHO+/Z5oQhPrYmgjJj74BZDBeV9mnuJsncy7F6OC9ykFNRuQU1COr346S FmeQ== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=mVlWGiAZIAhoCyt5uSFeBXBjQnEci/2qpi69DxRODnQ=; b=bpYxPNbQIW4/J1ymaZ5O9B60/hpchLsuieh3aU/npoxY8NNOL29gX+iR0nWE6uKkYp 5Usl4WGq8huaZuX65kJoFOtbhoN7H9HP34qEwiYcVi3Eym3G5GY+0h0ES7ExnuwMghkU NceacRLJjG0FS+twTpt2tKJWv7ZCIAnm0Pr3GzJAnqZYnQaA52G9lOsc7qE8TptcEIYR Dyu/zt9iTn/QByRZBgbwAO2/KU1rdDHG+13hJNEeE1tqOtKZqCp1PFtSiBRs7re4+p3Q U7HYVZvZqAxnWMK8VE5Xu294jLgY9U2jULSPxkcA+8ryS85tYDZ94PSNx4Hg7dhOaA4v qkGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20221208.gappssmtp.com header.s=20221208 header.b=P+U2sJXl; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d25-20020a170906345900b0096f8ed4f5cbsi11632588ejb.77.2023.06.16.14.15.48; Fri, 16 Jun 2023 14:15:54 -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=@ltnglobal-com.20221208.gappssmtp.com header.s=20221208 header.b=P+U2sJXl; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 160ED68BD32; Sat, 17 Jun 2023 00:15:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D70368BDA3 for ; Sat, 17 Jun 2023 00:15:03 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-62fff19e8fdso4729906d6.1 for ; Fri, 16 Jun 2023 14:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20221208.gappssmtp.com; s=20221208; t=1686950102; x=1689542102; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=Y8ncL2CxP4zGv82QWMhbLDwM4fPSjVx1QjahU35uC0A=; b=P+U2sJXloSIFI/bJ0RLWxFj85ZyAIAasJ3dHZpev5ZMqNjykafI9rF3GMHKFdAYrb6 T4ULKgd/pozGZolLoTXLTZpDPEf7wpSJFfDYJCZ7IvyNN1M7G6kVau7ZEakQ26lHJqVl R5cjpXhYjmeOOE7Tw381W/EMjzjtCnqLzUJxE3Jd2lvWzxmJIEA7dMhR0UXrFMAPqGDr YHgPDswtvRsNurkLZb7Yjqm7UmTtZcL2IAeokIwGxd0tinK24M2HkdlaZrZMVRCQKA4d HObwBqzdZoEscp+asTQfTx94fsprnAYp8PQvjn5ENGK56n/udGcSvYn19KIvNvUe548h npzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686950102; x=1689542102; 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=Y8ncL2CxP4zGv82QWMhbLDwM4fPSjVx1QjahU35uC0A=; b=VZMZVPS5mrQfFuG439Fp2diw1vblYYozu/NyK54lJHtz8Rm/oZqjzteQ4DypwKWDJy Fvbt+s7fxBdA4ZLyREyD6IwnUv4SgAtiSjMkLLnZ6bWq8rH2CoIskqQC4uGTLziOstH1 JDrxH04sr69FjuYHSm0cMQ3iizyeRkyqjtytpLS35DWqHI+b0nq8s3O5AaHiCf3t4qWG l3yOVAcLb5LZwv5mgDJdNSedOPx8LJ6t0RMqUpsHHprYCn3rPMHdueE2fOrg+ZhFHCYD XwuHnNjBFEOtpLadeOQlMHxoN9GWbk2qa7ormJtvCW+3kd39e6ytqkSI7jURSgSoyGdV etBA== X-Gm-Message-State: AC+VfDzexyFPnWSflYpAbDzE0G23R9vSKx1uWY5NqiO+rQkwTKmZOkcF nAY5z6TphEcIoPulxXvTDKFDOCg2iu1MsZ1T9CU= X-Received: by 2002:ad4:5caf:0:b0:621:54d:23e1 with SMTP id q15-20020ad45caf000000b00621054d23e1mr10347051qvh.14.1686950101784; Fri, 16 Jun 2023 14:15:01 -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 t8-20020a0cb388000000b0061a68b5a8c4sm7450812qve.134.2023.06.16.14.15.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2023 14:15:01 -0700 (PDT) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 18:12:57 -0400 Message-Id: <1686953578-18843-5-git-send-email-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686953578-18843-1-git-send-email-dheitmueller@ltnglobal.com> References: <1686953578-18843-1-git-send-email-dheitmueller@ltnglobal.com> Subject: [FFmpeg-devel] [PATCH 4/5] bsf: Add new bitstream filter to set 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cuveWvbCJH6N 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. Signed-off-by: Devin Heitmueller --- libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/scte35ptsadjust_bsf.c | 114 +++++++++++++++++++++++++++++++++++++++ libavformat/mpegtsenc.c | 2 + 4 files changed, 118 insertions(+) create mode 100644 libavcodec/scte35ptsadjust_bsf.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0ce8fe5..6944c82 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1250,6 +1250,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 7512fcc..d30dfbd 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..e6e9ec9 --- /dev/null +++ b/libavcodec/scte35ptsadjust_bsf.c @@ -0,0 +1,114 @@ +/* + * 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 "avcodec.h" +#include "bsf.h" +#include "bsf_internal.h" + +static int scte35ptsadjust_filter(AVBSFContext *ctx, AVPacket *out) +{ + AVPacket *in; + size_t size; + const int64_t *orig_pts; + int64_t cur_pts_adjust; + int ret = 0; + + ret = ff_bsf_get_packet(ctx, &in); + if (ret < 0) + return ret; + + /* Retrieve the original PTS, which will be used to calculate the pts_adjust */ + orig_pts = (int64_t *) av_packet_get_side_data(in, AV_PKT_DATA_ORIG_PTS, &size); + if (orig_pts == NULL) { + /* No original PTS specified, so just pass the packet through */ + av_packet_move_ref(out, in); + av_packet_free(&in); + return 0; + } + + av_log(ctx, AV_LOG_DEBUG, "%s pts=%" PRId64 " orig_pts=%" PRId64 "\n", __func__, + in->pts, *orig_pts); + + /* The pts_adjust field is logically buf[4]-buf[8] of the payload */ + if (in->size < 8) + goto fail; + + /* Extract the current pts_adjust value from the packet */ + cur_pts_adjust = ((int64_t) in->data[4] & (int64_t) 0x01 << 32) | + ((int64_t) in->data[5] << 24) | + ((int64_t) in->data[6] << 16) | + ((int64_t) in->data[7] << 8) | + ((int64_t) in->data[8] ); + + av_log(ctx, AV_LOG_DEBUG, "%s pts_adjust=%" PRId64 "\n", __func__, + cur_pts_adjust); + + /* Compute the new PTS adjust value */ + cur_pts_adjust -= *orig_pts; + cur_pts_adjust += in->pts; + cur_pts_adjust &= (int64_t) 0x1ffffffff; + + av_log(ctx, AV_LOG_DEBUG, "%s new pts_adjust=%" PRId64 "\n", __func__, + cur_pts_adjust); + + /* Clone the incoming packet since we need to modify it */ + ret = av_new_packet(out, in->size); + if (ret < 0) + goto fail; + ret = av_packet_copy_props(out, in); + if (ret < 0) + goto fail; + memcpy(out->data, in->data, in->size); + + /* Insert the updated pts_adjust value */ + out->data[4] &= 0xfe; /* Preserve top 7 unrelated bits */ + out->data[4] |= cur_pts_adjust >> 32; + out->data[5] = cur_pts_adjust >> 24; + out->data[6] = cur_pts_adjust >> 16; + out->data[7] = cur_pts_adjust >> 8; + out->data[8] = cur_pts_adjust; + +fail: + av_packet_free(&in); + + 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;