diff options
author | Clément Bœsch <ubitux@gmail.com> | 2011-11-04 18:54:01 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-04 19:40:32 +0100 |
commit | f5cd136f2bcdb69abbd5b8335b247be41259da31 (patch) | |
tree | 14cf22ac81fd14ef0c89a2ba49cb7705fc9fbd6c /tests | |
parent | 682e0eaf148db9479bedb981910aea21ad1827dd (diff) | |
download | ffmpeg-f5cd136f2bcdb69abbd5b8335b247be41259da31.tar.gz |
ffmpeg: add -map_channel option.
Based on an initial work by Baptiste Coudurier.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile | 8 | ||||
-rw-r--r-- | tests/fate2.mak | 12 | ||||
-rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2 | 2 | ||||
-rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2-downmix-mono | 1 | ||||
-rw-r--r-- | tests/ref/fate/mapchan-silent-mono | 1 |
5 files changed, 24 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 93f07a5bce..48e81faeb7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -30,6 +30,14 @@ tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) @mkdir -p tests/data $(M)./$< $@ 16000 1 +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/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN include $(SRC_PATH)/tests/fate.mak diff --git a/tests/fate2.mak b/tests/fate2.mak index 376a0196b6..ad565b79e7 100644 --- a/tests/fate2.mak +++ b/tests/fate2.mak @@ -137,6 +137,18 @@ FATE_TESTS += fate-g722enc fate-g722enc: tests/data/asynth-16000-1.sw fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722 +FATE_TESTS += 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 -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_TESTS += 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 -i $(TARGET_PATH)/tests/data/mapchan-6ch.sw -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav + +FATE_TESTS += fate-mapchan-silent-mono +fate-mapchan-silent-mono: tests/data/mapchan-mono.sw +fate-mapchan-silent-mono: CMD = md5 -ar 22050 -ac 1 -i $(TARGET_PATH)/tests/data/mapchan-mono.sw -map_channel -1 -map_channel 0.0.0 -f wav + FATE_TESTS += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an diff --git a/tests/ref/fate/mapchan-6ch-extract-2 b/tests/ref/fate/mapchan-6ch-extract-2 new file mode 100644 index 0000000000..98c854069c --- /dev/null +++ b/tests/ref/fate/mapchan-6ch-extract-2 @@ -0,0 +1,2 @@ +6f091fe8c0be88c75921731dc9f74314 +5c2d162b9024329eb367295d37b8ca0a diff --git a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono new file mode 100644 index 0000000000..f42de0c954 --- /dev/null +++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono @@ -0,0 +1 @@ +959645ed73e6d08d8f1e947eac5d0b92 diff --git a/tests/ref/fate/mapchan-silent-mono b/tests/ref/fate/mapchan-silent-mono new file mode 100644 index 0000000000..a867e3b432 --- /dev/null +++ b/tests/ref/fate/mapchan-silent-mono @@ -0,0 +1 @@ +4f5148f08587a4b9794aa52aec7852ac |