mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-13 21:26:33 +02:00
Merge commit '90e648c508fa6b97587ce62699a1449123f7d285'
* commit '90e648c508fa6b97587ce62699a1449123f7d285': fate/mp3: use the f32le format as output Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
cf1ccfffa4
@ -1,41 +1,38 @@
|
|||||||
FATE_MP3 += fate-mp3-float-conf-compl
|
FATE_MP3 += fate-mp3-float-conf-compl
|
||||||
fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit
|
fate-mp3-float-conf-compl: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit -f f32le -
|
||||||
fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl_2.pcm
|
fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-he_32khz
|
FATE_MP3 += fate-mp3-float-conf-he_32khz
|
||||||
fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648
|
fate-mp3-float-conf-he_32khz: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648 -f f32le -
|
||||||
fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm
|
fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-he_44khz
|
FATE_MP3 += fate-mp3-float-conf-he_44khz
|
||||||
fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168
|
fate-mp3-float-conf-he_44khz: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168 -f f32le -
|
||||||
fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm
|
fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-he_48khz
|
FATE_MP3 += fate-mp3-float-conf-he_48khz
|
||||||
fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648
|
fate-mp3-float-conf-he_48khz: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648 -f f32le -
|
||||||
fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm
|
fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-hecommon
|
FATE_MP3 += fate-mp3-float-conf-hecommon
|
||||||
fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408
|
fate-mp3-float-conf-hecommon: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408 -f f32le -
|
||||||
fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm
|
fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-si
|
FATE_MP3 += fate-mp3-float-conf-si
|
||||||
fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784
|
fate-mp3-float-conf-si: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784 -f f32le -
|
||||||
fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm
|
fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-conf-si_block
|
FATE_MP3 += fate-mp3-float-conf-si_block
|
||||||
fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576
|
fate-mp3-float-conf-si_block: CMD = ffmpeg -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576 -f f32le -
|
||||||
fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm
|
fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.f32
|
||||||
|
|
||||||
FATE_MP3 += fate-mp3-float-extra_overread
|
FATE_MP3 += fate-mp3-float-extra_overread
|
||||||
fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3
|
fate-mp3-float-extra_overread: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3 -f f32le -
|
||||||
fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm
|
fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.f32
|
||||||
|
|
||||||
$(FATE_MP3): CMP = stddev
|
$(FATE_MP3): CMP = oneoff
|
||||||
$(FATE_MP3): FUZZ = 0.07
|
$(FATE_MP3): CMP_UNIT = f32
|
||||||
|
$(FATE_MP3): FUZZ = 18
|
||||||
ifdef HAVE_NEON
|
|
||||||
fate-mp3-float-conf-hecommon: FUZZ = 0.70
|
|
||||||
endif
|
|
||||||
|
|
||||||
FATE_MP3-$(call DEMDEC, MP3, MP3FLOAT) += $(FATE_MP3)
|
FATE_MP3-$(call DEMDEC, MP3, MP3FLOAT) += $(FATE_MP3)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user