diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-31 11:56:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-31 11:56:42 +0200 |
| commit | 814d4c4c94c761c42b40004cc36d2f3bb1303da7 (patch) | |
| tree | aca9b3851fd200e4f8eba3cbaf9769fdba5f4cdc /tests/fate/mp3.mak | |
| parent | c1bfb99ff2445c7f3ba319ea342dd8004345d67a (diff) | |
| parent | a0797950527120c85263c910eb6ba08fddcfdcb3 (diff) | |
| download | ffmpeg-814d4c4c94c761c42b40004cc36d2f3bb1303da7.tar.gz | |
Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
fate/mp3: specify the number of output samples instead of filesize
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests/fate/mp3.mak')
| -rw-r--r-- | tests/fate/mp3.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index a7b46c0969..22d4f05b93 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -3,27 +3,27 @@ fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-c fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl_2.pcm 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 -fs 343296 +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: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm 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 -fs 942336 +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: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm 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 -fs 343296 +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: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm FATE_MP3 += fate-mp3-float-conf-hecommon -fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -fs 133632 +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: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm FATE_MP3 += fate-mp3-float-conf-si -fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -fs 269568 +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: REF = $(SAMPLES)/mp3-conformance/si.pcm 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 -fs 145152 +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: REF = $(SAMPLES)/mp3-conformance/si_block.pcm FATE_MP3 += fate-mp3-float-extra_overread |