This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 361c1079c4b22897f838ee0f89c2729745182feb Author: James Almer <[email protected]> AuthorDate: Wed May 27 20:31:35 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Tue Jun 2 20:06:21 2026 -0300 fate/lavf-container: add an ADTS muxing test This covers writing a ChannelConfig of 0, plus parsing the stream's PCE bits in a 5.1.2(back) sample. Signed-off-by: James Almer <[email protected]> --- tests/fate-run.sh | 3 +++ tests/fate/lavf-container.mak | 4 +++- tests/ref/lavf-fate/adts | 51 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 029f41bf6b..dfc5647321 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -431,9 +431,12 @@ lavf_container_fate() file=${outdir}/lavf.$t cleanfiles="$cleanfiles $file" input="${target_samples}/$1" + ffprobe_opts=$5 do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \ "$ENC_OPTS -metadata title=lavftest" $3 -vcodec copy -acodec copy || return do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $4 + test -z "$ffprobe_opts" || \ + run ffprobe${PROGSUF}${EXECSUF} -bitexact -threads $threads $ffprobe_opts $file || return } lavf_image(){ diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 6194f18f28..cef9a57ec7 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -82,6 +82,7 @@ FATE_LAVF_CONTAINER_FATE-$(call CRC, MATROSKA, VVC, VVC_PARSER SETTS_BSF MA FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV, VVC, VVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += vvc.mp4 FATE_LAVF_CONTAINER_FATE-$(call CRC, MATROSKA OGG, VP3 THEORA, OGG_MUXER) += vp3.ogg FATE_LAVF_CONTAINER_FATE-$(call CRC, MATROSKA OGG, VP8 VORBIS, VORBIS_PARSER OGV_MUXER) += vp8.ogg +FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV AAC, AAC, ADTS_MUXER) += adts FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV LOAS, AAC_LATM, LATM_MUXER) += latm FATE_LAVF_CONTAINER_FATE-$(call CRC, MP3,, MP3_MUXER) += mp3 FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV, QTRLE MACE6, MOV_MUXER ARESAMPLE_FILTER) += qtrle_mace6.mov @@ -103,6 +104,7 @@ fate-lavf-fate-vvc.mkv: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto" fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "" "-c:a copy" +fate-lavf-fate-adts: CMD = lavf_container_fate "aac/al22_chCfg0PCE_44.mp4" "" "" "-c:a copy" "-show_streams" fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "" "-c:a copy" fate-lavf-fate-mv_hevc.mov: CMD = lavf_container_fate "hevc/multiview.mov" "" "" "-c:v copy" fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "" "-c:a copy" @@ -110,5 +112,5 @@ fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate "qtrle/Animation-16Gre fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto" fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" "" "" "-c:v copy" -FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_LAVF_CONTAINER_FATE) fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE) diff --git a/tests/ref/lavf-fate/adts b/tests/ref/lavf-fate/adts new file mode 100644 index 0000000000..5b464adf6e --- /dev/null +++ b/tests/ref/lavf-fate/adts @@ -0,0 +1,51 @@ +866b43d34bf6787cfd56de9f3431fbf7 *tests/data/lavf-fate/lavf.adts +69547 tests/data/lavf-fate/lavf.adts +tests/data/lavf-fate/lavf.adts CRC=0x629e7d95 +[STREAM] +index=0 +codec_name=aac +profile=1 +codec_type=audio +codec_tag_string=[0][0][0][0] +codec_tag=0x0000 +mime_codec_string=mp4a.40.2 +sample_fmt=fltp +sample_rate=44100 +channels=8 +channel_layout=5.1.2(back) +bits_per_sample=0 +initial_padding=0 +id=N/A +r_frame_rate=0/0 +avg_frame_rate=0/0 +time_base=1/28224000 +start_pts=N/A +start_time=N/A +duration_ts=34105341 +duration=1.208381 +bit_rate=460431 +max_bit_rate=N/A +bits_per_raw_sample=N/A +nb_frames=N/A +nb_read_frames=N/A +nb_read_packets=N/A +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:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
