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 68D124640F for ; Fri, 16 Jun 2023 21:58:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEF1268C089; Sat, 17 Jun 2023 00:58:51 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2057.outbound.protection.outlook.com [40.92.58.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B40068BD67 for ; Sat, 17 Jun 2023 00:58:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z5eY9UpzcKRuCS0a241GVYZRFfdORJbQtYgHPbZgzaRGYDtAJHZwxnz9+LV/q6G0L6SeKVATjB/BdXSZBckPOkMGzOuC5vG8+DnoM1/ZYjx2btR+Bw/fOf+UPMNhAxz8KdJkTQ+8DoF+4L8Gl/lFZ6hTHL0vQumIAjARhe8etSlgrQ0BMhd9iAtA1G84sO88MbzfGXr92U/SCotJqJEcFJ/JwNh4nehT2XtLJu3WNGMrK/a2B5g9xnDfgsRxrF+aVR1WECeQvS/Ifa92VZ8yVKzmvWyZblL0iGmqbGZG0bIzsxLYAosd8G7NxoUlcyePjzyTfIyMLGWYb2MWD/mcBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SWbKvK8YsUrFGTFc/0LpXLA+8UqhUGEjwZuxHhZMyZg=; b=WbDpgLa1Do31KmSrLxZdvlLGVHHPJg7PguhU+dzOT8vhSw6/G2B1UkP3AQgQQyrQSsLiOwISfvzAEfVAvTubiWAK9fZFFZuVYMSWpU2z+V3978pmnA3S85pN3VUgafxCpbA5aotO62XbYHrgT/15Y/p9tDOp1GuLvRDRa5tIyo2kwzW/eq7sRzVbi6dyXpfUrFu3roLoMfXe+f4ZMVDpvvfIAIhofVzvYRf+vBPlUBA3mzs5+l71DVLB9o9Q5XdA5jL5X0W6hC8Py9ZXBBmsKyg1APCnRNXmCd5OJWm1dpjFEiBQybGb+w64eDnStRqYbS4ntzKUvOgtFF7HovQ1Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SWbKvK8YsUrFGTFc/0LpXLA+8UqhUGEjwZuxHhZMyZg=; b=quBiqX7QJ07jIQC1DauHZmirnHD+lrvEMTVrbQaaoIe9y2sx8wPmBahDnBLq388b46sTEPmNCd2AsJA1TJbVcazyz84pxcyipDL/3QY7MN12FzkLLoq+ISQWwYn+6hxawVEpPXk4+j0e1uIDPy4YV6ZE57JwowFUorC2Zk1xITZbiyyXPhbnTjtPxBrod/aCUDVMFWmCvWZcBu23E7W703uUQIS34CCZScHFX+kXAPCSSELP/2Wc2X2LxE3kbIOZSTMEE6Qivbf5DhfJtYaqU/2G3ZyPGmPio576F9AuY4YGuebB9XXF+Nu6Wz+w6C7rEK+XZQTwnDOQGbtTHOB0hg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Fri, 16 Jun 2023 21:58:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::a38:e93f:c7e0:f473]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::a38:e93f:c7e0:f473%7]) with mapi id 15.20.6477.037; Fri, 16 Jun 2023 21:58:43 +0000 Message-ID: Date: Fri, 16 Jun 2023 23:59:32 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <1686953578-18843-1-git-send-email-dheitmueller@ltnglobal.com> <1686953578-18843-5-git-send-email-dheitmueller@ltnglobal.com> From: Andreas Rheinhardt In-Reply-To: <1686953578-18843-5-git-send-email-dheitmueller@ltnglobal.com> X-TMN: [ZXcpDtnia5QqRMqn6A0dR8EYKC9d0EP1] X-ClientProxiedBy: AM0PR10CA0037.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 66206d20-fa74-4bf9-3e03-08db6eb4d9d3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K9N3Sjo2mMMkrfr+9bexz6EVZ7eNjQyXPS/LrMfpeaIsbx1rlzV5qzDD6pVAId8trRDxlS9q0mKeUmNGLj0IVCryjdDNS2KHk0IWmhn6m54wAVUAUylgKOeKyBDaOiTMPMof4/Glryw7XxaIMxTk9rykMYaoUPdFU6tU21Wq5j7tpMpM62kvSaXyHD+I5fO9RKMqqILw5xTMtnFjfCptIYxibq05buYmz7jlrHnuo9Fu8xJvMJvVI0BfJ+SO9F3pImy6QhdX4x3FpbcmRLSFrJQ7P8ZawUOtDXphqGKrNoGIVR1VXBRyjAEBgvyU+0P92wilVHU/XRrHSMqW51LNeHYArPHLWSFfKmEQ9nD7slMKjhIyJe+x6xxsJhVy1NeCBKFD0ePbsL8PFjbPEz+MAEqLLcP992/lOCZCBxfmqBX1qH5MiY8XajpqrvEYn4EPWO2unlnKu4gksWYdU8k4T/Kn652He4AAIy8lHmnZSX0pqqjf/Q1cYftSEwCEW3htcQ/2ddCH8ilL5i9udiWSWTM6EA7h+k6q5cyzPWuqB5eUm91RkJM1hwm34YQQSZwSw9swhnRjbIMHIhoemJyU47g7+cg2jYpUt2IStNuuZMqZBE1BjfG+k+i2TYwkkvVS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QngxU2VkZExvdnNZaGl0a2xNVHpucENJM2hXcTl0UlhmdEV5bzVNMnNPbUMr?= =?utf-8?B?cnRwVmFjMlUxTjZwejJGU2RubDRyNXBKdHdJNHdJMy85RVljMGdrOTI0Tkdj?= =?utf-8?B?QTJyQUxscHFKQ2swV3RqNkF2MGlrT01WZ3ZsNDdmc3JFMUV6MHo1aWJIU2I3?= =?utf-8?B?ZEdiNFpydFIwbjZCbVU4NnFiaGtUTUNPNkNFanBxb3M0ay9DYng3d1ZlVlBt?= =?utf-8?B?eEZLYnBTNVMxcFZJL0VyRzhaOHYrV2pXYVJRdENUQUpNRVBuNzFEb1NzMGln?= =?utf-8?B?WTNMaCt1YWFCY2F6U010NElVU1RMbllyb0pybnZ3TFhScTNiMEE1Ynp6ZFZ4?= =?utf-8?B?ZGVpb2t3T0YrU2pWL2hCdnBIcTVNakJ4Z2VUeGpiZ2tPZGMyTjI1dlZyUWds?= =?utf-8?B?eTJ1U3pibVVENjlmRDF6dmFsZ0JDY3NPNGFFaERBQVk0RzVGVVQwT05Xb01O?= =?utf-8?B?UklkMlphUElsR3JNazVBSlpRT29BY2RhNGtndlJDZ3ZZU2hWVUIxVHRIV1Vu?= =?utf-8?B?dlRwcEFNaWxYem95WXQ4b0orcnRtS3l1TXA5S2NqSDBicVc3VzZ0dittM0dM?= =?utf-8?B?bXI3akEzc3Q5SUUxdkpTc25rTWVHUkowclVTc016aG1IdDZZMmdRN3o0aXNG?= =?utf-8?B?NEI5TkhqTjkxMTJYUDFQbTRGdHRLeUZmWFhzVEtPVk1uUm53V25BS2MwZ0Vz?= =?utf-8?B?YmtUL2MzMGJsZW1SMmhOdGhmbEpZR0hvcjJQTG9tU0ptc25QSFJUTXViSFo5?= =?utf-8?B?aS9saktVRGhHUWU4SzliclVwVXk4UVloM25nMk5iZUErRkFISE1tSWRTcUd1?= =?utf-8?B?UmdvWDhWK2tsd3N6bkFlLzViODA1am1qUWIwSmtHWCsrcDlQNTB1Zk9FckZ3?= =?utf-8?B?SjF6b2x1bVRnVDdiaFBaOUs3YUd3THlwVGY0aFRtT3lWbGVqc2JQYXR4QnVX?= =?utf-8?B?WGpXUFVnL2RnamJldzk5c3lZS0RqbWVodkQ5eWtkdktJYVNZdVIyeTBMK29S?= =?utf-8?B?dGFrM00wTkpmYnAyUmlYRmJwNmVjMFZzc3BMK2xKcS9Td3k1Q1R0RkkxUnhH?= =?utf-8?B?c2ZNNThTeHlHK0VyQWcvWVpGMFp3VWdGakZhTzgxVmpIQlByZUlEd2p1ZHNU?= =?utf-8?B?R1NHTjcvRlRXd21XTWpEbHNtS0ZBcGwwdlptMkpjUFd3YWVzTUJCYWpOdjNU?= =?utf-8?B?aFd2N2Z3Z2tSbElVZ1p5STQ2TDdPNVN0dGYrWER4WjQ2N0FidXlYTGF2TDg3?= =?utf-8?B?U28xMWZKZmlZQzdkMXF4OVhPcmJ5TUlxS2ROb0U2Q2QvYzFsc243b0w0MURR?= =?utf-8?B?anM0VElBa29YNGl5US93N2FDSGt2Y3NQN3hneEx0Mlk5Y2l2eU5yRHFzOFAx?= =?utf-8?B?UmJSeW9aN2VPWDZIVFB2RzRtWDk3cFhFZHJ2THBkbTViNkpGMDlZbmdUdWJV?= =?utf-8?B?cHI4elJkZG9LUm1kb3pzQXU4Vk5xUVdRNFpNN3M4R0hPQ3FyaEZ1OURhUW5r?= =?utf-8?B?dm9veEFuSDNKZjEwR2oyV21PV0lXSkpiZ2J5ay9iOExrQ1ZYQ0pKNFVDYlhZ?= =?utf-8?B?aFRQKzdQaWF4M0pwS1dFTDA5eWJtN0NnZ21WdHVoeVFwUkVNS3dCVHBkN1pi?= =?utf-8?B?RGU4cXJjYXNSZ2hqMHBldkF0NklhYlZmZEliNXc1TVpuKzlYRlh5RVA0cXl5?= =?utf-8?Q?WcVEE2FYtbTkjHawR59Z?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66206d20-fa74-4bf9-3e03-08db6eb4d9d3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 21:58:43.3600 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0137 Subject: Re: [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 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: 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 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" What is that for? The BSF API is separate from the AVCodecContext stuff. > +#include "bsf.h" > +#include "bsf_internal.h" > + > +static int scte35ptsadjust_filter(AVBSFContext *ctx, AVPacket *out) > +{ > + AVPacket *in; > + size_t size; av_packet_get_side_data() can work with NULL for the size pointer. > + 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) You are reading data[8], so size should be at least 9. > + goto fail; This will return 0 instead of indicating an error. (But this is irrelevant, see below.) > + > + /* 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); We typically don't add __func__, because the actual information where the log comes from is contained in the logcontext. Furthermore, you could combine these two av_log(). > + > + /* 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); Just use av_packet_make_writable() instead of this; use it in conjunction with ff_bsf_get_packet_ref(), avoiding the second packet. It also avoids allocations and copies in case the packet's data is already writable and avoids copying side-data etc. > + > + /* 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; The last four could be simplified to AV_WB32(out_data[5], (uint32_t)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; _______________________________________________ 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".