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 B29FA483EC for ; Sat, 2 Mar 2024 18:39:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A24EF68D256; Sat, 2 Mar 2024 20:39:35 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D07568CEC4 for ; Sat, 2 Mar 2024 20:39:29 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B99CEE977B for ; Sat, 2 Mar 2024 19:39:28 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Sm2Zo9tgDnmr for ; Sat, 2 Mar 2024 19:39:27 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 36173E9768 for ; Sat, 2 Mar 2024 19:39:27 +0100 (CET) Date: Sat, 2 Mar 2024 19:39:27 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20240229231812.13981-1-cus@passwd.hu> Message-ID: References: <20240229231812.13981-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avformat/mpegts: detect synchronous metadata KLV more reliably 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 1 Mar 2024, Marton Balint wrote: > The mpegts code historically tries to strip (the first) metadata access unit > header from synchronous KLV metadata, but the detection for such streams was > unreliable causing strips of asynchronous metadata or ID3 as well. > > MISB ST 1402 specifies required stream type, stream id and registration > descriptor (which eventually maps to the codec ID) so let's use all of these > for reliable detection. > > Fixes ticket #10828, #10883. > > Signed-off-by: Marton Balint > --- > libavformat/mpegts.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c > index 836d5dd5a3..01f6c04223 100644 > --- a/libavformat/mpegts.c > +++ b/libavformat/mpegts.c > @@ -1307,8 +1307,11 @@ skip: > p += sl_header_bytes; > buf_size -= sl_header_bytes; > } > - if (pes->st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && buf_size >= 5) { > - /* skip metadata access unit header */ > + if (pes->stream_type == STREAM_TYPE_METADATA && > + pes->stream_id == STREAM_ID_METADATA_STREAM && > + pes->st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && > + buf_size >= 5) { > + /* skip metadata access unit header - see MISB ST 1402 */ > pes->pes_header_size += 5; > p += 5; > buf_size -= 5; Will apply. Regards, Marton _______________________________________________ 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".