mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
5e7d21c7ad
Partially undoes commit 2c4e08d893:
riff: always generate a proper WAVEFORMATEX structure in
ff_put_wav_header
A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.
This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.
Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.
In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
97 lines
5.5 KiB
Makefile
97 lines
5.5 KiB
Makefile
FATE_AFILTER-$(call FILTERDEMDECENCMUX, ADELAY, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-adelay
|
|
fate-filter-adelay: tests/data/asynth-44100-2.wav
|
|
fate-filter-adelay: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
|
|
fate-filter-adelay: CMD = framecrc -i $(SRC) -af adelay=42
|
|
|
|
FATE_AMIX += fate-filter-amix-simple
|
|
fate-filter-amix-simple: CMD = ffmpeg -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
|
|
fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm
|
|
|
|
FATE_AMIX += fate-filter-amix-first
|
|
fate-filter-amix-first: CMD = ffmpeg -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
|
|
fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm
|
|
|
|
FATE_AMIX += fate-filter-amix-transition
|
|
fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav
|
|
fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav
|
|
fate-filter-amix-transition: CMD = ffmpeg -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le -
|
|
fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm
|
|
|
|
FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX)
|
|
$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav
|
|
$(FATE_AMIX): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
|
|
$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav
|
|
$(FATE_AMIX): CMP = oneoff
|
|
$(FATE_AMIX): CMP_UNIT = f32
|
|
|
|
FATE_AFILTER-$(call FILTERDEMDECMUX, ASYNCTS, FLV, NELLYMOSER, PCM_S16LE) += fate-filter-asyncts
|
|
fate-filter-asyncts: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
|
|
fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
|
|
fate-filter-asyncts: CMP = oneoff
|
|
fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont-async-v3.pcm
|
|
|
|
FATE_FILTER-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample
|
|
fate-filter-aresample: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
|
|
fate-filter-aresample: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0
|
|
fate-filter-aresample: CMP = oneoff
|
|
fate-filter-aresample: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
|
|
|
|
FATE_ATRIM += fate-filter-atrim-duration
|
|
fate-filter-atrim-duration: CMD = framecrc -i $(SRC) -af atrim=start=0.1:duration=0.01
|
|
FATE_ATRIM += fate-filter-atrim-mixed
|
|
fate-filter-atrim-mixed: CMD = framecrc -i $(SRC) -af atrim=start=0.05:start_sample=1025:end=0.1:end_sample=4411
|
|
|
|
FATE_ATRIM += fate-filter-atrim-samples
|
|
fate-filter-atrim-samples: CMD = framecrc -i $(SRC) -af atrim=start_sample=26:end_sample=80
|
|
|
|
FATE_ATRIM += fate-filter-atrim-time
|
|
fate-filter-atrim-time: CMD = framecrc -i $(SRC) -af atrim=0.1:0.2
|
|
|
|
$(FATE_ATRIM): tests/data/asynth-44100-2.wav
|
|
$(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_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 = 49ed4aaec717f1b28137c9e1f01f343b
|
|
|
|
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
|
|
fate-filter-channelsplit: tests/data/asynth-44100-2.wav
|
|
fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le
|
|
fate-filter-channelsplit: CMP = oneline
|
|
fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597
|
|
|
|
FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join
|
|
fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
|
|
fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav
|
|
fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav
|
|
fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le
|
|
fate-filter-join: CMP = oneline
|
|
fate-filter-join: REF = 88b0d24a64717ba8635b29e8dac6ecd8
|
|
|
|
FATE_AFILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += fate-filter-volume
|
|
fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
|
|
fate-filter-volume: tests/data/asynth-44100-2.wav
|
|
fate-filter-volume: CMD = md5 -i $(SRC) -af aperms=random,volume=precision=fixed:volume=0.5 -f s16le
|
|
fate-filter-volume: CMP = oneline
|
|
fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4
|
|
|
|
FATE_SAMPLES_AVCONV += $(FATE_AFILTER-yes)
|
|
fate-afilter: $(FATE_AFILTER-yes)
|