diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-22 19:14:01 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-23 21:14:58 +0200 |
| commit | 53253a0b83f1e9cfb6cc08a62364051ff5d69c09 (patch) | |
| tree | a8e9ea08cfb707de503e54f891779d7433193206 /tests | |
| parent | 068d0b4e2503649cbf35524466e96f17f45327fa (diff) | |
| download | ffmpeg-53253a0b83f1e9cfb6cc08a62364051ff5d69c09.tar.gz | |
Simplify asynth sample generation.
One rule can be used to generate all asynth files.
Requires renaming the mapchan files though.
Also switch to using the .wav variants for mapchan
while changing the name anyway, this allows getting rid
of the explicitly specified format.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 12 | ||||
| -rw-r--r-- | tests/fate/mapchan.mak | 12 |
2 files changed, 7 insertions, 17 deletions
diff --git a/tests/Makefile b/tests/Makefile index 9b88c06f82..4d794586a1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -26,20 +26,10 @@ tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) | tests/vsynth2 tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ -tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) | tests/data - $(M)./$< $@ 16000 1 - +tests/data/asynth-%.sw \ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ $(subst -, ,$*) -tests/data/mapchan-6ch.sw: tests/audiogen$(HOSTEXESUF) - @mkdir -p tests/data - $(M)./$< $@ 22050 6 - -tests/data/mapchan-mono.sw: tests/audiogen$(HOSTEXESUF) - @mkdir -p tests/data - $(M)./$< $@ 22050 1 - tests/data/%.sw tests/data/asynth% tests/vsynth%/00.pgm: TAG = GEN include $(SRC_PATH)/tests/fate/aac.mak diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index ebc7ee36ea..20153b7438 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -1,14 +1,14 @@ FATE_MAPCHAN += fate-mapchan-6ch-extract-2 -fate-mapchan-6ch-extract-2: tests/data/mapchan-6ch.sw -fate-mapchan-6ch-extract-2: CMD = avconv -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: +fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav +fate-mapchan-6ch-extract-2: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono -fate-mapchan-6ch-extract-2-downmix-mono: tests/data/mapchan-6ch.sw -fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -ar 22050 -ac 6 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav +fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav +fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav FATE_MAPCHAN += fate-mapchan-silent-mono -fate-mapchan-silent-mono: tests/data/mapchan-mono.sw -fate-mapchan-silent-mono: CMD = md5 -ar 22050 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/mapchan-mono.sw -map_channel -1 -map_channel 0.0.0 -f wav +fate-mapchan-silent-mono: tests/data/asynth-22050-1.wav +fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.wav -map_channel -1 -map_channel 0.0.0 -f wav FATE_TESTS += $(FATE_MAPCHAN) fate-mapchan: $(FATE_MAPCHAN) |