From patchwork Thu Jan 25 12:26:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 45808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp35004pzf; Thu, 25 Jan 2024 04:26:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrA9c2yEKQQL29V2lxECwq+eXHR81AhqZLxR6ZbtSjiZls8s/WgpHjhpARxFbKjF+IL1Io X-Received: by 2002:a05:600c:5709:b0:40e:43ba:610e with SMTP id jv9-20020a05600c570900b0040e43ba610emr466135wmb.66.1706185615179; Thu, 25 Jan 2024 04:26:55 -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 u29-20020a50c05d000000b0055a5ec9da61si6839781edd.180.2024.01.25.04.26.48; Thu, 25 Jan 2024 04:26:55 -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=NPcBqwlW; 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 A7DA068D0D3; Thu, 25 Jan 2024 14:26:36 +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-psaapc01olkn2103.outbound.protection.outlook.com [40.92.52.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF47068D09E for ; Thu, 25 Jan 2024 14:26:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ua+bPr4aJht4t5MPUpsWB7ZJcWYW95OTlFrEGNCP3xvw/JZdLUh5M0eenAyUgp4Dz978w4Pe22e5woAHjdGuCHHmzbymLqdwpiDx79SGcJe6LzhfhCtTku90J7yBMWxGjGh4446SodfKFwFb8kE1DhVD+9Bgc4h5k7Nk7VvxvmbXxvgaFKh03hWoFB/xiGe/B7jGu8sj8lV/cMp/16X6ak7A8EEVOGE4iBxmwFIzAJAQg/1QyI9/sV1nH5TXCHS0Y9xEmvlc1zlESPAxnUhacdWZY1/vG9S4A8WjkhwImlCvqSTSDe0mTHoUewS3FHldTAA1zEUUl7f5v0x4+eZI0w== 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=D6FbEXAmE3Brt7B60G9nZPvukyjDqwCadh0KF60/+E8=; b=aPU/zuI1+uOFIUGWrd5BQIysy1SL72t1jijeFNJbPtYb6Up2NCYgDRrB1Yjc+QFjTHUjJfPsstSK1wksElJGuDSvY5d/BBKY/bbzNGdYPmAO8J/VxdoqRimpx9xhjb4wBQia8dqiu+EY+4i2SP6ZurxTJshC2JJOmuO7iGVr6RRzwcFPOX6AmpnLDQNA0//BmjUM+h0/hZn2rHfGL8RK0NYLmasm5UPXGzC3CXOq64L11UDZ5G4r3WARCXT7qf1u4SCNJd9PUrka39/7rO7im+NkHrVaiqanOWVeqLE9wBUcaBx6daOPWY0WuDQgs9g29op3wxE+n+ulDzj5mNme5w== 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=D6FbEXAmE3Brt7B60G9nZPvukyjDqwCadh0KF60/+E8=; b=NPcBqwlW+qL6AdNwQb4A7//jV0GOooVq5zT7gGc/Bg4pWHuONe45bJhs3vjNE8y7/vco6qQv21qi+PzkoxI8pLLpmxm7XElLHLO3p0xFTqchIFe0hQYWmghyil51ipCqc+nYRB3a1cpH8mtUTOZiW8nHGc/RFNqDYFM2DisZ1dpSb3WXku0G4mQjN0XcSG1sEvtHR9XIC5gxRQ6M5p6PM0Lu4LAhYltIrjo90E8+suumxJjTqbSOW2DBr57EECGCaLmUqVzzkl7ldCRuSRk6w0d/19RVLj12rqqqeoEJshv4eZOOQNSPXoWme+fc90lg8wqio2J4qpu2hd0liDZaJg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYSPR06MB6292.apcprd06.prod.outlook.com (2603:1096:400:42d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Thu, 25 Jan 2024 12:26:21 +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.022; Thu, 25 Jan 2024 12:26:21 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 20:26:01 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240125122601.5473-1-nuomi2021@gmail.com> References: <20240125122601.5473-1-nuomi2021@gmail.com> X-TMN: [Gw9j6zzefCU8S0Gabmrs0gniIdHiT7S1] X-ClientProxiedBy: TY2PR02CA0003.apcprd02.prod.outlook.com (2603:1096:404:56::15) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240125122601.5473-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYSPR06MB6292:EE_ X-MS-Office365-Filtering-Correlation-Id: 039a9fe0-5846-48d3-abac-08dc1da0d659 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1U32g6y9wy7PrcXDTGThBgr12l5zGC0zzysWYQjQgUpO/TqNlc0xI10UAVql+Kaf4d3qa6wRIlvvjC9KtTV9a3HIRjUTeRAPH7pr8OYFLLx7IL7eJ6PPtPdKmkV+y5R0mK9fEOQiI9iLknVKWyn82zK+mcgF8oc5u6aypjOMAUvSnr4fk59dJH9RYBcwpHoQ/iKyvYmHTOfu0VNUjOqIqb5tXMpBhmDb054zRrcaGyPAIwwWmFiAN5zdtqrY5TiOsALVchF7udFhCsKLT9eezGl0JKRfLlLL0I8Y1wcuqT5NFAwhUFkneRGZWAnqOFTy8MGe3VGkqaANBYXcizaeAcpJAnVt3oJydR/nY9iioAxoIdvgJXGe/5Gne9NZslyOiHEO+buwR9iTp5AN6qmOa/XqtBq8cUFmzXtSHjAiovnFoWRwyxIKWO7jEx/pF5CrpJpJr9NboELvVU8k2gUp6s4mJBrY4s0Wwtt0rkRPZ8X4dDNRMBMI8wgQ/lDdPKtCRpi2qpZZSYnwvOJg0RFKR7grv58NMcd/qYb0yW1UnhCFMA7QrgUKxX3A8gMWjyDq0suk4P+kbBqfC2bVJNMzVLeYt00p8KtjyljJUsIBIVpgKCvyiY7H37bx+0zs6uSi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iMBue8HJ5tvAYhpi71Af0fEtaG1LjpRVNUpx3MFTI1kcRwFrvUZT0NSSDxLwZ9o1WKllUdpOcfIiZ/SgTah/BjYO0mCAjWkwjEcVtujqrtklPwTVNCm4+vkPdRIev4LXcoX7sOf9RN7v+n26ctXhdbg3B1Od20o2OGUwaMSGE1L6cPK+Z6AfH/GvsRk7r54TTAb9SKyGoXqI7baCJif8icv6uFYB+KKoSfXlJ4SKqyNra9GKTNXIh4WqR88Q00ya9lPVI7LuTy8O0yTTG2i+AJlQpBmzA1FKfoRpoo+WL4Bh7C4JRcvupfmLe1f+YACxza8lqBM62nEdjlcL6yAv19abosJILT8I6ekgQY2yyM+YCbV5EXdqFytl5vvE3GsBH3vyp7aTQQJVA2YiLsAyTF/SBfP5wNUZDBPFw3YcZWtLKxArYohY54SM4Bt+BB8+5pUins065vUd9KP3JCfO0poeYekdMVNym7lJaBFjRaqIqESHJJWY4zaJD+d0jZ8OzGi2nn7hUVIipw9zG9KQB7WIFZF9ruc/8UJupl8QCvau7NHgUCEbu1rjDbaS8WdEP8HSYIZ0d31OkSVbjHAp4vhj8qF8bk1ggFRS7D0g9OJVsjELbl8ebrbjYkWK7OQ/cpIkK5MUbhUv5lMqzAc7EEivZc5NbIvIXHuuCTMrDMIOaFUR2GtPINeU4/MZogfLpSuXTRfD/TvDAMPMEEtkTySEU9r7iKqEGXY2uZs8ra8D4closBubAJLnkS/4v2Aj7GsS5o/4nrr9mjGTQzV0YbhZYcD8BM3AusLQgY2rSeCMCzlFSIi3WmVPIIlQT+heWzoyVE/z+AtXomyJtZPHVWhYLFjTgWp8vj5uYU6NH2WbLJaRlCtZ6mBmaLzh5k4UxZBIh1AS8BQio7Qfdq0+w2wMLNrAtnMIeYoc46fB10sOu04PWeYvLYrxd6uSQs1/Bn5vjp60WdWy0sx2SoWQPyxITjI+wYr0ddTFJrl2os0DTXVzEQBsM5ACP59i/rCOoeSK/ayLdlCXIoiDWnN8gRru+q3hLxTUapw1+83heqVq2vunx3j7ItX/U0/MuNMTd2sWCpS7TuT44AodrjlAnXzsS2VUbkSB6zdAdgqDDaQwE/W0HhfEPieFXEaVkneQLBO7xA7dycXWigHuFNW3OGE5rHRm6lawSPyu0aYKT/PT3BkXH5BJ2w19hI967nG3kvuOAFAAmRDZCFr3+nqRrmR1gxA3LNBnJvpaTGKnfr7vL7Sk6nRWcUN/W40qO5wg X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 039a9fe0-5846-48d3-abac-08dc1da0d659 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 12:26:20.9981 (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: TYSPR06MB6292 Subject: [FFmpeg-devel] [PATCH v2 2/2] 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: R5AwJ66hgjuS 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 | 65 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 73 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 84edd418f0..e3eab9d1db 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -368,6 +368,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; @@ -467,6 +470,11 @@ static int get_m2ts_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_HEVC: stream_type = STREAM_TYPE_VIDEO_HEVC; break; + case AV_CODEC_ID_VVC: + av_log(s, AV_LOG_ERROR, + "MPEGTS VVC %s.\n", avcodec_get_name(st->codecpar->codec_id)); + stream_type = STREAM_TYPE_VIDEO_VVC; + break; case AV_CODEC_ID_PCM_BLURAY: stream_type = 0x80; break; @@ -1791,6 +1799,21 @@ static int check_hevc_startcode(AVFormatContext *s, const AVStream *st, const AV return 0; } +static int check_vvc_startcode(AVFormatContext *s, const AVStream *st, const AVPacket *pkt) +{ + if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001 && AV_RB24(pkt->data) != 0x000001) { + if (!st->nb_frames) { + av_log(s, AV_LOG_ERROR, "VVC bitstream malformed, no startcode found\n"); + return AVERROR_PATCHWELCOME; + } + av_log(s, AV_LOG_WARNING, "VVC bitstream error, startcode missing, size %d", pkt->size); + if (pkt->size) + av_log(s, AV_LOG_WARNING, " data %08"PRIX32, AV_RB32(pkt->data)); + av_log(s, AV_LOG_WARNING, "\n"); + } + return 0; +} + /* Based on GStreamer's gst-plugins-base/ext/ogg/gstoggstream.c * Released under the LGPL v2.1+, written by * Vincent Penquerc'h @@ -2015,6 +2038,42 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) buf = data; size = pkt->size + 7 + extradd; } + } 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 naltype = -1; + int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codecpar->extradata_size : 0; + int ret = check_vvc_startcode(s, st, pkt); + 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 + naltype = ((AV_RB8(p)>>3) & 0x1F); + av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", naltype ); + if (naltype == 14 ) // VPS + extradd = 0; + } while (p < buf_end && naltype != 20 && naltype >= 12); + + if (naltype >= 12) + extradd = 0; + if (naltype != 20) { // AUD NAL + data = av_malloc(pkt->size + 7 + extradd); + if (!data) + return AVERROR(ENOMEM); + memcpy(data + 7, st->codecpar->extradata, extradd); + memcpy(data + 7 + extradd, pkt->data, pkt->size); + AV_WB32(data, 0x00000001); + data[4] = 0; // forbidden_zero_bit, nuh_reserved_zero_bit, nuh_layer_id + data[5] = 0xA1; // nal_unit_type(0xA), nuh_temporal_id_plus1(1) + data[6] = (pkt->flags & AV_PKT_FLAG_KEY) << 7 | 0x28; // aud_irap_or_gdr_flag, aud_pic_type(2), rbsp_stop_one_bit + buf = data; + size = pkt->size + 7 + extradd; + } } 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"); @@ -2271,6 +2330,12 @@ 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_VVC) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + ((st->codecpar->extradata[0] & 0xf8) == 0xf8)))) + ret = ff_stream_add_bitstream_filter(st, "vvc_mp4toannexb", NULL); } return ret;