From c1503cd95e203ea670e2a08556aebe17ec7c1be9 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 5 Jun 2017 20:21:24 -0300 Subject: [PATCH] fate: add fate-adts-id3v1-demux This test the demuxer discarding non ADTS frames at the beginning and end of the input. As a side effect, this commit also enables fate-adts-demux, which was accidentally disabled in 324f0fbff1245f9e9e1dda29ecb03138a2de287d. Tested-by: Michael Niedermayer Signed-off-by: James Almer --- tests/fate/demux.mak | 3 ++- tests/ref/fate/adts-id3v1-demux | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/adts-id3v1-demux diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index cf69e2fe2c..8a2703fc84 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,8 +1,9 @@ FATE_SAMPLES_DEMUX-$(call DEMDEC, AVI, FRAPS) += fate-avio-direct fate-avio-direct: CMD = framecrc -avioflags direct -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct -FATE_SAMPLES_DEMUX-$(DEMDEC, AAC, AAC) += fate-adts-demux +FATE_SAMPLES_DEMUX-$(call DEMDEC, AAC, AAC) += fate-adts-demux fate-adts-id3v1-demux fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -acodec copy +fate-adts-id3v1-demux: CMD = framecrc -f aac -i $(TARGET_SAMPLES)/aac/id3v1.aac -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -acodec copy diff --git a/tests/ref/fate/adts-id3v1-demux b/tests/ref/fate/adts-id3v1-demux new file mode 100644 index 0000000000..7caa5d6870 --- /dev/null +++ b/tests/ref/fate/adts-id3v1-demux @@ -0,0 +1,11 @@ +#tb 0: 1/28224000 +#media_type 0: audio +#codec_id 0: aac +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 602112, 474, 0x4c90e7c4 +0, 602112, 602112, 602112, 471, 0xb8b5e75d +0, 1204224, 1204224, 602112, 502, 0xe943efd1 +0, 1806336, 1806336, 602112, 495, 0x9c3cec74 +0, 2408448, 2408448, 602112, 493, 0x03b2fa4b