From patchwork Tue Jan 30 12:49:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 45906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2130988pzb; Tue, 30 Jan 2024 04:51:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGk/u4FQuDBCqJnGkEqq65+n4p6qAe2ZVd7w7gojAOC8596aTMUSVbAxv2dJC92U0zMw/1h X-Received: by 2002:a17:906:1401:b0:a31:410a:18e4 with SMTP id p1-20020a170906140100b00a31410a18e4mr6061914ejc.4.1706619109292; Tue, 30 Jan 2024 04:51:49 -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 h10-20020a170906718a00b00a35df307711si1480952ejk.286.2024.01.30.04.51.48; Tue, 30 Jan 2024 04:51:49 -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=UXma1B1g; 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 44C7168D36D; Tue, 30 Jan 2024 14:51:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2061.outbound.protection.outlook.com [40.92.107.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C517B68D35A for ; Tue, 30 Jan 2024 14:51:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OLrTpZcyCnHUgEXw0SmHvgqh2QEBJLawnAIw5ufAFgowMdD+Hy8n8+V0F108RVuEo/OR0sjyHNjeNg8NHoxsfGqEOlr/PqRzhg2y/eppH+Y8n+N6izFcwhMOMiSFKJekafC5ZugLLgzi9NJKUxSgvcwNghA+JGDOgBqLnmAJ1t+VdKttzeBxbpiBzjqkGMaDq9OgUiim2h07bwb/I/WSpxm5+5NNRQ80eWuD5zvFE9S/yETcQzUcXeNMFMoqnxBzEDX4lyTeHP7ewIVqhnThO5isD3pFUro+O2egAtrfYX10hde1HyYtkDtTV3bA8LzAeJvJbhnBQTOTWbsjT227QQ== 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=+iW/j7ePHKqqVVU+cWeKJzS85rD5LWJyrYIuA5gTN48=; b=mZZs858QPVQ8c8+ZV+jxtBiu6G/1KTkZfMNcXPYThnnVAMrOe39jkPRVEgacyvS1HQVRtKyWGeqK4qYAwn0HOPfT+/CJrP6u23CbjGZOBWpRtZhRoWbH3xzAdiW12UOBDk6G4lTWFsIRA47udxnfONj2hg1k62GmLmWF9gIV84s2NF1dAwp5uVxuIsPYaU3vbQE0Ey4ffkK5RixAYjOAVgCHLsXHeG+lM3FRJ1U52Q0+oZY3E3wumHjXa3ytVBl4Eowmfl+g6uQ0SgVAMVlPyLv7KdTHlSUq7DbQRVfUE9CPBHmzzb4A6von+kjhWLgP/q17sIPihCtHhdiSHAA97g== 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=+iW/j7ePHKqqVVU+cWeKJzS85rD5LWJyrYIuA5gTN48=; b=UXma1B1gxwzyTwbJWEcfSeb8gRSFyXJgrVnbSxEnglj15XtxR7Y1XXDp6Lc5WlY1LVdJKzVlpiRvmWz3Mq1gLoXKEDpw79Qt2m8wAPHLbxq+7OsZCB8ii5vXD49bbYj1qMvDV4HDcEP3aod2EmphNKbGY1wh2JFxcGQjVatzR6RQt+NCvH3im0NFnHW/9v+G/4sNOmy0d1KJPDqXV1GiKl/ObdVNGeeFzUwS5AkSQB59b4zAZGC/A4quPltMyVga7qZbDqDByTYGLx0zobjPx5iZ/SYlC56I5ABVx5SvuqucU39dzczEaqqgXzZo1EhXd+AMu4pFFRr6UrEKhx/Hwg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYZPR06MB7274.apcprd06.prod.outlook.com (2603:1096:405:ab::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 12:50:49 +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.029; Tue, 30 Jan 2024 12:50:49 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 20:49:03 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130124903.16892-1-nuomi2021@gmail.com> References: <20240130124903.16892-1-nuomi2021@gmail.com> X-TMN: [RxK6mDYJNGg6YJt9MkQc6BQIPk7RPvXd] X-ClientProxiedBy: SI2PR02CA0035.apcprd02.prod.outlook.com (2603:1096:4:195::22) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240130124903.16892-7-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYZPR06MB7274:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ad5ef55-a27e-4604-eb11-08dc219215c2 X-MS-Exchange-SLBlob-MailProps: WaIXnCbdHrMX0ub4IzufZP48szTFHkH0TiszLay4W89NJTOY/CgJ1rNFyBt8imoFbCiCaqpDtH+6gzIy9+lLQNMswxy8I2jxFxHANy+7Ue4DahYoRMzvhRO0TwLjFwLX+qgd2UDRW6lA+YDv1kEbvsX3z6a0kjYPsV7BtGz2ORFSwo5i+/Wr0F0EJf4Ws2Lu87B7sY3QzUuhDiCAYUm+EbOB57GNmtI9y2ArHGmCLrCWl5/Fq7yWK95OC0dbam3ivpCVWt0JS8si3nNoK8GmMGUUX9L7JSyVfsmouKfgbhIhSRopFjEEl1FcNeRajCMOkfLWucUCWHef1Q8vXoCIIWsBz/qYYgWP8IlgtyYZjbf7570XwqO23sbglxb82JCzEFv1NLC2i1UkXnUGY7B2G9/HGBnP7V/GE0phis69LQ0IFlk7VZrKUXJVnKBptE6hBurJ+WVgkbwNF1j0UNimuBj63ZBXoFmntTG/dJ16P5+u7SqcelOdglLh4ljmGDnKF3qWaZ7goqw+HFJe0vCW0C4gvkmMWF6DSaiGbU1vmLblhQQ5ekGXXDVIIKSxqAnEq75hy42SLUEL1yZ0BDG2bBp4ix8ONkRGdf+waOU7GZ/iRJTJWIYzwPVikHiIWKD7/63DRFpbrH1vOW8CcwaZDdbgEcBygW786ZQAHXXNmpqosMQMp1jPIB4dOC3e0zQ5nRqKh9DGtG5wvU+5lLthEAO6BbG+upocl8H6jehSnd7ZV4qB5OR4kdUgkKA18KMHjl+lorClUdA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YDQDtHE+qDjRh01Bolwe1apYcnSbXid+pgTT8/uRWRTdfug/1fGy390Ed5N5qPXUSEtcHAx/geS/CEqgui/mxciIiKxop4LLzGF5nDncOw/jbcky3UAgH5sSaQ4J/kT62sHAQUhJc4B0Aho66fCc+7yVqD68w6KLyZJCaujhbZlYkVOICc8VkrG2PM6SkefP/O9J8hsCkdX254f4BoDeC3o85Z+DTUOCjYnxXb6K+xgisrMTIINQdl2SuQ8J9SNJF4bxkUFXQIPNk0hAVuTqMlRvl3iplUpW6ZV0Q/PSOehh8QbdIgHqS6tVp0W/TM+iFOw+VB1Xr8bvL/aGmxEqMjhhARFDT8dZdgefIjuP0RW61Xo3h2zNoOTBbLe3m4OhMHx/MwUtF4orakVdnDqY+Yudw8zfNIV5cDi/W9uRNv+EJjbfzI2sAntJ/w1b0UEoh1Nmnd67batviylUEdg8SEPUyJhIGmE7zdJslzsbUp3NSil/KTMhTWzILtpGWH9cH1FJGI4GUwyTKCqC4Z2t5klBzWT4r9ztYG94b9nHO2QYnOO0OJuTwcbv6i4+MTlRb65qZ9aWowDdoknlAVCeSpxbY1r7HaDoXx4Lq9JNe/4xumJUUXrlufBG9VLpaxP2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nQZSHDLH7HhBz2dDvtyNG2wHeBvM6/Vf5HTD8l0kyXESoOtPVZgHkts3WfO5zQSdd5GT4rdhk/dCZBlydH65uoi44co69b0AdZLqKIrdX6Lb4JAlx6lDSQ5sxKBkhkVNaWmIA26fq35Kn6KQ+i9Nwuy8na3NigrxNveucJa2MEJSLNgfpXMbMCtaQcUCTbQnr/WbsMxWYQVs8Tas7Upbddn4fu6RlQhRrcckU6/wLaZPcsnLwmC41NL8EMGSU7ZCRBTctNeD7s150TSXNGBWl0eXP8NuZNozTFPtChXpbGcze2mMEegalfmtoQ7z6wC2g+OwJiWHh/o9C/yxM1W99pUFpIRzpsB2SEfDedC8qjUpw5HyVoocVbKYcxaDUBSDkS7UrHAvJs1VX1sjf6veKQYjwzU0WpqamGNjT5LlSsI4n0FLKuLHf3XhxebmfIA+wb3/OsF4ACpvzVsZMTO6YKuR5w9p13ArgVoJuszVxfxEcqGwPx6vjCIdX4hKm+LmjxjpV6enrvI/kCdkty1P6qtwS7q1wddiYY7wQyTCEBxikfT+pQsQt7Jz9uRALfLJJup0n9OOSrGycaaK/Ubrspx49YwvxtLfgtC05EObNUQpa0EvKC7nSUlP+qj3V7PJrqrWJXRkR0BVa2My+4OU0avHbEEDHVz7RPRhosNMQbA3Vz/aZvUrFodq4C4ljUtnLq3ts/aFvh4lbIBDfEmeqtBP/Hno+fJjgzqTEKsvHC+qio04StaeUdFYoqkxApGUN5GZtl4TYJbMAb0dtiWV+iwFGdfEBS6smjfrRMmL8DxxdRlsBIrh8Xypt781+KlmLO/kp7v6vEN6Vb9eU+Z+B1ty7waPVGrXTdI6sfzBx+8EcK1uz16DyKBPE/0Fm/RexsggaaxRBIsYMeo9qfTGHGmWbN5zwB0x0S4WnHbOEt3uzgo1P9OrW1tUwqlHeOseDxQgMAb71VDSqiu6ehPcglX2Lp5EoUI4EHXDrMSMDMJvV46m9SgfBYcP//+o5LI/nk6ArCfZVelPSLImRkPlgNikjbixfMTF/NkqdNTIDbpjJf/kavAmC9aZgpmv2ycVSQmgpawZVsT3h0zNkC4WLdMcerVjiIywoFhHWA8eIkVMrmAOSToHG6UvD+YzM0qg/IhL3ztcny5stG//W1R/rabKflWD6e9HmRlOuj7qKS0j7ivZVyUHvk9plfh80JqcYeAWa9HJJK0bAd1ckpl9YVY8PA3WegnYxWrjC1WWhAbivnul0UPOF/JCo/BLtIxU X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ad5ef55-a27e-4604-eb11-08dc219215c2 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 12:50:49.5392 (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: TYZPR06MB7274 Subject: [FFmpeg-devel] [PATCH v5 6/6] avformat/mpegts: 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: LSImJtxNXZbZ 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 | 3 +++ libavformat/mpeg.h | 1 + libavformat/mpegts.c | 2 ++ libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 47 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..a0f2c6da05 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -546,6 +546,9 @@ 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_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 7bc3feaef1..db3f5b64e6 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 /* configurationVersion in AVCDecoderConfigurationRecord */}, { AV_CODEC_ID_HEVC, "hevc_mp4toannexb", 0xff, 0x01 /* configurationVersion in HEVCDecoderConfigurationRecord */}, + { AV_CODEC_ID_VVC, "vvc_mp4toannexb", 0xf8, 0xf8 /* reserved '11111'b in VVCDecoderConfigurationRecord */}, }; for (int i = 0; i < FF_ARRAY_ELEMS(list); i++) {