From ebacc5ae5e5b2ba31ce067600bf3c559066a7ea3 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Wed, 16 Nov 2016 10:54:43 +0100 Subject: [PATCH] hfp test: mode input to data, generated files to results --- test/hfp/.gitignore | 1 + test/hfp/Makefile | 2 +- test/hfp/cvsd_plc_test.c | 28 +++++++++--------- test/hfp/data/{input => }/fanfare_mono.wav | Bin .../data/{input => }/fanfare_test-44khz.wav | Bin .../data/{input => }/fanfare_test-8khz.wav | Bin test/hfp/data/{input => }/sco_input.wav | Bin 7 files changed, 16 insertions(+), 15 deletions(-) rename test/hfp/data/{input => }/fanfare_mono.wav (100%) rename test/hfp/data/{input => }/fanfare_test-44khz.wav (100%) rename test/hfp/data/{input => }/fanfare_test-8khz.wav (100%) rename test/hfp/data/{input => }/sco_input.wav (100%) diff --git a/test/hfp/.gitignore b/test/hfp/.gitignore index f8daadeae..e87586c3a 100644 --- a/test/hfp/.gitignore +++ b/test/hfp/.gitignore @@ -3,3 +3,4 @@ hfp_ag_client_test hfp_hf_parser_test hfp_ag_parser_test cvsd_plc_test +results/* diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 884372219..1126524c0 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -61,7 +61,7 @@ EXAMPLES = hfp_ag_parser_test hfp_ag_client_test hfp_hf_parser_test hfp_hf_clien all: ${EXAMPLES} clean: - rm -rf *.o $(EXAMPLES) $(CLIENT_EXAMPLES) *.dSYM *.wav data/*.wav + rm -rf *.o $(EXAMPLES) $(CLIENT_EXAMPLES) *.dSYM *.wav results/* hfp_ag_parser_test: ${COMMON_OBJ} hfp_gsm_model.o hfp_ag.o hfp.o hfp_ag_parser_test.c ${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@ diff --git a/test/hfp/cvsd_plc_test.c b/test/hfp/cvsd_plc_test.c index f2c983788..7cd6a39f6 100644 --- a/test/hfp/cvsd_plc_test.c +++ b/test/hfp/cvsd_plc_test.c @@ -161,31 +161,31 @@ TEST(CVSD_PLC, CountEqBytes){ TEST(CVSD_PLC, TestLiveWavFile){ int corruption_step = 10; - introduce_bad_frames_to_wav_file("data/input/sco_input.wav", "data/sco_input.wav", 0); - introduce_bad_frames_to_wav_file("data/input/sco_input.wav", "data/sco_input_with_bad_frames.wav", corruption_step); + introduce_bad_frames_to_wav_file("data/input/sco_input.wav", "results/sco_input.wav", 0); + introduce_bad_frames_to_wav_file("data/input/sco_input.wav", "results/sco_input_with_bad_frames.wav", corruption_step); - mark_bad_frames_wav_file("data/sco_input.wav", "data/sco_input_detected_frames.wav"); - process_wav_file_with_plc("data/sco_input.wav", "data/sco_input_after_plc.wav"); - process_wav_file_with_plc("data/sco_input_with_bad_frames.wav", "data/sco_input_with_bad_frames_after_plc.wav"); + mark_bad_frames_wav_file("results/sco_input.wav", "results/sco_input_detected_frames.wav"); + process_wav_file_with_plc("results/sco_input.wav", "results/sco_input_after_plc.wav"); + process_wav_file_with_plc("results/sco_input_with_bad_frames.wav", "results/sco_input_with_bad_frames_after_plc.wav"); } TEST(CVSD_PLC, TestFanfareFile){ int corruption_step = 10; - introduce_bad_frames_to_wav_file("data/input/fanfare_mono.wav", "data/fanfare_mono.wav", 0); - introduce_bad_frames_to_wav_file("data/fanfare_mono.wav", "data/fanfare_mono_with_bad_frames.wav", corruption_step); + introduce_bad_frames_to_wav_file("data/input/fanfare_mono.wav", "results/fanfare_mono.wav", 0); + introduce_bad_frames_to_wav_file("results/fanfare_mono.wav", "results/fanfare_mono_with_bad_frames.wav", corruption_step); - mark_bad_frames_wav_file("data/fanfare_mono.wav", "data/fanfare_mono_detected_frames.wav"); - process_wav_file_with_plc("data/fanfare_mono.wav", "data/fanfare_mono_after_plc.wav"); - process_wav_file_with_plc("data/fanfare_mono_with_bad_frames.wav", "data/fanfare_mono_with_bad_frames_after_plc.wav"); + mark_bad_frames_wav_file("results/fanfare_mono.wav", "results/fanfare_mono_detected_frames.wav"); + process_wav_file_with_plc("results/fanfare_mono.wav", "results/fanfare_mono_after_plc.wav"); + process_wav_file_with_plc("results/fanfare_mono_with_bad_frames.wav", "results/fanfare_mono_with_bad_frames_after_plc.wav"); } TEST(CVSD_PLC, TestSineWave){ int corruption_step = 10; - create_sine_wav("data/sine_test.wav"); - introduce_bad_frames_to_wav_file("data/sine_test.wav", "data/sine_test_with_bad_frames.wav", corruption_step); + create_sine_wav("results/sine_test.wav"); + introduce_bad_frames_to_wav_file("results/sine_test.wav", "results/sine_test_with_bad_frames.wav", corruption_step); - process_wav_file_with_plc("data/sine_test.wav", "data/sine_test_after_plc.wav"); - process_wav_file_with_plc("data/sine_test_with_bad_frames.wav", "data/sine_test_with_bad_frames_after_plc.wav"); + process_wav_file_with_plc("results/sine_test.wav", "results/sine_test_after_plc.wav"); + process_wav_file_with_plc("results/sine_test_with_bad_frames.wav", "results/sine_test_with_bad_frames_after_plc.wav"); } int main (int argc, const char * argv[]){ diff --git a/test/hfp/data/input/fanfare_mono.wav b/test/hfp/data/fanfare_mono.wav similarity index 100% rename from test/hfp/data/input/fanfare_mono.wav rename to test/hfp/data/fanfare_mono.wav diff --git a/test/hfp/data/input/fanfare_test-44khz.wav b/test/hfp/data/fanfare_test-44khz.wav similarity index 100% rename from test/hfp/data/input/fanfare_test-44khz.wav rename to test/hfp/data/fanfare_test-44khz.wav diff --git a/test/hfp/data/input/fanfare_test-8khz.wav b/test/hfp/data/fanfare_test-8khz.wav similarity index 100% rename from test/hfp/data/input/fanfare_test-8khz.wav rename to test/hfp/data/fanfare_test-8khz.wav diff --git a/test/hfp/data/input/sco_input.wav b/test/hfp/data/sco_input.wav similarity index 100% rename from test/hfp/data/input/sco_input.wav rename to test/hfp/data/sco_input.wav