diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:32:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:32:47 +0100 |
| commit | 267c5723e08e04346e447b1e58cf81c80b13f799 (patch) | |
| tree | e0b6ac732fc9e84beeae5bd22583bbe9e9bb1c82 /tests | |
| parent | c198af648a2ab800abe9259f420a4b38059c3f18 (diff) | |
| parent | a84c8af042f3b42f23cdcc51c34155647270d689 (diff) | |
| download | ffmpeg-267c5723e08e04346e447b1e58cf81c80b13f799.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Conflicts:
tests/fate/filter-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter-audio.mak | 24 | ||||
| -rw-r--r-- | tests/filtergraphs/channelmap_one_int (renamed from tests/filtergraphs/channelmap) | 0 | ||||
| -rw-r--r-- | tests/filtergraphs/channelmap_one_str | 1 |
3 files changed, 18 insertions, 7 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 84c4b0d0de..92cdda81a9 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -52,13 +52,23 @@ $(FATE_ATRIM): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM) -FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap -fate-filter-channelmap: tests/data/filtergraphs/channelmap -fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav -fate-filter-channelmap: tests/data/asynth-44100-6.wav -fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap -f wav -flags +bitexact -fate-filter-channelmap: CMP = oneline -fate-filter-channelmap: REF = 06168d06085e2c0603e4e118ba4cade2 +FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-int +fate-filter-channelmap-one-int: tests/data/filtergraphs/channelmap_one_int +fate-filter-channelmap-one-int: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav +fate-filter-channelmap-one-int: tests/data/asynth-44100-6.wav +fate-filter-channelmap-one-int: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_int -f wav -flags +bitexact +fate-filter-channelmap-one-int: CMP = oneline +fate-filter-channelmap-one-int: REF = 06168d06085e2c0603e4e118ba4cade2 + +FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-str +fate-filter-channelmap-one-str: tests/data/filtergraphs/channelmap_one_str +fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav +fate-filter-channelmap-one-str: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -flags +bitexact +fate-filter-channelmap-one-str: CMP = oneline +fate-filter-channelmap-one-str: REF = 9fe9bc452282dfd94fd80e9491607a0c + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP) FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav diff --git a/tests/filtergraphs/channelmap b/tests/filtergraphs/channelmap_one_int index e2b61435df..e2b61435df 100644 --- a/tests/filtergraphs/channelmap +++ b/tests/filtergraphs/channelmap_one_int diff --git a/tests/filtergraphs/channelmap_one_str b/tests/filtergraphs/channelmap_one_str new file mode 100644 index 0000000000..3c658fc586 --- /dev/null +++ b/tests/filtergraphs/channelmap_one_str @@ -0,0 +1 @@ +channelmap=map=FR|FL:channel_layout=stereo |