[FFmpeg-cvslog] fate/oggvorbis: Fix tests after fixing AV_PKT_DATA_SKIP_SAMPLES

Guangyu Sun git at videolan.org
Mon Jul 12 10:56:02 EEST 2021

ffmpeg | branch: master | Guangyu Sun <sunguangyucn at gmail.com> | Fri Jul  9 17:12:03 2021 -0700| [b53738bf902626c48f950b9f3f27133f59141fbb] | committer: Lynne

fate/oggvorbis: Fix tests after fixing AV_PKT_DATA_SKIP_SAMPLES

After fixing AV_PKT_DATA_SKIP_SAMPLES for reading vorbis packets from ogg,
the actual decoded samples become fewer. Three fate tests are failing:

The samples in 6.ogg are not frame aligned. 6.pcm file was generated by
ffmpeg before the fix. After the fix, the decoded pcm file does not match
anymore. Ideally the ref file 6.pcm should be updated but it is probably
not worth it including another copy of the same file, only smaller.
SIZE_TOLERANCE is added for this test case.

The original vorbis_chapter_extension_demo.ogg is transmuxed to dash-webm.
The ref file webm-dash-chapters needs to be updated.

This exposes another bug in the vorbis encoder that initial_padding is not
correctly set. It is fixed in the previous patch.

Signed-off-by: Guangyu Sun <gsun at roblox.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b53738bf902626c48f950b9f3f27133f59141fbb

 tests/fate/vorbis.mak             | 1 +
 tests/ref/fate/webm-dash-chapters | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak
index 354cc57a0f..b9b7405e87 100644
--- a/tests/fate/vorbis.mak
+++ b/tests/fate/vorbis.mak
@@ -87,6 +87,7 @@ fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm
 FATE_VORBIS += fate-vorbis-20
 fate-vorbis-20: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/6.ogg
 fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm
+fate-vorbis-20: SIZE_TOLERANCE = 9948
 FATE_VORBIS_FFPROBE-$(CONFIG_OGG_DEMUXER) += fate-vorbis-1833-chapters
 fate-vorbis-1833-chapters: CMD = probechapters $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg
diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters
index 20ddfc031d..45368dca85 100644
--- a/tests/ref/fate/webm-dash-chapters
+++ b/tests/ref/fate/webm-dash-chapters
@@ -1,5 +1,5 @@
-e7fde2ecc9683a7a5296dab33b028653 *tests/data/fate/webm-dash-chapters.webm
-111220 tests/data/fate/webm-dash-chapters.webm
+f94bcae96166ad246a4b76605a4b3874 *tests/data/fate/webm-dash-chapters.webm
+111236 tests/data/fate/webm-dash-chapters.webm
 #extradata 0:     3469, 0xc6769ddc
 #tb 0: 1/1000
 #media_type 0: audio

More information about the ffmpeg-cvslog mailing list