diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:29:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:48:00 +0200 |
| commit | 17e4b0644b5ad13733bd863b14ab11ffa955009c (patch) | |
| tree | 46cc4748ea765ca0553bac23a49d502c9aed5038 /tests/fate/acodec.mak | |
| parent | eb19d89d8eb51f20299d59558d69d0f057583e7c (diff) | |
| parent | 292d1e78743855404c7d07e3e7cb3f9c9ae6275b (diff) | |
| download | ffmpeg-17e4b0644b5ad13733bd863b14ab11ffa955009c.tar.gz | |
Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
fate: dependencies for acodec tests
fate: dependencies for vsynth tests
fate: add macros useful for conditionally enabling things
libmp3lame: resize the output buffer if needed
Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/acodec.mak')
| -rw-r--r-- | tests/fate/acodec.mak | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 31f34418f3..c52c1d2ee3 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -3,15 +3,22 @@ fate-acodec-%: SRC = tests/data/asynth-44100-2.wav fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep fate-acodec-%: CMP_UNIT = 2 -FATE_ACODEC_PCM = alaw mulaw \ - s8 u8 \ - s16be s16le \ - s24be s24le \ - s32be s32le \ - f32be f32le \ - f64be f64le - -FATE_ACODEC += $(FATE_ACODEC_PCM:%=fate-acodec-pcm-%) +FATE_ACODEC_PCM-$(call ENCDEC, PCM_ALAW, WAV) += alaw +FATE_ACODEC_PCM-$(call ENCDEC, PCM_MULAW, WAV) += mulaw +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8, MOV) += s8 +FATE_ACODEC_PCM-$(call ENCDEC, PCM_U8, WAV) += u8 +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE, MOV) += s16be +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE, WAV) += s16le +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24BE, MOV) += s24be +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE, WAV) += s24le +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32BE, MOV) += s32be +FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE, WAV) += s32le +FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32BE, AU) += f32be +FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32LE, WAV) += f32le +FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64BE, AU) += f64be +FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64LE, WAV) += f64le + +FATE_ACODEC += $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%) fate-acodec-pcm-%: FMT = wav fate-acodec-pcm-%: CODEC = pcm_$(@:fate-acodec-pcm-%=%) @@ -20,8 +27,14 @@ fate-acodec-pcm-s8: FMT = mov fate-acodec-pcm-s%be: FMT = mov fate-acodec-pcm-f%be: FMT = au -FATE_ACODEC_ADPCM = adx ima_qt ima_wav ms swf yamaha -FATE_ACODEC += $(FATE_ACODEC_ADPCM:%=fate-acodec-adpcm-%) +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ADX, ADX) += adx +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_MS, WAV) += ms +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, FLV) += swf +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha + +FATE_ACODEC += $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) fate-acodec-adpcm-%: CODEC = adpcm_$(@:fate-acodec-adpcm-%=%) @@ -32,11 +45,11 @@ fate-acodec-adpcm-ms: FMT = wav fate-acodec-adpcm-swf: FMT = flv fate-acodec-adpcm-yamaha: FMT = wav -FATE_ACODEC += fate-acodec-mp2 +FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2 fate-acodec-mp2: FMT = mp2 fate-acodec-mp2: CMP_SHIFT = -1924 -FATE_ACODEC += fate-acodec-alac +FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac fate-acodec-alac: FMT = mov fate-acodec-alac: CODEC = alac -compression_level 1 @@ -55,7 +68,7 @@ fate-acodec-dca2: CMP_SHIFT = -1920 fate-acodec-dca2: CMP_TARGET = 2424 fate-acodec-dca2: SIZE_TOLERANCE = 544 -FATE_ACODEC += fate-acodec-flac +FATE_ACODEC-$(call ENCDEC, FLAC, FLAC) += fate-acodec-flac fate-acodec-flac: FMT = flac fate-acodec-flac: CODEC = flac -compression_level 2 @@ -82,6 +95,8 @@ fate-acodec-roqaudio: CODEC = roq_dpcm fate-acodec-roqaudio: ENCOPTS = -ar 22050 fate-acodec-roqaudio: DECOPTS = -ar 44100 +FATE_ACODEC += $(FATE_ACODEC-yes) + $(FATE_ACODEC): tests/data/asynth-44100-2.wav FATE_AVCONV += $(FATE_ACODEC) |