From patchwork Sat Jan 27 04:15:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 45857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp370702pzb; Fri, 26 Jan 2024 20:16:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHwONm55+7QOfxC3+HnctlMUh6lmMhSF4Przbq6g92TivuX0erbHgS3rMxi9bq3Z3kFRjgO X-Received: by 2002:a5d:5264:0:b0:337:c835:293e with SMTP id l4-20020a5d5264000000b00337c835293emr509661wrc.86.1706328986417; Fri, 26 Jan 2024 20:16:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ig8-20020a056402458800b0055d39743c19si1043650edb.349.2024.01.26.20.16.26; Fri, 26 Jan 2024 20:16:26 -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=@outlook.com header.s=selector1 header.b=oZV5AIEB; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1644D68D189; Sat, 27 Jan 2024 06:15:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2042.outbound.protection.outlook.com [40.92.52.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9202268D16F for ; Sat, 27 Jan 2024 06:15:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yloh6yPfyZLx6S2JfvMyDv55+xDW1LRg5K/UOUfC2ZCq/DobhCwIUaSrkqJosd81RxLBfxxicvkFpPJ2JneUn1v3WsLym//8OM3XNaMPqkEQwwRolH13mNGP8Gn0nrsuVOQI4cUh6qCLTkDi0JgMwVWvRaeT9L1/9XHvbzQsOLD7FS/ntWRQt+2zGhdbwHTH3oKlQdg653cXtQTc8h2wqIP7cc+4/2c22GwwU9XxMN/CtEMvOhDHszHoCNFRu5k8FJzSSj5D4ol3aBApcXlLVbnETLw5/lctZ1JXcMWjH7tVQx8SZcuGpd8Q5JLW4ZOhf5cGkSllO08/9ywTZoKxIw== 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=FAOYdbndz+fQgCJ3TBpwBST2WDMvFiHoa1hxQySB8Gw=; b=VBtEV9c/GpUFkiHyhk46nMsCy5P9GRMl33Q8feepBItxrt3BWiQCT9R3ipYhr3Evllk4PCDIhZT9wtFVNXYNaleMB6Jh+MnxX1GLx6ckzYfpzLfH42OiKVG/1V4ZOHKmss+K5R0WEG0JRX6ln2UKT9H2ahgfCgpg0VK7sMR2E2Q7+4Az6Z25Zfbz58PMM1Z4rvg1xjt8P68N6kPsEb6R7HxkIac2LJ0QUO2FGcUY1+/eAjVUT4/tnmMiwRiK4CsphKuOdaPUz0BCz1mv3Gtz3LFbpGyfC5YqHfAtIZ6jNagQKeIEYtNJl3mn25t8O+A9xB4GYxLfSociFX/mn9S6xw== 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=FAOYdbndz+fQgCJ3TBpwBST2WDMvFiHoa1hxQySB8Gw=; b=oZV5AIEB45JO/48+kJA9bA1KkQ6ntKkDT2W0fj1MDNGOoFyfyO81jQj7LCTWEwvTZAV30CyA3ECB85nUB6IzGTscFS8kuvsX43Yojrov2xgsae5IepqABgpSawuLWoMlPJ+dN+1o4LGkgdrDsnjNToKJWvVAxKOSRo0FwHoMmr5vsljyPKWAoXgY/6KNB9g8gMkZfV2Gx4VbVgYOJbrSbvEvqk8tRu0uXVue8QsCBxFB5tMDJUsa9gbANBzyfgi7u+BMoUrVE/8OSBjaKmWSOh5zwiJ+V5Mhqb7jisLlpvntd61yTIrQ+T5U/w+ANe9btKi/Hc4Gho+OrhDB/8qT7A== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by PUZPR06MB6068.apcprd06.prod.outlook.com (2603:1096:301:112::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.28; Sat, 27 Jan 2024 04:15:20 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7%7]) with mapi id 15.20.7228.028; Sat, 27 Jan 2024 04:15:20 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Jan 2024 12:15:12 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240127041512.14079-1-nuomi2021@gmail.com> References: <20240127041512.14079-1-nuomi2021@gmail.com> X-TMN: [rDFENG+LtwsMsRa2hOw7mv4vtVqsjhCg] X-ClientProxiedBy: TYCP286CA0165.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::11) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240127041512.14079-7-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|PUZPR06MB6068:EE_ X-MS-Office365-Filtering-Correlation-Id: 76cf73a5-1ec1-404c-d9ad-08dc1eee9351 X-MS-Exchange-SLBlob-MailProps: WaIXnCbdHrNzfcV9bBs2YPdpUSHmB+XBx7nhcopr+QtyPvRoOmUTwd1m5feNAbey0nzci0iQmC2q3ups6wcjLXZI77NTZ8AZxQNFxmdpo1DHp1hP65hP0q2eB4h38kKyhTeKWHhJh2TxFDS9QaiIVNweOErWNcQnvXqbxFZZCsaTrAG+r4XMnsQr3+vkXtrQ9IEwKg+/GWpEvNTXeDhXsaIX0GhNRFmtLKhJUdGgSdwbk2oPtImDq+WE0EA4N5gqfnX8T7r72y8f6CKBJkqcyUqcg4Vx5ZwXwDbkTo558zFJHIlAhJAX8fsF4OrKVL61wUGBm3lRQEOJaJppys+/AXMNBLydTU0Y2vSLAaP21ol2xraRT32IjOZ/KJVEyGdPsFZBOvafniFJ5Ql2Cvw+2vymEpRU+Hn+E4xV4UGDxZqbW8GFaKXfIw4bCAYhF7aYFzQf/Cm73bxJgVCEdLuGp32FVvgQ5WOsbFSODVOyUxGoGT5W9x8muprupbra+QOk+Ep5Dm8BNbY3XiNKV48Iebj1Xur9Wq+F/NfXxbE7XZu0oa+xXm6tRW7DBBOTZTkCrLblIqngPqZ9c4B0IoHPMOIQ5xrG7ped9qZ5CID8EHTrXinRmaIho+iCPxx/oOYWj68JXZQaDeJuHloWkHwT68TRuhfmqFD6yKQutMp/0a4zlVllc5f6yLchYC7gME0YwEsjp3gfz9EPncZY7uab03ODIRhpNSj1Zm2VwRiQIY+xWixhbca7mzKp5eP7ORZzZvw68yy/ECo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qdHq0lRQVegaG7q1CXgVtRNMtXw/lk1EiqTcEiLS453H6F2REmn8bHH4hAqlqWTUqCVMLEAGdzA9wuvkYke+MCOGzO72icM5ArVth/kxxBRhbGbJ2i4Qme/ZVvmLO1H7JLBA3IYxFfVucpNEEaW4Z1bL/f6gBIhcso1/aXLpxU5/mM+v0ElFzl2EL8QdVk6lNntCxecIuxEe0QqY/mtgqfOyM0VsqxdfH3UH5YE+7rsdUQ1xcHGr3GfKBMuT2afW+fDpWeIAiwDMiyXGeIZcPWy5ACydt7boFThre3l0ilDIv5JLbKkENr6wMtIwDMEw/OCjf3ySuKWZIrLgREIB+DnvBBTreRn+bqS7uhDcYlLbdXNzF3R0AIlPxIKWozmOpOsNKzIQvpR2yjmC9mC0+d2rd/VScOhN8fCvxTMJ1V+BW/o1h9wwdb0zSk9hZxUpHDGq9k7jlGfT8T+nvq6NvKl443/TE30S2ZaZ8zDevNinAI8BbSwyLM1yEdwr93m6sVBrqaBU0KN7gOgjD1auJYIPLdIKakQ3RSZql0wYlFVrISDJEoWWkJPA02wSjCtFzWPe7eepuAzcsOoYtuBELUijMV+A/Xu67YTcqhBvbnOJBLDplynuYMbsWMbljMnF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CYpEBTSVgwcfCLn99EtlYHCQws8EAMcegVUUS7U99/r+7h0M0Ryi6iPXR45kHrS97KqwFHfgcSuOH29h7tcWTYvVzT7LqWc1BYF9b598RwWxU0ADH9Vbw7rl4aBfFMhKA/tDJ1vMgms/i/h2rgaj+Le615roXnY2Xt3M2uM5BSAdwX23O2pi2lLbPUOgdS/g0Hx1L1EJ6foHCOwllknhDVvaK0fbWdC1MMifhBcpeBwGZhNyuKTcYGd9x87EwLmgr/IJkZs1f8ybqd7T48A0wI3lld0boxMxJoKhZhz4RlzNpT0KxGhHm+6Qv8fs0Y6Al/mSpDx3UVtoijo/XaC29wuouMQydsQk63kveS9WPHK/glC51fXcqQl5WOT4EVzp2M6tdgY0NmbgpCSO3U6V+M15HRJHWqa24Gjzb1llwUAg0xBNs9Npr9YK5SVBNhvbkZ3MvEXSakD34GA5WlVidEMYSBohUKUhuqh5xJYdyZ9wtP8+M22yzZ3XoxVXP7UVV2mWRfCpFw5ixq8JuOo6f71Sh2m+NKpgIAS6GyZEOcFtrh/3DGBwxt+3EqOJbuFw1QWv3TqVGkWl+zSIRUkw5cAnEcG3nC991mt0shKug/+W3vVRWKJGW29gCoM+J9Q8vE7meRgOmHH0r1i9/GQDoJ3vjVu1YvUEJQz5XEavYUuwPDF2Rs2mazYovOW/qFzel2TwbYaMbfkNdm8lvVVMUsmb2C66cEZVtr3LMMT1en95FxrPv763ObPIYAGe7FeIfmkB6JbnX8ybdqkmia9o+bpANBmmRO9neghrmGYcjIT8oWMl9C+bONZhAY7zHwGfRPSeIzZgry8Go45jF2wDesJJbZK/+JiM0hW9x9y/KnlS3OEio82SUE92zYXsbhOQ1T+iaYuyPqwzW/KjIzWvFtVV05SvTkYpZ/9AuoNapoHkNUyyHSYZvDmlP6ev1HhBUm2EaLyjqPCc2SwPQoLnfUiTvDVpTNFJPAeaKWK3gDknUQUeQfz8shc2Ga7NNRUvOGLdkw34zLapi8VXNwcJkVmK7ElAJRX03mqML8nOF0WaHhPg+nV8Lg6KHa1FSnWPh5REhip+4k0STqC5wocAXyhrsKmya8kh6CKyGTzsapzKB+Ls72b/00IV5IzSajxe6/ej1e4WherpSBJtLktoc+ZFs1/f0e0J/xI6kQfxSh+LpYnoVZYxna53B2rbfgrKX9XuaSeLqmJR7JRU5qitg6zwBiQ47PAPsqqhYTLHEuoST4IvOGeu1bmrQDcI1axL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76cf73a5-1ec1-404c-d9ad-08dc1eee9351 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2024 04:15:20.4138 (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: PUZPR06MB6068 Subject: [FFmpeg-devel] [PATCH v3 6/6] avformat: add ts stream types for H266/VVC 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: Nuo Mi , Thomas Siedel Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N5b3VIeGelC0 From: Thomas Siedel Add transport stream stream type 0x33 for vvc. Add STREAM_TYPE_VIDEO_VVC to MPEG-1/2 and MPEG-2 transport stream. Add basic transport stream support for TS mux/demux. Tested with: ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v libvvenc test.ts && ffmpeg -i test.ts -f null - ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v copy test.ts && ffmpeg -i test.ts -f md5 - Signed-off-by: Thomas Siedel Co-Authored-By: Nuo Mi --- configure | 2 +- libavformat/mpeg.c | 6 ++++++ libavformat/mpeg.h | 1 + libavformat/mpegts.c | 2 ++ libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 21663000f8..68f675a4bc 100755 --- a/configure +++ b/configure @@ -3552,7 +3552,7 @@ mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" mp4_muxer_select="mov_muxer" mpegts_demuxer_select="iso_media" -mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf" +mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf vvc_mp4toannexb_bsf" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_muxer_select="pcm_rechunk_bsf rangecoder" mxf_d10_muxer_select="mxf_muxer" diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 781c3162d6..4b0c65826e 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -546,6 +546,12 @@ redo: } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { codec_id = AV_CODEC_ID_HEVC; type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_VVC) { + codec_id = AV_CODEC_ID_VVC; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_VVC) { + codec_id = AV_CODEC_ID_VVC; + type = AVMEDIA_TYPE_VIDEO; } else if (es_type == STREAM_TYPE_AUDIO_AC3) { codec_id = AV_CODEC_ID_AC3; type = AVMEDIA_TYPE_AUDIO; diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index b635295776..20592eb184 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -56,6 +56,7 @@ #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_HEVC 0x24 +#define STREAM_TYPE_VIDEO_VVC 0x33 #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_AUDIO_AC3 0x81 diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c7fd1f5d1f..bef00c88e7 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -812,6 +812,7 @@ static const StreamType ISO_types[] = { { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, + { 0x33, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2 }, @@ -867,6 +868,7 @@ static const StreamType REGD_types[] = { { MKTAG('D', 'T', 'S', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, { 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('V', 'V', 'C', ' '), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, { 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 }, diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index a48f14e768..14ae312c50 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -128,6 +128,7 @@ #define STREAM_TYPE_METADATA 0x15 #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_HEVC 0x24 +#define STREAM_TYPE_VIDEO_VVC 0x33 #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_AVS2 0xd2 #define STREAM_TYPE_VIDEO_AVS3 0xd4 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index ff1c4de640..69ba47534a 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -32,6 +32,7 @@ #include "libavcodec/defs.h" #include "libavcodec/h264.h" #include "libavcodec/hevc.h" +#include "libavcodec/vvc.h" #include "libavcodec/startcode.h" #include "avformat.h" @@ -369,6 +370,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_HEVC: stream_type = STREAM_TYPE_VIDEO_HEVC; break; + case AV_CODEC_ID_VVC: + stream_type = STREAM_TYPE_VIDEO_VVC; + break; case AV_CODEC_ID_CAVS: stream_type = STREAM_TYPE_VIDEO_CAVS; break; @@ -1851,6 +1855,7 @@ static uint8_t *h26x_prefix_aud(const uint8_t *aud, const int aud_size, #define H264_NAL_TYPE(state) (state & 0x1f) #define HEVC_NAL_TYPE(state) ((state & 0x7e) >> 1) +#define VVC_NAL_TYPE(state) ((state >> 11) & 0x1f) static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; @@ -2022,6 +2027,39 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (!data) return AVERROR(ENOMEM); } + } else if (st->codecpar->codec_id == AV_CODEC_ID_VVC) { + const uint8_t *p = buf, *buf_end = p + size; + uint32_t state = -1; + uint32_t nal_type = -1; + int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codecpar->extradata_size : 0; + int ret = check_h26x_startcode(s, st, pkt, "vvc"); + if (ret < 0) + return ret; + + if (extradd && AV_RB24(st->codecpar->extradata) > 1) + extradd = 0; + + do { + p = avpriv_find_start_code(p, buf_end, &state); + // state contains byte behind start code, p points 2 bytes behind start code + nal_type = VVC_NAL_TYPE(state); + av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", nal_type ); + if (nal_type == VVC_VPS_NUT) + extradd = 0; + } while (p < buf_end && nal_type != VVC_AUD_NUT && nal_type >= VVC_OPI_NUT); + + if (nal_type >= VVC_OPI_NUT) + extradd = 0; + if (nal_type != VVC_AUD_NUT) { // AUD NAL + const uint8_t aud[] = { + 0, // forbidden_zero_bit, nuh_reserved_zero_bit, nuh_layer_id + (VVC_AUD_NUT << 3) | 1, // nal_unit_type, nuh_temporal_id_plus1(1) + (pkt->flags & AV_PKT_FLAG_KEY) << 7 | 0x28, // aud_irap_or_gdr_flag, aud_pic_type(2), rbsp_stop_one_bit + }; + buf = data = h26x_prefix_aud(aud, FF_ARRAY_ELEMS(aud), st->codecpar->extradata, extradd, pkt, &size); + if (!data) + return AVERROR(ENOMEM); + } } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { if (pkt->size < 2) { av_log(s, AV_LOG_ERROR, "Opus packet too short\n"); @@ -2272,6 +2310,7 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st, } list[] = { { AV_CODEC_ID_H264, "h264_mp4toannexb", 0xff, 0x01 }, { AV_CODEC_ID_HEVC, "hevc_mp4toannexb", 0xff, 0x01 }, + { AV_CODEC_ID_VVC, "vvc_mp4toannexb", 0xf8, 0xf8 }, }; for (int i = 0; i < FF_ARRAY_ELEMS(list); i++) {