diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 10:09:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 10:35:26 +0200 |
| commit | f1ca40ee00402102046fc7e59606651930436b0e (patch) | |
| tree | d64b21cfabf26f3a2b1a3208745b6cc7e7081a26 /tests/fate/ac3.mak | |
| parent | ab94d1be7a32f6d3714935ad5ae551a753024ae6 (diff) | |
| parent | 1c56cdad337a39951f26b17bdc8068d75a19ffca (diff) | |
| download | ffmpeg-f1ca40ee00402102046fc7e59606651930436b0e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: Add SVQ3 fourcc
fate: ac3: add 4.0 and downmix tests
configure: x86: improve ebp availability check
vorbisdec: ensure FASTDIV denominator is never 1
avformat: refactor avformat_close_input
avformat: simplify avformat_close_input
Conflicts:
configure
libavcodec/vorbisdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/ac3.mak')
| -rw-r--r-- | tests/fate/ac3.mak | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 5bbf6785aa..b16687ea4d 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -3,11 +3,36 @@ fate-ac3-2.0: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3 fate-ac3-2.0: CMP = oneoff fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small.pcm +FATE_AC3 += fate-ac3-4.0 +fate-ac3-4.0: CMD = pcm -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0: CMP = oneoff +fate-ac3-4.0: REF = $(SAMPLES)/ac3/millers_crossing_4.0.pcm + +FATE_AC3 += fate-ac3-4.0-downmix-mono +fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-mono: CMP = oneoff +fate-ac3-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono.pcm + +FATE_AC3 += fate-ac3-4.0-downmix-stereo +fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-stereo: CMP = oneoff +fate-ac3-4.0-downmix-stereo: REF = $(SAMPLES)/ac3/millers_crossing_4.0_stereo.pcm + FATE_AC3 += fate-ac3-5.1 fate-ac3-5.1: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1: CMP = oneoff fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small.pcm +FATE_AC3 += fate-ac3-5.1-downmix-mono +fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-mono: CMP = oneoff +fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono.pcm + +FATE_AC3 += fate-ac3-5.1-downmix-stereo +fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-stereo: CMP = oneoff +fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo.pcm + FATE_AC3 += fate-eac3-1 fate-eac3-1: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3 fate-eac3-1: CMP = oneoff |