This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit de038122a37c7c4f4938d4c0340584bf25789447 Author: Romain Beauxis <[email protected]> AuthorDate: Wed May 6 08:17:20 2026 -0500 Commit: Romain Beauxis <[email protected]> CommitDate: Sat Jul 18 15:48:34 2026 +0000 tests/fate/ogg-vorbis.mak: add test to show packets initial padding and side data. --- tests/fate/ogg-vorbis.mak | 27 ++- tests/ref/fate/ogg-vorbis-bear | 100 ++++++++++ tests/ref/fate/ogg-vorbis-initial-padding-chained | 148 ++++++++++++++ tests/ref/fate/ogg-vorbis-libvorbis-1s | 62 ++++++ tests/ref/fate/ogg-vorbis-libvorbis-30s | 62 ++++++ tests/ref/fate/ogg-vorbis-ts-offset | 233 ++++++++++++++++++++++ tests/ref/fate/ogg-vorbis-ts-seek | 72 +++++++ 7 files changed, 703 insertions(+), 1 deletion(-) diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak index 834d26f74b..728209246d 100644 --- a/tests/fate/ogg-vorbis.mak +++ b/tests/fate/ogg-vorbis.mak @@ -7,6 +7,27 @@ fate-ogg-vorbis-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXE fate-ogg-vorbis-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt fate-ogg-vorbis-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg +FATE_OGG_VORBIS_PROBE-$(call DEMDEC, OGG, VORBIS) += fate-ogg-vorbis-initial-padding-chained +fate-ogg-vorbis-initial-padding-chained: CMD = ffprobe_demux -of default -show_entries stream=codec_name,initial_padding $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg + +# Regression test for encoder delay (ts_offset): pts must stay in sync with accumulated nb_samples across page boundaries +FATE_OGG_VORBIS_PROBE-$(call DEMDEC, OGG, VORBIS) += fate-ogg-vorbis-ts-offset +fate-ogg-vorbis-ts-offset: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames -of default $(TARGET_SAMPLES)/ogg-vorbis/tos.ogg 2>/dev/null | awk -F= "/nb_samples=/ {predicted_pts += \$$2} /pts=/ {pts = \$$2; printf \"%d-%d=%d\\n\", predicted_pts, pts, predicted_pts-pts}" + +FATE_OGG_VORBIS_PROBE-$(call DEMDEC, OGG, VORBIS) += fate-ogg-vorbis-ts-seek +fate-ogg-vorbis-ts-seek: CMD = ffprobe_demux -of default -bitexact -select_streams a -read_intervals 2.5%+\#5 -show_packets -show_entries packet=pts,dts,duration,flags -show_entries stream=codec_name,initial_padding $(TARGET_SAMPLES)/ogg-vorbis/tos.ogg + +# Regression test for files with granule=0 on audio pages +# See https://trac.ffmpeg.org/ticket/3710 +FATE_OGG_VORBIS_PROBE-$(call DEMDEC, OGG, VORBIS) += fate-ogg-vorbis-bear +fate-ogg-vorbis-bear: CMD = ffprobe_demux -of default -bitexact -select_streams a -read_intervals %+\#10 -show_packets -show_entries packet=pts,dts,duration,flags -show_entries stream=codec_name,initial_padding $(TARGET_SAMPLES)/ogg/bear.ogv + +FATE_OGG_VORBIS_ENCODE_PROBE-$(call ENCDEC, LIBVORBIS VORBIS, OGG, LAVFI_INDEV SINE_FILTER) += fate-ogg-vorbis-libvorbis-1s +fate-ogg-vorbis-libvorbis-1s: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -f lavfi -i sine=frequency=440:duration=1:sample_rate=44100 -c:a libvorbis -bitexact -f ogg -y" "ffprobe$(PROGSSUF)$(EXESUF) -print_filename $$test -of default -bitexact -threads 1 -read_intervals %+\#5 -show_entries stream=codec_name,initial_padding:packet=pts,pts_time,dts,dts_time,duration,duration_time,flags:packet_side_data_list:format=filename,nb_streams,nb_programs,nb_stream_groups,fo [...] + +FATE_OGG_VORBIS_ENCODE_PROBE-$(call ENCDEC, LIBVORBIS VORBIS, OGG, LAVFI_INDEV SINE_FILTER) += fate-ogg-vorbis-libvorbis-30s +fate-ogg-vorbis-libvorbis-30s: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -f lavfi -i sine=frequency=440:duration=30:sample_rate=44100 -c:a libvorbis -bitexact -f ogg -y" "ffprobe$(PROGSSUF)$(EXESUF) -print_filename $$test -of default -bitexact -threads 1 -read_intervals %+\#5 -show_entries stream=codec_name,initial_padding:packet=pts,pts_time,dts,dts_time,duration,duration_time,flags:packet_side_data_list:format=filename,nb_streams,nb_programs,nb_stream_groups, [...] + FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) @@ -15,4 +36,8 @@ FATE_EXTERN += $(FATE_OGG_VORBIS-yes) FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_VORBIS-yes) -fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) $(FATE_OGG_COPY_VORBIS-yes) +FATE_SAMPLES_FFPROBE += $(FATE_OGG_VORBIS_PROBE-yes) + +FATE_FFMPEG_FFPROBE += $(FATE_OGG_VORBIS_ENCODE_PROBE-yes) + +fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) $(FATE_OGG_COPY_VORBIS-yes) $(FATE_OGG_VORBIS_PROBE-yes) $(FATE_OGG_VORBIS_ENCODE_PROBE-yes) diff --git a/tests/ref/fate/ogg-vorbis-bear b/tests/ref/fate/ogg-vorbis-bear new file mode 100644 index 0000000000..7f584444f6 --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-bear @@ -0,0 +1,100 @@ +[PACKET] +pts=-704 +dts=-704 +duration=128 +flags=K__ +TAG:encoder=Lavc52.32.0 +[SIDE_DATA] +side_data_type=Strings Metadata +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=-576 +dts=-576 +duration=128 +flags=K__ +[/PACKET] +[PACKET] +pts=-448 +dts=-448 +duration=576 +flags=K__ +[/PACKET] +[PACKET] +pts=128 +dts=128 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=704 +dts=704 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=1728 +dts=1728 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=2752 +dts=2752 +duration=576 +flags=K__ +[/PACKET] +[PACKET] +pts=3776 +dts=3776 +duration=128 +flags=K__ +[/PACKET] +[PACKET] +pts=4352 +dts=4352 +duration=128 +flags=K__ +[/PACKET] +[PACKET] +pts=4480 +dts=4480 +duration=576 +flags=K__ +[/PACKET] +[STREAM] +codec_name=vorbis +initial_padding=0 +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 +TAG:encoder=Lavc52.32.0 +[/STREAM] +[FORMAT] +filename= +nb_streams=2 +nb_programs=0 +nb_stream_groups=0 +format_name=ogg +start_time=0.000000 +duration=1.011519 +size=59943 +bit_rate=474083 +probe_score=100 +[/FORMAT] diff --git a/tests/ref/fate/ogg-vorbis-initial-padding-chained b/tests/ref/fate/ogg-vorbis-initial-padding-chained new file mode 100644 index 0000000000..4f2bc2dea8 --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-initial-padding-chained @@ -0,0 +1,148 @@ +[PACKET] +codec_type=audio +stream_index=0 +pts=0 +pts_time=0.000000 +dts=0 +dts_time=0.000000 +duration=128 +duration_time=0.002902 +size=28 +pos=3373 +flags=K__ +data_hash=CRC32:f592149b +TAG:encoder=Lavc61.19.100 libvorbis +TAG:title=First Stream +[SIDE_DATA] +side_data_type=Strings Metadata +[/SIDE_DATA] +[/PACKET] +[PACKET] +codec_type=audio +stream_index=0 +pts=128 +pts_time=0.002902 +dts=128 +dts_time=0.002902 +duration=576 +duration_time=0.013061 +size=59 +pos=3373 +flags=K__ +data_hash=CRC32:3a566e87 +[/PACKET] +[PACKET] +codec_type=audio +stream_index=0 +pts=704 +pts_time=0.015964 +dts=704 +dts_time=0.015964 +duration=619 +duration_time=0.014036 +size=85 +pos=3373 +flags=K__ +data_hash=CRC32:dab3c9f5 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=0 +discard_padding=405 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +codec_type=audio +stream_index=0 +pts=1323 +pts_time=0.030000 +dts=1323 +dts_time=0.030000 +duration=128 +duration_time=0.002902 +size=28 +pos=6949 +flags=K__ +data_hash=CRC32:f592149b +TAG:encoder=Lavc61.19.100 libvorbis +TAG:title=Second Stream +[SIDE_DATA] +side_data_type=Strings Metadata +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=New Extradata +[/SIDE_DATA] +[/PACKET] +[PACKET] +codec_type=audio +stream_index=0 +pts=1451 +pts_time=0.032902 +dts=1451 +dts_time=0.032902 +duration=576 +duration_time=0.013061 +size=59 +pos=6949 +flags=K__ +data_hash=CRC32:3a566e87 +[/PACKET] +[PACKET] +codec_type=audio +stream_index=0 +pts=2027 +pts_time=0.045964 +dts=2027 +dts_time=0.045964 +duration=619 +duration_time=0.014036 +size=85 +pos=6949 +flags=K__ +data_hash=CRC32:dab3c9f5 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=0 +discard_padding=405 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[STREAM] +codec_name=vorbis +initial_padding=0 +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 +TAG:encoder=Lavc61.19.100 libvorbis +TAG:title=Second Stream +[/STREAM] +[FORMAT] +filename= +nb_streams=1 +nb_programs=0 +nb_stream_groups=0 +format_name=ogg +start_time=0.000000 +duration=0.030000 +size=7151 +bit_rate=1906933 +probe_score=100 +[/FORMAT] diff --git a/tests/ref/fate/ogg-vorbis-libvorbis-1s b/tests/ref/fate/ogg-vorbis-libvorbis-1s new file mode 100644 index 0000000000..971a7c724f --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-libvorbis-1s @@ -0,0 +1,62 @@ +[PACKET] +pts=0 +pts_time=0.000000 +dts=0 +dts_time=0.000000 +duration=128 +duration_time=0.002902 +flags=K__ +[SIDE_DATA] +side_data_type=Strings Metadata +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=128 +pts_time=0.002902 +dts=128 +dts_time=0.002902 +duration=576 +duration_time=0.013061 +flags=K__ +[/PACKET] +[PACKET] +pts=704 +pts_time=0.015964 +dts=704 +dts_time=0.015964 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[PACKET] +pts=1728 +pts_time=0.039184 +dts=1728 +dts_time=0.039184 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[PACKET] +pts=2752 +pts_time=0.062404 +dts=2752 +dts_time=0.062404 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[STREAM] +codec_name=vorbis +initial_padding=0 +[/STREAM] +[FORMAT] +filename=ogg-vorbis-libvorbis-1s +nb_streams=1 +nb_programs=0 +nb_stream_groups=0 +format_name=ogg +start_time=0.000000 +duration=1.000000 +probe_score=100 +[/FORMAT] diff --git a/tests/ref/fate/ogg-vorbis-libvorbis-30s b/tests/ref/fate/ogg-vorbis-libvorbis-30s new file mode 100644 index 0000000000..d2b7877bdb --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-libvorbis-30s @@ -0,0 +1,62 @@ +[PACKET] +pts=-128 +pts_time=-0.002902 +dts=-128 +dts_time=-0.002902 +duration=128 +duration_time=0.002902 +flags=K__ +[SIDE_DATA] +side_data_type=Strings Metadata +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=0 +pts_time=0.000000 +dts=0 +dts_time=0.000000 +duration=576 +duration_time=0.013061 +flags=K__ +[/PACKET] +[PACKET] +pts=576 +pts_time=0.013061 +dts=576 +dts_time=0.013061 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[PACKET] +pts=1600 +pts_time=0.036281 +dts=1600 +dts_time=0.036281 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[PACKET] +pts=2624 +pts_time=0.059501 +dts=2624 +dts_time=0.059501 +duration=1024 +duration_time=0.023220 +flags=K__ +[/PACKET] +[STREAM] +codec_name=vorbis +initial_padding=0 +[/STREAM] +[FORMAT] +filename=ogg-vorbis-libvorbis-30s +nb_streams=1 +nb_programs=0 +nb_stream_groups=0 +format_name=ogg +start_time=0.000000 +duration=30.000000 +probe_score=100 +[/FORMAT] diff --git a/tests/ref/fate/ogg-vorbis-ts-offset b/tests/ref/fate/ogg-vorbis-ts-offset new file mode 100644 index 0000000000..9f6841329c --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-ts-offset @@ -0,0 +1,233 @@ +0-0=0 +576-576=0 +1600-1600=0 +2624-2624=0 +3648-3648=0 +4672-4672=0 +5696-5696=0 +6720-6720=0 +7744-7744=0 +8768-8768=0 +9792-9792=0 +10816-10816=0 +11840-11840=0 +12864-12864=0 +13888-13888=0 +14912-14912=0 +15936-15936=0 +16960-16960=0 +17984-17984=0 +19008-19008=0 +20032-20032=0 +21056-21056=0 +22080-22080=0 +23104-23104=0 +24128-24128=0 +25152-25152=0 +26176-26176=0 +27200-27200=0 +28224-28224=0 +29248-29248=0 +30272-30272=0 +31296-31296=0 +32320-32320=0 +33344-33344=0 +34368-34368=0 +35392-35392=0 +36416-36416=0 +37440-37440=0 +38464-38464=0 +39488-39488=0 +40512-40512=0 +41536-41536=0 +42560-42560=0 +43584-43584=0 +44608-44608=0 +45632-45632=0 +46656-46656=0 +47680-47680=0 +48704-48704=0 +49728-49728=0 +50752-50752=0 +51776-51776=0 +52800-52800=0 +53824-53824=0 +54848-54848=0 +55872-55872=0 +56896-56896=0 +57920-57920=0 +58944-58944=0 +59968-59968=0 +60992-60992=0 +62016-62016=0 +63040-63040=0 +64064-64064=0 +65088-65088=0 +66112-66112=0 +67136-67136=0 +68160-68160=0 +69184-69184=0 +70208-70208=0 +71232-71232=0 +72256-72256=0 +73280-73280=0 +74304-74304=0 +75328-75776=-448 +75904-75904=0 +76032-76032=0 +76160-76160=0 +76288-76288=0 +76416-76416=0 +76544-76544=0 +76672-76672=0 +76800-76800=0 +76928-76928=0 +77056-77056=0 +77184-77184=0 +77312-77312=0 +77440-77440=0 +77568-77568=0 +77696-77696=0 +77824-77824=0 +77952-77952=0 +78080-78080=0 +78208-78208=0 +78336-78336=0 +78464-78464=0 +78592-78592=0 +78720-78720=0 +78848-78848=0 +78976-78976=0 +79104-79104=0 +79232-79232=0 +79360-79360=0 +79488-79488=0 +79616-79616=0 +79744-79744=0 +79872-79872=0 +80000-80000=0 +80576-81024=-448 +81152-81152=0 +81280-81280=0 +81408-81408=0 +81984-81984=0 +83008-83008=0 +84032-84032=0 +85056-85504=-448 +85632-85632=0 +85760-85760=0 +85888-85888=0 +86016-86016=0 +86144-86144=0 +86272-86272=0 +86848-87296=-448 +87424-87424=0 +87552-87552=0 +87680-87680=0 +87808-87808=0 +87936-87936=0 +88512-88512=0 +89536-89536=0 +90112-90112=0 +90240-90240=0 +90368-90368=0 +90496-90496=0 +90624-90624=0 +90752-90752=0 +90880-90880=0 +91008-91008=0 +91136-91136=0 +91264-91264=0 +91392-91392=0 +91520-91520=0 +91648-91648=0 +91776-91776=0 +92352-92352=0 +93376-93376=0 +94400-94400=0 +95424-95424=0 +96448-96448=0 +97472-97472=0 +98496-98496=0 +99520-99520=0 +100544-100544=0 +101120-101120=0 +101248-101248=0 +101376-101376=0 +101952-101952=0 +102528-102528=0 +102656-102656=0 +102784-102784=0 +102912-102912=0 +103488-103488=0 +104064-104064=0 +104192-104192=0 +104320-104320=0 +104448-104448=0 +104576-104576=0 +104704-104704=0 +104832-104832=0 +104960-104960=0 +105088-105088=0 +105216-105216=0 +105344-105344=0 +105472-105472=0 +105600-105600=0 +105728-105728=0 +105856-105856=0 +105984-105984=0 +106112-106112=0 +106240-106240=0 +106368-106368=0 +106944-106944=0 +107520-107520=0 +107648-107648=0 +107776-107776=0 +107904-107904=0 +108032-108032=0 +108160-108160=0 +108288-108288=0 +108416-108416=0 +108544-108544=0 +108672-108672=0 +109248-109248=0 +110272-110272=0 +111296-111296=0 +112320-112320=0 +113344-113344=0 +114368-114368=0 +115392-115392=0 +116416-116416=0 +117440-117440=0 +118464-118464=0 +119488-119488=0 +120512-120512=0 +121536-121536=0 +122560-122560=0 +123136-123136=0 +123264-123264=0 +123392-123392=0 +123520-123520=0 +123648-123648=0 +123776-123776=0 +123904-123904=0 +124032-124032=0 +124608-124608=0 +125632-125632=0 +126208-126208=0 +126336-126336=0 +126464-126464=0 +126592-126592=0 +126720-126720=0 +126848-126848=0 +126976-126976=0 +127104-127104=0 +127232-127232=0 +127360-127360=0 +127936-127936=0 +128960-128960=0 +129984-129984=0 +131008-131008=0 +132032-132032=0 +133056-133056=0 +133632-133632=0 diff --git a/tests/ref/fate/ogg-vorbis-ts-seek b/tests/ref/fate/ogg-vorbis-ts-seek new file mode 100644 index 0000000000..4b1828b9e9 --- /dev/null +++ b/tests/ref/fate/ogg-vorbis-ts-seek @@ -0,0 +1,72 @@ +[PACKET] +pts=44608 +dts=44608 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=45632 +dts=45632 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=46656 +dts=46656 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=47680 +dts=47680 +duration=1024 +flags=K__ +[/PACKET] +[PACKET] +pts=48704 +dts=48704 +duration=1024 +flags=K__ +[/PACKET] +[STREAM] +codec_name=vorbis +initial_padding=0 +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 +TAG:language=eng +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +TAG:encoder=Lavc60.3.100 libvorbis +TAG:major_brand=qt +TAG:minor_version=512 +TAG:compatible_brands=qt +[/STREAM] +[FORMAT] +filename= +nb_streams=1 +nb_programs=0 +nb_stream_groups=0 +format_name=ogg +start_time=0.000000 +duration=3.033107 +size=40295 +bit_rate=106280 +probe_score=100 +[/FORMAT] _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
