From patchwork Thu Mar 9 17:04:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40628 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp498494pzb; Thu, 9 Mar 2023 09:04:40 -0800 (PST) X-Google-Smtp-Source: AK7set+CEEXK+oAs3BjAJW8ZTR5PyInUw95ETm9D3oNlGVuVbx251gI3fl77vZTppia4w4v7DSgi X-Received: by 2002:a17:906:c9ce:b0:8e6:bcb6:4698 with SMTP id hk14-20020a170906c9ce00b008e6bcb64698mr25686192ejb.0.1678381480186; Thu, 09 Mar 2023 09:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678381480; cv=none; d=google.com; s=arc-20160816; b=B2H9ds/Jm7QfE7HwARLeFnAbspk4NKZOy16wUQjx/5nVVi4o+Ah3lkHRaeRD/N26pW g1Q1Z8ErdfVq539Nhxu/C7sXCRS2kUrtZ+uoyzkyx1hb0ZTeJWvA/R/AWlf5WpIZopma LLxPulUqfE9zaNj0PgWarxLkqtm+4QyNgzzPyjgRGEgajQEw/n3X/ATMDWtNBGd5YGZS U6q2aVviLlUxTzShctyJ2+IxO/F4OKBRkS0w4DaELBzZqWRYLJKf/P9PAzpbYUbUj8i/ JQaYPRrqQ+bBvD9jNBssY37sKHWujgSckw7vJ5Y9SEbvJGwgp0FRue4wbw7eDc6K1AAP QdrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=KQdwpEEbUt0pS2ZJSTzN9wvg21Pc2udjz7TRs8UptFc=; b=oHn8o4S9YuNUopW2lc2eg43wGkrphyvKFAg5Wwcz7+QXnoJ4k6++qeWeHcEnrwQRjd UeOScJkEeALufbpZ7gwQ5tgAyaIG9IPOWS4qphIHnZzZxHSlKE42k2kCgqGgqKJOWxkP D3rvTq1vC6AvNthSpUfuWKRT/vQ/nzUFpNbXuRgl1/6lo2hEeY+YOziyo8SvYilrh47D 1A0sloq5EV9zIFrxIkONx8nTSFyXH7smGF/fi+masQf0IqhNvACNb0XKa1yT7eNfws9c D3+xPewORGpMAL7ujbaZkY+TGmKzq4t4dFSBnN/KjCJO/61Lez5Y+SmTT7JHiucsOzID n6kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=NUJQQdru; 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 sa19-20020a1709076d1300b008e259a32abcsi1409242ejc.761.2023.03.09.09.04.32; Thu, 09 Mar 2023 09:04:40 -0800 (PST) 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.20210112.gappssmtp.com header.s=20210112 header.b=NUJQQdru; 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 36C1468BBB1; Thu, 9 Mar 2023 19:04:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E42F468BBB1 for ; Thu, 9 Mar 2023 19:04:12 +0200 (EET) Received: by mail-qv1-f41.google.com with SMTP id jo29so1889942qvb.0 for ; Thu, 09 Mar 2023 09:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1678381451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=89VvIQfFpqnlPpAtcxSWOGYeOmlwRmnn6ppiB4Qsb4k=; b=NUJQQdru27SoVDa+bH8RUHhvKjag4bL7sESR3O796F2PHNsoQxc11Ig4vIlnqjmaVr c0JARWw100iTMiCTmWepMEC1WRRqVcKiQne1Mr30ikC0SJ2te4/bBaiWLV2k1SCRviKo T9CTqSXBL8tvw3RhFXaRin+zDXmnDMQCnlqRx+sbiXmweTzEv9QAUIOnhyMIEmQjGTeG nlTLUveupzGjqc6gLr8REwFFKAEBEnFXIEzb7LHi2WxObzxMh/N8zCYSh9Tk/jHt6wC4 VXUgt5ICKIohrhGHHmAdFPop7UCOItqWmt0r+7f4qPWxXQOwOIfEphrG/MKI1GgNaCi0 tUiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678381451; h=content-transfer-encoding:mime-version: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=89VvIQfFpqnlPpAtcxSWOGYeOmlwRmnn6ppiB4Qsb4k=; b=giucU3mJRAAaXWtKVfP0964JY/CbQsRvZvjAiuLSJ5FulISov/RnwTCaYgEHPK9T4d w+vpJYCR7BmOvSrFhR6HLQkIbXaqgidzI36JLnKAc0OJTWMeyE/jLFZwP4tATIJjm62S BXSGCvhCZywF+dM31ByWBwMsn0TiD27sxsfgsP5DWnHi8/0bfcU/TFJwOZkC6kGJMmjv 185HiCvTghpZrWb2uYr/MsiZRyk9IQ0SYrXGISyx7hjZKcJr08BOOX0ERLUUB+AepzJf 8sXUCusb8/kvevTpR4EpvkvXsOQ7uHAYzNekwtlUDNt5pzp7OP3FDtcgTXUBw0juYAY2 BiXA== X-Gm-Message-State: AO0yUKXHePMdknYmcRuUtZCL2kL0tVyE4JICBJjC0QITBiBZtwJwTSJ2 HeHSBdsCPGeCHe2YIbu0qF57EqaAR84ir5jtSKk= X-Received: by 2002:a05:6214:2269:b0:56c:20c:f2f4 with SMTP id gs9-20020a056214226900b0056c020cf2f4mr44693803qvb.45.1678381451079; Thu, 09 Mar 2023 09:04:11 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id q23-20020a374317000000b007426e664cdcsm13558543qka.133.2023.03.09.09.04.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2023 09:04:10 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 12:04:05 -0500 Message-Id: <20230309170405.25457-2-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 In-Reply-To: <20230309170405.25457-1-dheitmueller@ltnglobal.com> References: <20230309170405.25457-1-dheitmueller@ltnglobal.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] Add support for preserving SMPTE 2038 when transcoding MPEG-TS streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Rrt7XZW2ifxV Add the appropriate descriptors to the MPEG-TS demux and mux to ensure that SMPTE 2038 VANC streams are properly preserved when using codec copy (including adding the appropriate PMT descriptors). The focus of this patch is TS input to TS output. A separate patch adds support for output of 2038 VANC over decklink SDI. Signed-off-by: Devin Heitmueller --- libavcodec/codec_desc.c | 6 ++++++ libavcodec/codec_id.h | 1 + libavformat/mpegts.c | 1 + libavformat/mpegtsenc.c | 5 +++++ libavformat/mux.c | 6 ++++-- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index e80ac07700..2830fd85fa 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3608,6 +3608,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "klv", .long_name = NULL_IF_CONFIG_SMALL("SMPTE 336M Key-Length-Value (KLV) metadata"), }, + { + .id = AV_CODEC_ID_SMPTE_2038, + .type = AVMEDIA_TYPE_DATA, + .name = "smpte_2038", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE ST 2038 VANC in MPEG-2 TS"), + }, { .id = AV_CODEC_ID_DVD_NAV, .type = AVMEDIA_TYPE_DATA, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 89a4a0cb89..d6d4b6c44c 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -579,6 +579,7 @@ enum AVCodecID { AV_CODEC_ID_IDF, AV_CODEC_ID_OTF, AV_CODEC_ID_SMPTE_KLV, + AV_CODEC_ID_SMPTE_2038, AV_CODEC_ID_DVD_NAV, AV_CODEC_ID_TIMED_ID3, AV_CODEC_ID_BIN_DATA, diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d97702fcd7..a8fa3c0b28 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -866,6 +866,7 @@ static const StreamType REGD_types[] = { { MKTAG('E', 'A', 'C', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, { MKTAG('H', 'E', 'V', 'C'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, { MKTAG('K', 'L', 'V', 'A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV }, + { MKTAG('V', 'A', 'N', 'C'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_2038 }, { MKTAG('I', 'D', '3', ' '), AVMEDIA_TYPE_DATA, AV_CODEC_ID_TIMED_ID3 }, { MKTAG('V', 'C', '-', '1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { MKTAG('O', 'p', 'u', 's'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_OPUS }, diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 3f201cce1d..0b38555362 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -422,6 +422,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_TIMED_ID3: stream_type = STREAM_TYPE_METADATA; break; + case AV_CODEC_ID_SMPTE_2038: + stream_type = STREAM_TYPE_PRIVATE_DATA; + break; case AV_CODEC_ID_DVB_SUBTITLE: case AV_CODEC_ID_DVB_TELETEXT: case AV_CODEC_ID_ARIB_CAPTION: @@ -804,6 +807,8 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) case AVMEDIA_TYPE_DATA: if (codec_id == AV_CODEC_ID_SMPTE_KLV) { put_registration_descriptor(&q, MKTAG('K', 'L', 'V', 'A')); + } else if (st->codecpar->codec_id == AV_CODEC_ID_SMPTE_2038) { + put_registration_descriptor(&q, MKTAG('V', 'A', 'N', 'C')); } else if (codec_id == AV_CODEC_ID_TIMED_ID3) { const char *tag = "ID3 "; *q++ = METADATA_DESCRIPTOR; diff --git a/libavformat/mux.c b/libavformat/mux.c index 04de05ec17..0bc9b6b87d 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -304,7 +304,8 @@ FF_ENABLE_DEPRECATION_WARNINGS par->codec_tag = av_codec_get_tag(of->p.codec_tag, par->codec_id); } - if (par->codec_type != AVMEDIA_TYPE_ATTACHMENT) + if (par->codec_type != AVMEDIA_TYPE_ATTACHMENT && + par->codec_id != AV_CODEC_ID_SMPTE_2038) si->nb_interleaved_streams++; } si->interleave_packet = of->interleave_packet; @@ -942,7 +943,8 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, ++stream_count; } else if (par->codec_type != AVMEDIA_TYPE_ATTACHMENT && par->codec_id != AV_CODEC_ID_VP8 && - par->codec_id != AV_CODEC_ID_VP9) { + par->codec_id != AV_CODEC_ID_VP9 && + par->codec_id != AV_CODEC_ID_SMPTE_2038) { ++noninterleaved_count; } }