Message ID | GV1P250MB07379524B6965693D412DE238F499@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 9884d14711e7a36743861afedd949b5f32ac5e3c |
Headers | show |
Series | [FFmpeg-devel,1/9] fate/audio: Add tests for APTX (HD) | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > We have de- and encoders for APTX and APTX HD, yet not FATE tests. > This commit therefore adds a transcoding test to utilize them. > > Furthermore, during creating these tests it turned out that > the duration is set incorrectly for APTX HD. This will be fixed > in a future commit. > > (Thanks to Andriy Gelman for finding an issue in an earlier version > that used a 192kHz input sample which does not work reliably accross > platforms.) > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > tests/fate/audio.mak | 7 +++++++ > tests/ref/fate/aptx | 18 ++++++++++++++++++ > tests/ref/fate/aptx-hd | 15 +++++++++++++++ > 3 files changed, 40 insertions(+) > create mode 100644 tests/ref/fate/aptx > create mode 100644 tests/ref/fate/aptx-hd > > diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak > index fd9905ca0a..9d39eeace3 100644 > --- a/tests/fate/audio.mak > +++ b/tests/fate/audio.mak > @@ -1,3 +1,10 @@ > +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX, APTX, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-aptx > +fate-aptx: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx "-af aresample -c aptx" "-af aresample -c:a pcm_s16le -t 0.25" "" "" "-f aptx -sample_rate 44100" > + > +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX_HD, APTX_HD, WAV_DEMUXER PCM_S16LE_DECODER \ > + ARESAMPLE_FILTER PCM_S32LE_ENCODER) += fate-aptx-hd > +fate-aptx-hd: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx_hd "-af aresample -c aptx_hd" "-af aresample -c:a pcm_s32le -t 0.25" "" "" "-f aptx_hd -sample_rate 44100" > + > FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_DCT) += fate-binkaudio-dct > fate-binkaudio-dct: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_dct.bik > fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm > diff --git a/tests/ref/fate/aptx b/tests/ref/fate/aptx > new file mode 100644 > index 0000000000..4d20b7df9a > --- /dev/null > +++ b/tests/ref/fate/aptx > @@ -0,0 +1,18 @@ > +b5d8a297c0e8d9854f19d9d3e8b82859 *tests/data/fate/aptx.aptx > +418950 tests/data/fate/aptx.aptx > +#tb 0: 1/44100 > +#media_type 0: audio > +#codec_id 0: pcm_s16le > +#sample_rate 0: 44100 > +#channel_layout_name 0: 2 channels > +0, 0, 0, 1024, 4096, 0xcbb4ceff > +0, 1024, 1024, 1024, 4096, 0xa66533e7 > +0, 2048, 2048, 1024, 4096, 0x4f22ec39 > +0, 3072, 3072, 1024, 4096, 0x45f117f9 > +0, 4096, 4096, 1024, 4096, 0xad6c0b7a > +0, 5120, 5120, 1024, 4096, 0x611618fd > +0, 6144, 6144, 1024, 4096, 0x0ec02f2b > +0, 7168, 7168, 1024, 4096, 0x2cf9ae5c > +0, 8192, 8192, 1024, 4096, 0xfb008ac0 > +0, 9216, 9216, 1024, 4096, 0x25068495 > +0, 10240, 10240, 785, 3140, 0x5a260589 > diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd > new file mode 100644 > index 0000000000..0691f33c86 > --- /dev/null > +++ b/tests/ref/fate/aptx-hd > @@ -0,0 +1,15 @@ > +48ecaa81ee5adaaa62ed3ff6574b6666 *tests/data/fate/aptx-hd.aptx_hd > +628425 tests/data/fate/aptx-hd.aptx_hd > +#tb 0: 1/44100 > +#media_type 0: audio > +#codec_id 0: pcm_s32le > +#sample_rate 0: 44100 > +#channel_layout_name 0: 2 channels > +0, 0, 0, 1024, 8192, 0xa99888c6 > +0, 1536, 1536, 1024, 8192, 0xc3e03a3c > +0, 3072, 3072, 1024, 8192, 0x3f06e090 > +0, 4608, 4608, 1024, 8192, 0x92fb18f3 > +0, 6144, 6144, 1024, 8192, 0x3d5603a2 > +0, 7680, 7680, 1024, 8192, 0xcc3d3101 > +0, 9216, 9216, 1024, 8192, 0xbcc022ef > +0, 10752, 10752, 273, 2184, 0x9873af57 Will apply this patchset tomorrow unless there are objections. - Andreas
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index fd9905ca0a..9d39eeace3 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -1,3 +1,10 @@ +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX, APTX, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-aptx +fate-aptx: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx "-af aresample -c aptx" "-af aresample -c:a pcm_s16le -t 0.25" "" "" "-f aptx -sample_rate 44100" + +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX_HD, APTX_HD, WAV_DEMUXER PCM_S16LE_DECODER \ + ARESAMPLE_FILTER PCM_S32LE_ENCODER) += fate-aptx-hd +fate-aptx-hd: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx_hd "-af aresample -c aptx_hd" "-af aresample -c:a pcm_s32le -t 0.25" "" "" "-f aptx_hd -sample_rate 44100" + FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_DCT) += fate-binkaudio-dct fate-binkaudio-dct: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_dct.bik fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm diff --git a/tests/ref/fate/aptx b/tests/ref/fate/aptx new file mode 100644 index 0000000000..4d20b7df9a --- /dev/null +++ b/tests/ref/fate/aptx @@ -0,0 +1,18 @@ +b5d8a297c0e8d9854f19d9d3e8b82859 *tests/data/fate/aptx.aptx +418950 tests/data/fate/aptx.aptx +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout_name 0: 2 channels +0, 0, 0, 1024, 4096, 0xcbb4ceff +0, 1024, 1024, 1024, 4096, 0xa66533e7 +0, 2048, 2048, 1024, 4096, 0x4f22ec39 +0, 3072, 3072, 1024, 4096, 0x45f117f9 +0, 4096, 4096, 1024, 4096, 0xad6c0b7a +0, 5120, 5120, 1024, 4096, 0x611618fd +0, 6144, 6144, 1024, 4096, 0x0ec02f2b +0, 7168, 7168, 1024, 4096, 0x2cf9ae5c +0, 8192, 8192, 1024, 4096, 0xfb008ac0 +0, 9216, 9216, 1024, 4096, 0x25068495 +0, 10240, 10240, 785, 3140, 0x5a260589 diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd new file mode 100644 index 0000000000..0691f33c86 --- /dev/null +++ b/tests/ref/fate/aptx-hd @@ -0,0 +1,15 @@ +48ecaa81ee5adaaa62ed3ff6574b6666 *tests/data/fate/aptx-hd.aptx_hd +628425 tests/data/fate/aptx-hd.aptx_hd +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s32le +#sample_rate 0: 44100 +#channel_layout_name 0: 2 channels +0, 0, 0, 1024, 8192, 0xa99888c6 +0, 1536, 1536, 1024, 8192, 0xc3e03a3c +0, 3072, 3072, 1024, 8192, 0x3f06e090 +0, 4608, 4608, 1024, 8192, 0x92fb18f3 +0, 6144, 6144, 1024, 8192, 0x3d5603a2 +0, 7680, 7680, 1024, 8192, 0xcc3d3101 +0, 9216, 9216, 1024, 8192, 0xbcc022ef +0, 10752, 10752, 273, 2184, 0x9873af57
We have de- and encoders for APTX and APTX HD, yet not FATE tests. This commit therefore adds a transcoding test to utilize them. Furthermore, during creating these tests it turned out that the duration is set incorrectly for APTX HD. This will be fixed in a future commit. (Thanks to Andriy Gelman for finding an issue in an earlier version that used a 192kHz input sample which does not work reliably accross platforms.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tests/fate/audio.mak | 7 +++++++ tests/ref/fate/aptx | 18 ++++++++++++++++++ tests/ref/fate/aptx-hd | 15 +++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tests/ref/fate/aptx create mode 100644 tests/ref/fate/aptx-hd