Merge commit '13164e479f1c87829096c19003d2cc658ccc1fd4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:12:46 +0000 (14:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:24:09 +0000 (14:24 +0200)
* commit '13164e479f1c87829096c19003d2cc658ccc1fd4':
  FATE: add tests for more resampling modes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/libavresample.mak

@@@ -46,9 -46,23 +46,23 @@@ $(call CROSS_TEST,$(SAMPLERATES),RESAMP
  $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,fltp,f32le,f32)
  $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,dblp,f64le,f64)
  
 -fate-lavr-resample-linear: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -ar 48000 -filter_size 32 -linear_interp 1 -f s16le -af atrim=end_sample=10240 -
+ FATE_LAVR_RESAMPLE += fate-lavr-resample-linear
+ fate-lavr-resample-linear: tests/data/asynth-44100-1.wav
 -fate-lavr-resample-nearest: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-48000-1.wav -ar 44100 -filter_size 0 -phase_shift 0 -f s16le -af atrim=end_sample=10240 -
++fate-lavr-resample-linear: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -ar 48000 -filter_size 32 -linear_interp 1 -f s16le -af atrim=end_sample=10240 -
+ fate-lavr-resample-linear: CMP = oneoff
+ fate-lavr-resample-linear: CMP_UNIT = s16
+ fate-lavr-resample-linear: REF = $(SAMPLES)/lavr/lavr-resample-linear
+ FATE_LAVR_RESAMPLE += fate-lavr-resample-nearest
+ fate-lavr-resample-nearest: tests/data/asynth-48000-1.wav
++fate-lavr-resample-nearest: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-48000-1.wav -ar 44100 -filter_size 0 -phase_shift 0 -f s16le -af atrim=end_sample=10240 -
+ fate-lavr-resample-nearest: CMP = oneoff
+ fate-lavr-resample-nearest: CMP_UNIT = s16
+ fate-lavr-resample-nearest: REF = $(SAMPLES)/lavr/lavr-resample-nearest
  FATE_LAVR_RESAMPLE-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_RESAMPLE)
  fate-lavr-resample: $(FATE_LAVR_RESAMPLE-yes)
 -FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
 +#FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
  
  FATE_SAMPLES_AVCONV += $(FATE_LAVR)
  fate-lavr: $(FATE_LAVR)