[FFmpeg-devel] [PATCH] libavformat/mpegts.c: fix hardcoded 5-bytes skip for metadata streams.

Thilo Borgmann thilo.borgmann at mail.de
Sat Jun 24 13:51:02 EEST 2023


Am 24.06.23 um 12:43 schrieb Anton Khirnov:
> Quoting Romain Beauxis (2023-06-22 16:19:36)
>> commit ca0472eeebe478b7eb6e7d1dc4351037f8811728
>> Author: Romain Beauxis <toots at rastageeks.org>
>> Date:   Thu Jun 22 09:14:18 2023 -0500
>>
>>      Add FATE test for timed id3 demux.
>>
>> diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
>> index d8fc68af88..ace8fa0b52 100644
>> --- a/tests/fate/demux.mak
>> +++ b/tests/fate/demux.mak
>> @@ -157,6 +157,9 @@ fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
>>   FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
>>   fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts
>>   
>> +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-timed-id3-demux
>> +fate-ts-timed-id3-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/mpegts/id3.ts
>> +
>>   FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes)
>>   FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX)
>>   FATE_FFPROBE_DEMUX   += $(FATE_FFPROBE_DEMUX-yes)
>> diff --git a/tests/ref/fate/ts-timed-id3-demux b/tests/ref/fate/ts-timed-id3-demux
>> new file mode 100644
>> index 0000000000..922ca17d15
>> --- /dev/null
>> +++ b/tests/ref/fate/ts-timed-id3-demux
>> @@ -0,0 +1,6 @@
>> +packet|codec_type=data|stream_index=0|pts=126000|pts_time=1.400000|dts=126000|dts_time=1.400000|duration=N/A|duration_time=N/A|size=26|pos=564|flags=K__|data_hash=CRC32:469f474b|side_data|side_data_type=MPEGTS Stream ID|id=189
>> +
>> +packet|codec_type=data|stream_index=0|pts=577350|pts_time=6.415000|dts=577350|dts_time=6.415000|duration=N/A|duration_time=N/A|size=26|pos=1316|flags=K__|data_hash=CRC32:469f474b|side_data|side_data_type=MPEGTS Stream ID|id=189
>> +
>> +stream|index=0|codec_name=timed_id3|profile=unknown|codec_type=data|codec_tag_string=ID3 |codec_tag=0x20334449|ts_packetsize=188|id=0x100|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=126000|start_time=1.400000|duration_ts=451350|duration=5.015000|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=2|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0
>> +format|filename=id3.ts|nb_streams=1|nb_programs=1|format_name=mpegts|start_time=1.400000|duration=5.015000|size=1504|bit_rate=2399|probe_score=2
> 
> Looks good, can someone please put the sample in place?

Done.

4200d5ad77c2495255742248cbfd69c3  fate-suite/mpegts/id3.ts

-Thilo



More information about the ffmpeg-devel mailing list