Message ID | f9eb05d4893a715c571330c3d652ed8a2c36ff5c.1638776717.git.pross@xvid.org |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel] fate: add audio tests for Silicon Graphics Movie format | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | fail | Make fate failed |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | fail | Make fate failed |
Quoting Peter Ross (2021-12-06 08:48:08) > Signed-off-by: Peter Ross <pross@xvid.org> > --- > > Miminimal test vectors attached. > Can somebody help upload them to $SAMPLES/mv folder on rsync server? > > tests/fate/audio.mak | 12 ++++++++++++ > tests/ref/fate/mv-mono16bit | 8 ++++++++ > tests/ref/fate/mv-mono8bit | 8 ++++++++ > tests/ref/fate/mv-stereo16bit | 8 ++++++++ > tests/ref/fate/mv-stereo8bit | 8 ++++++++ > 5 files changed, 44 insertions(+) > create mode 100644 tests/ref/fate/mv-mono16bit > create mode 100644 tests/ref/fate/mv-mono8bit > create mode 100644 tests/ref/fate/mv-stereo16bit > create mode 100644 tests/ref/fate/mv-stereo8bit > > diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak > index fd9905ca0a..ed7ad9c220 100644 > --- a/tests/fate/audio.mak > +++ b/tests/fate/audio.mak > @@ -38,6 +38,18 @@ fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi > fate-imc: CMP = oneoff > fate-imc: REF = $(SAMPLES)/imc/imc-201706.pcm > > +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-mono8bit > +fate-mv-mono8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono8bit-minimal.movie -vn -af aresample > + > +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-mono16bit > +fate-mv-mono16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono16bit-minimal.movie -vn -af aresample > + > +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-stereo8bit > +fate-mv-stereo8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo8bit-minimal.movie -vn -af aresample > + > +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-stereo16bit > +fate-mv-stereo16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo16bit-minimal.movie -vn -af aresample Why -af aresample? Is that even bitexact?
Anton Khirnov: > Quoting Peter Ross (2021-12-06 08:48:08) >> Signed-off-by: Peter Ross <pross@xvid.org> >> --- >> >> Miminimal test vectors attached. >> Can somebody help upload them to $SAMPLES/mv folder on rsync server? >> >> tests/fate/audio.mak | 12 ++++++++++++ >> tests/ref/fate/mv-mono16bit | 8 ++++++++ >> tests/ref/fate/mv-mono8bit | 8 ++++++++ >> tests/ref/fate/mv-stereo16bit | 8 ++++++++ >> tests/ref/fate/mv-stereo8bit | 8 ++++++++ >> 5 files changed, 44 insertions(+) >> create mode 100644 tests/ref/fate/mv-mono16bit >> create mode 100644 tests/ref/fate/mv-mono8bit >> create mode 100644 tests/ref/fate/mv-stereo16bit >> create mode 100644 tests/ref/fate/mv-stereo8bit >> >> diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak >> index fd9905ca0a..ed7ad9c220 100644 >> --- a/tests/fate/audio.mak >> +++ b/tests/fate/audio.mak >> @@ -38,6 +38,18 @@ fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi >> fate-imc: CMP = oneoff >> fate-imc: REF = $(SAMPLES)/imc/imc-201706.pcm >> >> +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-mono8bit >> +fate-mv-mono8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono8bit-minimal.movie -vn -af aresample >> + >> +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-mono16bit >> +fate-mv-mono16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono16bit-minimal.movie -vn -af aresample >> + >> +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-stereo8bit >> +fate-mv-stereo8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo8bit-minimal.movie -vn -af aresample >> + >> +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-stereo16bit >> +fate-mv-stereo16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo16bit-minimal.movie -vn -af aresample > > Why -af aresample? Is that even bitexact? > A conversion of non-float formats is bitexact (if it isn't, it should be treated as a bug). The pcm_s16be decoder outputs the same sample format as the pcm_s16le encoder accepts, so aresample should be unnecessary in these cases, but not for the pcm_s8 case. Of course, one could also just copy the audio instead of decoding. This would also have the advantage that the actual requirements of this test better match the stated requirements: These tests currently all need the aresample filter, but DEMDEC does not check for this. As a result, these tests will fail e.g. with --disable-swscale. - Andreas
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index fd9905ca0a..ed7ad9c220 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -38,6 +38,18 @@ fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc-201706.pcm +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-mono8bit +fate-mv-mono8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono8bit-minimal.movie -vn -af aresample + +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-mono16bit +fate-mv-mono16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/mono16bit-minimal.movie -vn -af aresample + +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S8) += fate-mv-stereo8bit +fate-mv-stereo8bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo8bit-minimal.movie -vn -af aresample + +FATE_SAMPLES_AUDIO-$(call DEMDEC, MV, PCM_S16BE) += fate-mv-stereo16bit +fate-mv-stereo16bit: CMD = framecrc -i $(TARGET_SAMPLES)/mv/stereo16bit-minimal.movie -vn -af aresample + FATE_SAMPLES_AUDIO-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff diff --git a/tests/ref/fate/mv-mono16bit b/tests/ref/fate/mv-mono16bit new file mode 100644 index 0000000000..6c9e6df5e1 --- /dev/null +++ b/tests/ref/fate/mv-mono16bit @@ -0,0 +1,8 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, 0, 0, 4410, 8820, 0xa1d432c3 +0, 4410, 4410, 4410, 8820, 0x1e854d37 diff --git a/tests/ref/fate/mv-mono8bit b/tests/ref/fate/mv-mono8bit new file mode 100644 index 0000000000..70b18029ed --- /dev/null +++ b/tests/ref/fate/mv-mono8bit @@ -0,0 +1,8 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, 0, 0, 4410, 8820, 0x568f392f +0, 4410, 4410, 4410, 8820, 0xb294ab09 diff --git a/tests/ref/fate/mv-stereo16bit b/tests/ref/fate/mv-stereo16bit new file mode 100644 index 0000000000..a7632df0d0 --- /dev/null +++ b/tests/ref/fate/mv-stereo16bit @@ -0,0 +1,8 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 4410, 17640, 0x96c8faf5 +0, 4410, 4410, 4410, 17640, 0xe25dc559 diff --git a/tests/ref/fate/mv-stereo8bit b/tests/ref/fate/mv-stereo8bit new file mode 100644 index 0000000000..360a7f74ab --- /dev/null +++ b/tests/ref/fate/mv-stereo8bit @@ -0,0 +1,8 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 4410, 17640, 0x35113ee3 +0, 4410, 4410, 4410, 17640, 0x128a5495
Signed-off-by: Peter Ross <pross@xvid.org> --- Miminimal test vectors attached. Can somebody help upload them to $SAMPLES/mv folder on rsync server? tests/fate/audio.mak | 12 ++++++++++++ tests/ref/fate/mv-mono16bit | 8 ++++++++ tests/ref/fate/mv-mono8bit | 8 ++++++++ tests/ref/fate/mv-stereo16bit | 8 ++++++++ tests/ref/fate/mv-stereo8bit | 8 ++++++++ 5 files changed, 44 insertions(+) create mode 100644 tests/ref/fate/mv-mono16bit create mode 100644 tests/ref/fate/mv-mono8bit create mode 100644 tests/ref/fate/mv-stereo16bit create mode 100644 tests/ref/fate/mv-stereo8bit