ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 14:58:58 2016 +0200| [093e06f2d6871a94e673f0ec067873f9d745be3d] | committer: Hendrik Leppkes
Merge commit '07377fb557909015338b4c215b87b9c73ea577ad' * commit '07377fb557909015338b4c215b87b9c73ea577ad': fate: More fine-grained dependencies for voice codec tests Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=093e06f2d6871a94e673f0ec067873f9d745be3d --- tests/fate/voice.mak | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 7389c43..f3a2892 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -7,7 +7,7 @@ fate-g722-encode: SRC = tests/data/asynth-16000-1.wav fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722 FATE_VOICE-yes += $(FATE_G722-yes) -fate-g722: $(FATE_G722) +fate-g722: $(FATE_G722-yes) FATE_G723_1 += fate-g723_1-dec-1 fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/ineqd53.tco @@ -33,8 +33,7 @@ fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx6 FATE_G723_1 += fate-g723_1-dec-8 fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63e.tco -FATE_G723_1-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) -FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes) +FATE_VOICE-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) fate-g723_1: $(FATE_G723_1) FATE_G726 += fate-g726-encode-2bit @@ -62,7 +61,7 @@ FATE_GSM-$(call DEMDEC, MOV, GSM) += fate-gsm-toast fate-gsm-toast: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/sample-gsm-8000.mov -t 10 FATE_VOICE-yes += $(FATE_GSM-yes) -fate-gsm: $(FATE_GSM) +fate-gsm: $(FATE_GSM-yes) FATE_VOICE-$(call DEMDEC, QCP, QCELP) += fate-qcelp fate-qcelp: CMD = pcm -i $(TARGET_SAMPLES)/qcp/0036580847.QCP ====================================================================== diff --cc tests/fate/voice.mak index 7389c43,84f380d..f3a2892 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@@ -1,13 -1,13 +1,13 @@@ FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1 fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722 -FATE_G722-$(call ENCDEC, ADPCM_G722, G722) += fate-g722-encode +FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode fate-g722-encode: tests/data/asynth-16000-1.wav fate-g722-encode: SRC = tests/data/asynth-16000-1.wav -fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722 +fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722 -FATE_SAMPLES_AVCONV += $(FATE_G722-yes) +FATE_VOICE-yes += $(FATE_G722-yes) - fate-g722: $(FATE_G722) + fate-g722: $(FATE_G722-yes) FATE_G723_1 += fate-g723_1-dec-1 fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/ineqd53.tco @@@ -33,8 -33,7 +33,7 @@@ fate-g723_1-dec-7: CMD = framecrc -post FATE_G723_1 += fate-g723_1-dec-8 fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63e.tco - FATE_G723_1-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) - FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) ++FATE_VOICE-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) fate-g723_1: $(FATE_G723_1) FATE_G726 += fate-g726-encode-2bit @@@ -61,10 -60,10 +60,10 @@@ fate-gsm-ms: CMD = framecrc -i $(TARGET FATE_GSM-$(call DEMDEC, MOV, GSM) += fate-gsm-toast fate-gsm-toast: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/sample-gsm-8000.mov -t 10 -FATE_SAMPLES_AVCONV += $(FATE_GSM-yes) +FATE_VOICE-yes += $(FATE_GSM-yes) - fate-gsm: $(FATE_GSM) + fate-gsm: $(FATE_GSM-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, QCP, QCELP) += fate-qcelp +FATE_VOICE-$(call DEMDEC, QCP, QCELP) += fate-qcelp fate-qcelp: CMD = pcm -i $(TARGET_SAMPLES)/qcp/0036580847.QCP fate-qcelp: CMP = oneoff fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
