From 9dc45dad1b14680f2ae0ae75dc497250e9ecd384 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 23 May 2012 15:39:01 +0000 Subject: [PATCH] Move trunk/test/data -> trunk/data BUG= TEST=all trybot test failures passed locally Review URL: https://webrtc-codereview.appspot.com/583007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2280 4adac7df-926f-26a2-2b94-8c16560cd09d --- {test/data => data}/audio_coding/F00.BIT20 | Bin {test/data => data}/audio_coding/F00.BIT30 | Bin {test/data => data}/audio_coding/F00.INP | Bin {test/data => data}/audio_coding/F00.OUT20 | Bin {test/data => data}/audio_coding/F00.OUT30 | Bin .../audio_coding/F00_tlm10.OUT20 | Bin .../audio_coding/F00_tlm10.OUT30 | Bin {test/data => data}/audio_coding/F01.BIT20 | Bin {test/data => data}/audio_coding/F01.BIT30 | Bin {test/data => data}/audio_coding/F01.INP | Bin {test/data => data}/audio_coding/F01.OUT20 | Bin {test/data => data}/audio_coding/F01.OUT30 | Bin .../audio_coding/F01_tlm10.OUT20 | Bin .../audio_coding/F01_tlm10.OUT30 | Bin {test/data => data}/audio_coding/F02.BIT20 | Bin {test/data => data}/audio_coding/F02.BIT30 | Bin {test/data => data}/audio_coding/F02.INP | Bin {test/data => data}/audio_coding/F02.OUT20 | Bin {test/data => data}/audio_coding/F02.OUT30 | Bin .../audio_coding/F02_tlm10.OUT20 | Bin .../audio_coding/F02_tlm10.OUT30 | Bin {test/data => data}/audio_coding/F03.BIT20 | Bin {test/data => data}/audio_coding/F03.BIT30 | Bin {test/data => data}/audio_coding/F03.INP | Bin {test/data => data}/audio_coding/F03.OUT20 | Bin {test/data => data}/audio_coding/F03.OUT30 | Bin {test/data => data}/audio_coding/F04.BIT20 | Bin {test/data => data}/audio_coding/F04.BIT30 | Bin {test/data => data}/audio_coding/F04.INP | Bin {test/data => data}/audio_coding/F04.OUT20 | Bin {test/data => data}/audio_coding/F04.OUT30 | Bin {test/data => data}/audio_coding/F05.BIT20 | Bin {test/data => data}/audio_coding/F05.BIT30 | Bin {test/data => data}/audio_coding/F05.INP | Bin {test/data => data}/audio_coding/F05.OUT20 | Bin {test/data => data}/audio_coding/F05.OUT30 | Bin {test/data => data}/audio_coding/F06.BIT20 | Bin {test/data => data}/audio_coding/F06.BIT30 | Bin {test/data => data}/audio_coding/F06.INP | Bin {test/data => data}/audio_coding/F06.OUT20 | Bin {test/data => data}/audio_coding/F06.OUT30 | Bin {test/data => data}/audio_coding/READ.ME | 0 {test/data => data}/audio_coding/clean.chn | Bin .../audio_coding/testfile32kHz.pcm | Bin .../audio_coding/teststereo32kHz.pcm | Bin {test/data => data}/audio_coding/tlm10.chn | Bin .../data => data}/audio_coding/universal.rtp | Bin .../audio_coding/universal_ref.pcm | Bin .../audio_device/audio_short16.pcm | Bin .../audio_device/audio_short44.pcm | Bin .../audio_device/audio_short48.pcm | Bin .../audio_device/audio_short8.pcm | Bin .../android/output_data_fixed.pb | Bin .../android/output_data_float.pb | Bin .../audio_processing/output_data_fixed.pb | Bin .../audio_processing/output_data_float.pb | Bin .../common_video/jpeg/webrtc_logo.jpg | Bin .../rtp_rtcp/H263Foreman_CIF_Iframe.bin | Bin .../rtp_rtcp/H263Foreman_CIF_Pframe.bin | Bin .../rtp_rtcp/H263_CIF_IFRAME.bin | Bin .../rtp_rtcp/H263_CIF_PFRAME.bin | Bin .../rtp_rtcp/H263_QCIF_IFRAME.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR0.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR1.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR2.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR3.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR4.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR4_1.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR4_2.bin | Bin .../rtp_rtcp/RTCPPacketTMMBR5.bin | Bin .../voice_engine/audio_long16.pcm | Bin .../voice_engine/audio_long16.wav | Bin .../voice_engine/audio_long16big_endian.pcm | Bin .../voice_engine/audio_long16noise.pcm | Bin .../voice_engine/audio_long8.pcm | Bin .../voice_engine/audio_long8mulaw.wav | Bin .../voice_engine/audio_short16.pcm | Bin .../voice_engine/audio_tiny11.wav | Bin .../voice_engine/audio_tiny16.wav | Bin .../voice_engine/audio_tiny22.wav | Bin .../voice_engine/audio_tiny32.wav | Bin .../voice_engine/audio_tiny44.wav | Bin .../voice_engine/audio_tiny48.wav | Bin .../voice_engine/audio_tiny8.wav | Bin .../stereo_rtp_files/HRTF_pcm16wb.rtp | Bin .../stereo_rtp_files/HRTF_pcm16wb_jitter.rtp | Bin .../voice_engine/stereo_rtp_files/README.txt | 0 .../stereo_rtp_files/hrtf_g722_1C_48.rtp | Bin .../hrtf_g722_1C_48_jitterT2.rtp | Bin .../voice_engine/stereo_rtp_files/rtpplay.exe | Bin .../stereo_rtp_files/stereo_g729.rtp | Bin .../stereo_rtp_files/stereo_g729_jitter.rtp | Bin .../stereo_rtp_files/stereo_pcm16wb.rtp | Bin .../stereo_pcm16wb_jitter.rtp | Bin .../stereo_rtp_files/stereo_pcmu.rtp | Bin .../stereo_rtp_files/stereo_pcmu_jitter.rtp | Bin .../stereo_rtp_files/stereo_pcmu_vad.rtp | Bin .../stereo_pcmu_vad_jitter.rtp | Bin .../toggling_stereo_g729_pt18_pt125.rtp | Bin src/common_video/jpeg/jpeg_unittest.cc | 2 +- .../codecs/ilbc/test/iLBCtestscript.txt | 2 +- src/modules/audio_coding/main/test/APITest.cc | 4 +-- .../main/test/EncodeDecodeTest.cc | 6 ++-- .../audio_coding/main/test/SpatialAudio.cc | 2 +- .../audio_coding/main/test/TestAllCodecs.cc | 2 +- src/modules/audio_coding/main/test/TestFEC.cc | 2 +- .../audio_coding/main/test/TestStereo.cc | 4 +-- .../audio_coding/main/test/TestVADDTX.cc | 2 +- .../main/test/TwoWayCommunication.cc | 8 +++--- .../audio_coding/main/test/iSACTest.cc | 4 +-- .../main/test/func_test_manager.cc | 2 +- .../audio_processing/test/unit_test.cc | 2 +- .../media_file/source/media_file_unittest.cc | 2 +- .../main/test/auto_test/resource_manager.cc | 4 +-- .../main/test/cmd_test/voe_cmd_test.cc | 4 +-- .../main/test/win_test/WinTestDlg.cc | 26 +++++++++--------- 116 files changed, 39 insertions(+), 39 deletions(-) rename {test/data => data}/audio_coding/F00.BIT20 (100%) rename {test/data => data}/audio_coding/F00.BIT30 (100%) rename {test/data => data}/audio_coding/F00.INP (100%) rename {test/data => data}/audio_coding/F00.OUT20 (100%) rename {test/data => data}/audio_coding/F00.OUT30 (100%) rename {test/data => data}/audio_coding/F00_tlm10.OUT20 (100%) rename {test/data => data}/audio_coding/F00_tlm10.OUT30 (100%) rename {test/data => data}/audio_coding/F01.BIT20 (100%) rename {test/data => data}/audio_coding/F01.BIT30 (100%) rename {test/data => data}/audio_coding/F01.INP (100%) rename {test/data => data}/audio_coding/F01.OUT20 (100%) rename {test/data => data}/audio_coding/F01.OUT30 (100%) rename {test/data => data}/audio_coding/F01_tlm10.OUT20 (100%) rename {test/data => data}/audio_coding/F01_tlm10.OUT30 (100%) rename {test/data => data}/audio_coding/F02.BIT20 (100%) rename {test/data => data}/audio_coding/F02.BIT30 (100%) rename {test/data => data}/audio_coding/F02.INP (100%) rename {test/data => data}/audio_coding/F02.OUT20 (100%) rename {test/data => data}/audio_coding/F02.OUT30 (100%) rename {test/data => data}/audio_coding/F02_tlm10.OUT20 (100%) rename {test/data => data}/audio_coding/F02_tlm10.OUT30 (100%) rename {test/data => data}/audio_coding/F03.BIT20 (100%) rename {test/data => data}/audio_coding/F03.BIT30 (100%) rename {test/data => data}/audio_coding/F03.INP (100%) rename {test/data => data}/audio_coding/F03.OUT20 (100%) rename {test/data => data}/audio_coding/F03.OUT30 (100%) rename {test/data => data}/audio_coding/F04.BIT20 (100%) rename {test/data => data}/audio_coding/F04.BIT30 (100%) rename {test/data => data}/audio_coding/F04.INP (100%) rename {test/data => data}/audio_coding/F04.OUT20 (100%) rename {test/data => data}/audio_coding/F04.OUT30 (100%) rename {test/data => data}/audio_coding/F05.BIT20 (100%) rename {test/data => data}/audio_coding/F05.BIT30 (100%) rename {test/data => data}/audio_coding/F05.INP (100%) rename {test/data => data}/audio_coding/F05.OUT20 (100%) rename {test/data => data}/audio_coding/F05.OUT30 (100%) rename {test/data => data}/audio_coding/F06.BIT20 (100%) rename {test/data => data}/audio_coding/F06.BIT30 (100%) rename {test/data => data}/audio_coding/F06.INP (100%) rename {test/data => data}/audio_coding/F06.OUT20 (100%) rename {test/data => data}/audio_coding/F06.OUT30 (100%) rename {test/data => data}/audio_coding/READ.ME (100%) rename {test/data => data}/audio_coding/clean.chn (100%) rename {test/data => data}/audio_coding/testfile32kHz.pcm (100%) rename {test/data => data}/audio_coding/teststereo32kHz.pcm (100%) rename {test/data => data}/audio_coding/tlm10.chn (100%) rename {test/data => data}/audio_coding/universal.rtp (100%) rename {test/data => data}/audio_coding/universal_ref.pcm (100%) rename {test/data => data}/audio_device/audio_short16.pcm (100%) rename {test/data => data}/audio_device/audio_short44.pcm (100%) rename {test/data => data}/audio_device/audio_short48.pcm (100%) rename {test/data => data}/audio_device/audio_short8.pcm (100%) rename {test/data => data}/audio_processing/android/output_data_fixed.pb (100%) rename {test/data => data}/audio_processing/android/output_data_float.pb (100%) rename {test/data => data}/audio_processing/output_data_fixed.pb (100%) rename {test/data => data}/audio_processing/output_data_float.pb (100%) rename {test/data => data}/common_video/jpeg/webrtc_logo.jpg (100%) rename {test/data => data}/rtp_rtcp/H263Foreman_CIF_Iframe.bin (100%) rename {test/data => data}/rtp_rtcp/H263Foreman_CIF_Pframe.bin (100%) rename {test/data => data}/rtp_rtcp/H263_CIF_IFRAME.bin (100%) rename {test/data => data}/rtp_rtcp/H263_CIF_PFRAME.bin (100%) rename {test/data => data}/rtp_rtcp/H263_QCIF_IFRAME.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR0.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR1.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR2.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR3.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR4.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR4_1.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR4_2.bin (100%) rename {test/data => data}/rtp_rtcp/RTCPPacketTMMBR5.bin (100%) rename {test/data => data}/voice_engine/audio_long16.pcm (100%) rename {test/data => data}/voice_engine/audio_long16.wav (100%) rename {test/data => data}/voice_engine/audio_long16big_endian.pcm (100%) rename {test/data => data}/voice_engine/audio_long16noise.pcm (100%) rename {test/data => data}/voice_engine/audio_long8.pcm (100%) rename {test/data => data}/voice_engine/audio_long8mulaw.wav (100%) rename {test/data => data}/voice_engine/audio_short16.pcm (100%) rename {test/data => data}/voice_engine/audio_tiny11.wav (100%) rename {test/data => data}/voice_engine/audio_tiny16.wav (100%) rename {test/data => data}/voice_engine/audio_tiny22.wav (100%) rename {test/data => data}/voice_engine/audio_tiny32.wav (100%) rename {test/data => data}/voice_engine/audio_tiny44.wav (100%) rename {test/data => data}/voice_engine/audio_tiny48.wav (100%) rename {test/data => data}/voice_engine/audio_tiny8.wav (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/HRTF_pcm16wb.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/README.txt (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/hrtf_g722_1C_48.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/rtpplay.exe (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_g729.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_g729_jitter.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcm16wb.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcm16wb_jitter.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcmu.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcmu_jitter.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcmu_vad.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp (100%) rename {test/data => data}/voice_engine/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp (100%) diff --git a/test/data/audio_coding/F00.BIT20 b/data/audio_coding/F00.BIT20 similarity index 100% rename from test/data/audio_coding/F00.BIT20 rename to data/audio_coding/F00.BIT20 diff --git a/test/data/audio_coding/F00.BIT30 b/data/audio_coding/F00.BIT30 similarity index 100% rename from test/data/audio_coding/F00.BIT30 rename to data/audio_coding/F00.BIT30 diff --git a/test/data/audio_coding/F00.INP b/data/audio_coding/F00.INP similarity index 100% rename from test/data/audio_coding/F00.INP rename to data/audio_coding/F00.INP diff --git a/test/data/audio_coding/F00.OUT20 b/data/audio_coding/F00.OUT20 similarity index 100% rename from test/data/audio_coding/F00.OUT20 rename to data/audio_coding/F00.OUT20 diff --git a/test/data/audio_coding/F00.OUT30 b/data/audio_coding/F00.OUT30 similarity index 100% rename from test/data/audio_coding/F00.OUT30 rename to data/audio_coding/F00.OUT30 diff --git a/test/data/audio_coding/F00_tlm10.OUT20 b/data/audio_coding/F00_tlm10.OUT20 similarity index 100% rename from test/data/audio_coding/F00_tlm10.OUT20 rename to data/audio_coding/F00_tlm10.OUT20 diff --git a/test/data/audio_coding/F00_tlm10.OUT30 b/data/audio_coding/F00_tlm10.OUT30 similarity index 100% rename from test/data/audio_coding/F00_tlm10.OUT30 rename to data/audio_coding/F00_tlm10.OUT30 diff --git a/test/data/audio_coding/F01.BIT20 b/data/audio_coding/F01.BIT20 similarity index 100% rename from test/data/audio_coding/F01.BIT20 rename to data/audio_coding/F01.BIT20 diff --git a/test/data/audio_coding/F01.BIT30 b/data/audio_coding/F01.BIT30 similarity index 100% rename from test/data/audio_coding/F01.BIT30 rename to data/audio_coding/F01.BIT30 diff --git a/test/data/audio_coding/F01.INP b/data/audio_coding/F01.INP similarity index 100% rename from test/data/audio_coding/F01.INP rename to data/audio_coding/F01.INP diff --git a/test/data/audio_coding/F01.OUT20 b/data/audio_coding/F01.OUT20 similarity index 100% rename from test/data/audio_coding/F01.OUT20 rename to data/audio_coding/F01.OUT20 diff --git a/test/data/audio_coding/F01.OUT30 b/data/audio_coding/F01.OUT30 similarity index 100% rename from test/data/audio_coding/F01.OUT30 rename to data/audio_coding/F01.OUT30 diff --git a/test/data/audio_coding/F01_tlm10.OUT20 b/data/audio_coding/F01_tlm10.OUT20 similarity index 100% rename from test/data/audio_coding/F01_tlm10.OUT20 rename to data/audio_coding/F01_tlm10.OUT20 diff --git a/test/data/audio_coding/F01_tlm10.OUT30 b/data/audio_coding/F01_tlm10.OUT30 similarity index 100% rename from test/data/audio_coding/F01_tlm10.OUT30 rename to data/audio_coding/F01_tlm10.OUT30 diff --git a/test/data/audio_coding/F02.BIT20 b/data/audio_coding/F02.BIT20 similarity index 100% rename from test/data/audio_coding/F02.BIT20 rename to data/audio_coding/F02.BIT20 diff --git a/test/data/audio_coding/F02.BIT30 b/data/audio_coding/F02.BIT30 similarity index 100% rename from test/data/audio_coding/F02.BIT30 rename to data/audio_coding/F02.BIT30 diff --git a/test/data/audio_coding/F02.INP b/data/audio_coding/F02.INP similarity index 100% rename from test/data/audio_coding/F02.INP rename to data/audio_coding/F02.INP diff --git a/test/data/audio_coding/F02.OUT20 b/data/audio_coding/F02.OUT20 similarity index 100% rename from test/data/audio_coding/F02.OUT20 rename to data/audio_coding/F02.OUT20 diff --git a/test/data/audio_coding/F02.OUT30 b/data/audio_coding/F02.OUT30 similarity index 100% rename from test/data/audio_coding/F02.OUT30 rename to data/audio_coding/F02.OUT30 diff --git a/test/data/audio_coding/F02_tlm10.OUT20 b/data/audio_coding/F02_tlm10.OUT20 similarity index 100% rename from test/data/audio_coding/F02_tlm10.OUT20 rename to data/audio_coding/F02_tlm10.OUT20 diff --git a/test/data/audio_coding/F02_tlm10.OUT30 b/data/audio_coding/F02_tlm10.OUT30 similarity index 100% rename from test/data/audio_coding/F02_tlm10.OUT30 rename to data/audio_coding/F02_tlm10.OUT30 diff --git a/test/data/audio_coding/F03.BIT20 b/data/audio_coding/F03.BIT20 similarity index 100% rename from test/data/audio_coding/F03.BIT20 rename to data/audio_coding/F03.BIT20 diff --git a/test/data/audio_coding/F03.BIT30 b/data/audio_coding/F03.BIT30 similarity index 100% rename from test/data/audio_coding/F03.BIT30 rename to data/audio_coding/F03.BIT30 diff --git a/test/data/audio_coding/F03.INP b/data/audio_coding/F03.INP similarity index 100% rename from test/data/audio_coding/F03.INP rename to data/audio_coding/F03.INP diff --git a/test/data/audio_coding/F03.OUT20 b/data/audio_coding/F03.OUT20 similarity index 100% rename from test/data/audio_coding/F03.OUT20 rename to data/audio_coding/F03.OUT20 diff --git a/test/data/audio_coding/F03.OUT30 b/data/audio_coding/F03.OUT30 similarity index 100% rename from test/data/audio_coding/F03.OUT30 rename to data/audio_coding/F03.OUT30 diff --git a/test/data/audio_coding/F04.BIT20 b/data/audio_coding/F04.BIT20 similarity index 100% rename from test/data/audio_coding/F04.BIT20 rename to data/audio_coding/F04.BIT20 diff --git a/test/data/audio_coding/F04.BIT30 b/data/audio_coding/F04.BIT30 similarity index 100% rename from test/data/audio_coding/F04.BIT30 rename to data/audio_coding/F04.BIT30 diff --git a/test/data/audio_coding/F04.INP b/data/audio_coding/F04.INP similarity index 100% rename from test/data/audio_coding/F04.INP rename to data/audio_coding/F04.INP diff --git a/test/data/audio_coding/F04.OUT20 b/data/audio_coding/F04.OUT20 similarity index 100% rename from test/data/audio_coding/F04.OUT20 rename to data/audio_coding/F04.OUT20 diff --git a/test/data/audio_coding/F04.OUT30 b/data/audio_coding/F04.OUT30 similarity index 100% rename from test/data/audio_coding/F04.OUT30 rename to data/audio_coding/F04.OUT30 diff --git a/test/data/audio_coding/F05.BIT20 b/data/audio_coding/F05.BIT20 similarity index 100% rename from test/data/audio_coding/F05.BIT20 rename to data/audio_coding/F05.BIT20 diff --git a/test/data/audio_coding/F05.BIT30 b/data/audio_coding/F05.BIT30 similarity index 100% rename from test/data/audio_coding/F05.BIT30 rename to data/audio_coding/F05.BIT30 diff --git a/test/data/audio_coding/F05.INP b/data/audio_coding/F05.INP similarity index 100% rename from test/data/audio_coding/F05.INP rename to data/audio_coding/F05.INP diff --git a/test/data/audio_coding/F05.OUT20 b/data/audio_coding/F05.OUT20 similarity index 100% rename from test/data/audio_coding/F05.OUT20 rename to data/audio_coding/F05.OUT20 diff --git a/test/data/audio_coding/F05.OUT30 b/data/audio_coding/F05.OUT30 similarity index 100% rename from test/data/audio_coding/F05.OUT30 rename to data/audio_coding/F05.OUT30 diff --git a/test/data/audio_coding/F06.BIT20 b/data/audio_coding/F06.BIT20 similarity index 100% rename from test/data/audio_coding/F06.BIT20 rename to data/audio_coding/F06.BIT20 diff --git a/test/data/audio_coding/F06.BIT30 b/data/audio_coding/F06.BIT30 similarity index 100% rename from test/data/audio_coding/F06.BIT30 rename to data/audio_coding/F06.BIT30 diff --git a/test/data/audio_coding/F06.INP b/data/audio_coding/F06.INP similarity index 100% rename from test/data/audio_coding/F06.INP rename to data/audio_coding/F06.INP diff --git a/test/data/audio_coding/F06.OUT20 b/data/audio_coding/F06.OUT20 similarity index 100% rename from test/data/audio_coding/F06.OUT20 rename to data/audio_coding/F06.OUT20 diff --git a/test/data/audio_coding/F06.OUT30 b/data/audio_coding/F06.OUT30 similarity index 100% rename from test/data/audio_coding/F06.OUT30 rename to data/audio_coding/F06.OUT30 diff --git a/test/data/audio_coding/READ.ME b/data/audio_coding/READ.ME similarity index 100% rename from test/data/audio_coding/READ.ME rename to data/audio_coding/READ.ME diff --git a/test/data/audio_coding/clean.chn b/data/audio_coding/clean.chn similarity index 100% rename from test/data/audio_coding/clean.chn rename to data/audio_coding/clean.chn diff --git a/test/data/audio_coding/testfile32kHz.pcm b/data/audio_coding/testfile32kHz.pcm similarity index 100% rename from test/data/audio_coding/testfile32kHz.pcm rename to data/audio_coding/testfile32kHz.pcm diff --git a/test/data/audio_coding/teststereo32kHz.pcm b/data/audio_coding/teststereo32kHz.pcm similarity index 100% rename from test/data/audio_coding/teststereo32kHz.pcm rename to data/audio_coding/teststereo32kHz.pcm diff --git a/test/data/audio_coding/tlm10.chn b/data/audio_coding/tlm10.chn similarity index 100% rename from test/data/audio_coding/tlm10.chn rename to data/audio_coding/tlm10.chn diff --git a/test/data/audio_coding/universal.rtp b/data/audio_coding/universal.rtp similarity index 100% rename from test/data/audio_coding/universal.rtp rename to data/audio_coding/universal.rtp diff --git a/test/data/audio_coding/universal_ref.pcm b/data/audio_coding/universal_ref.pcm similarity index 100% rename from test/data/audio_coding/universal_ref.pcm rename to data/audio_coding/universal_ref.pcm diff --git a/test/data/audio_device/audio_short16.pcm b/data/audio_device/audio_short16.pcm similarity index 100% rename from test/data/audio_device/audio_short16.pcm rename to data/audio_device/audio_short16.pcm diff --git a/test/data/audio_device/audio_short44.pcm b/data/audio_device/audio_short44.pcm similarity index 100% rename from test/data/audio_device/audio_short44.pcm rename to data/audio_device/audio_short44.pcm diff --git a/test/data/audio_device/audio_short48.pcm b/data/audio_device/audio_short48.pcm similarity index 100% rename from test/data/audio_device/audio_short48.pcm rename to data/audio_device/audio_short48.pcm diff --git a/test/data/audio_device/audio_short8.pcm b/data/audio_device/audio_short8.pcm similarity index 100% rename from test/data/audio_device/audio_short8.pcm rename to data/audio_device/audio_short8.pcm diff --git a/test/data/audio_processing/android/output_data_fixed.pb b/data/audio_processing/android/output_data_fixed.pb similarity index 100% rename from test/data/audio_processing/android/output_data_fixed.pb rename to data/audio_processing/android/output_data_fixed.pb diff --git a/test/data/audio_processing/android/output_data_float.pb b/data/audio_processing/android/output_data_float.pb similarity index 100% rename from test/data/audio_processing/android/output_data_float.pb rename to data/audio_processing/android/output_data_float.pb diff --git a/test/data/audio_processing/output_data_fixed.pb b/data/audio_processing/output_data_fixed.pb similarity index 100% rename from test/data/audio_processing/output_data_fixed.pb rename to data/audio_processing/output_data_fixed.pb diff --git a/test/data/audio_processing/output_data_float.pb b/data/audio_processing/output_data_float.pb similarity index 100% rename from test/data/audio_processing/output_data_float.pb rename to data/audio_processing/output_data_float.pb diff --git a/test/data/common_video/jpeg/webrtc_logo.jpg b/data/common_video/jpeg/webrtc_logo.jpg similarity index 100% rename from test/data/common_video/jpeg/webrtc_logo.jpg rename to data/common_video/jpeg/webrtc_logo.jpg diff --git a/test/data/rtp_rtcp/H263Foreman_CIF_Iframe.bin b/data/rtp_rtcp/H263Foreman_CIF_Iframe.bin similarity index 100% rename from test/data/rtp_rtcp/H263Foreman_CIF_Iframe.bin rename to data/rtp_rtcp/H263Foreman_CIF_Iframe.bin diff --git a/test/data/rtp_rtcp/H263Foreman_CIF_Pframe.bin b/data/rtp_rtcp/H263Foreman_CIF_Pframe.bin similarity index 100% rename from test/data/rtp_rtcp/H263Foreman_CIF_Pframe.bin rename to data/rtp_rtcp/H263Foreman_CIF_Pframe.bin diff --git a/test/data/rtp_rtcp/H263_CIF_IFRAME.bin b/data/rtp_rtcp/H263_CIF_IFRAME.bin similarity index 100% rename from test/data/rtp_rtcp/H263_CIF_IFRAME.bin rename to data/rtp_rtcp/H263_CIF_IFRAME.bin diff --git a/test/data/rtp_rtcp/H263_CIF_PFRAME.bin b/data/rtp_rtcp/H263_CIF_PFRAME.bin similarity index 100% rename from test/data/rtp_rtcp/H263_CIF_PFRAME.bin rename to data/rtp_rtcp/H263_CIF_PFRAME.bin diff --git a/test/data/rtp_rtcp/H263_QCIF_IFRAME.bin b/data/rtp_rtcp/H263_QCIF_IFRAME.bin similarity index 100% rename from test/data/rtp_rtcp/H263_QCIF_IFRAME.bin rename to data/rtp_rtcp/H263_QCIF_IFRAME.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR0.bin b/data/rtp_rtcp/RTCPPacketTMMBR0.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR0.bin rename to data/rtp_rtcp/RTCPPacketTMMBR0.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR1.bin b/data/rtp_rtcp/RTCPPacketTMMBR1.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR1.bin rename to data/rtp_rtcp/RTCPPacketTMMBR1.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR2.bin b/data/rtp_rtcp/RTCPPacketTMMBR2.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR2.bin rename to data/rtp_rtcp/RTCPPacketTMMBR2.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR3.bin b/data/rtp_rtcp/RTCPPacketTMMBR3.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR3.bin rename to data/rtp_rtcp/RTCPPacketTMMBR3.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4.bin b/data/rtp_rtcp/RTCPPacketTMMBR4.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR4.bin rename to data/rtp_rtcp/RTCPPacketTMMBR4.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4_1.bin b/data/rtp_rtcp/RTCPPacketTMMBR4_1.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR4_1.bin rename to data/rtp_rtcp/RTCPPacketTMMBR4_1.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4_2.bin b/data/rtp_rtcp/RTCPPacketTMMBR4_2.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR4_2.bin rename to data/rtp_rtcp/RTCPPacketTMMBR4_2.bin diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR5.bin b/data/rtp_rtcp/RTCPPacketTMMBR5.bin similarity index 100% rename from test/data/rtp_rtcp/RTCPPacketTMMBR5.bin rename to data/rtp_rtcp/RTCPPacketTMMBR5.bin diff --git a/test/data/voice_engine/audio_long16.pcm b/data/voice_engine/audio_long16.pcm similarity index 100% rename from test/data/voice_engine/audio_long16.pcm rename to data/voice_engine/audio_long16.pcm diff --git a/test/data/voice_engine/audio_long16.wav b/data/voice_engine/audio_long16.wav similarity index 100% rename from test/data/voice_engine/audio_long16.wav rename to data/voice_engine/audio_long16.wav diff --git a/test/data/voice_engine/audio_long16big_endian.pcm b/data/voice_engine/audio_long16big_endian.pcm similarity index 100% rename from test/data/voice_engine/audio_long16big_endian.pcm rename to data/voice_engine/audio_long16big_endian.pcm diff --git a/test/data/voice_engine/audio_long16noise.pcm b/data/voice_engine/audio_long16noise.pcm similarity index 100% rename from test/data/voice_engine/audio_long16noise.pcm rename to data/voice_engine/audio_long16noise.pcm diff --git a/test/data/voice_engine/audio_long8.pcm b/data/voice_engine/audio_long8.pcm similarity index 100% rename from test/data/voice_engine/audio_long8.pcm rename to data/voice_engine/audio_long8.pcm diff --git a/test/data/voice_engine/audio_long8mulaw.wav b/data/voice_engine/audio_long8mulaw.wav similarity index 100% rename from test/data/voice_engine/audio_long8mulaw.wav rename to data/voice_engine/audio_long8mulaw.wav diff --git a/test/data/voice_engine/audio_short16.pcm b/data/voice_engine/audio_short16.pcm similarity index 100% rename from test/data/voice_engine/audio_short16.pcm rename to data/voice_engine/audio_short16.pcm diff --git a/test/data/voice_engine/audio_tiny11.wav b/data/voice_engine/audio_tiny11.wav similarity index 100% rename from test/data/voice_engine/audio_tiny11.wav rename to data/voice_engine/audio_tiny11.wav diff --git a/test/data/voice_engine/audio_tiny16.wav b/data/voice_engine/audio_tiny16.wav similarity index 100% rename from test/data/voice_engine/audio_tiny16.wav rename to data/voice_engine/audio_tiny16.wav diff --git a/test/data/voice_engine/audio_tiny22.wav b/data/voice_engine/audio_tiny22.wav similarity index 100% rename from test/data/voice_engine/audio_tiny22.wav rename to data/voice_engine/audio_tiny22.wav diff --git a/test/data/voice_engine/audio_tiny32.wav b/data/voice_engine/audio_tiny32.wav similarity index 100% rename from test/data/voice_engine/audio_tiny32.wav rename to data/voice_engine/audio_tiny32.wav diff --git a/test/data/voice_engine/audio_tiny44.wav b/data/voice_engine/audio_tiny44.wav similarity index 100% rename from test/data/voice_engine/audio_tiny44.wav rename to data/voice_engine/audio_tiny44.wav diff --git a/test/data/voice_engine/audio_tiny48.wav b/data/voice_engine/audio_tiny48.wav similarity index 100% rename from test/data/voice_engine/audio_tiny48.wav rename to data/voice_engine/audio_tiny48.wav diff --git a/test/data/voice_engine/audio_tiny8.wav b/data/voice_engine/audio_tiny8.wav similarity index 100% rename from test/data/voice_engine/audio_tiny8.wav rename to data/voice_engine/audio_tiny8.wav diff --git a/test/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb.rtp b/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb.rtp rename to data/voice_engine/stereo_rtp_files/HRTF_pcm16wb.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp b/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp rename to data/voice_engine/stereo_rtp_files/HRTF_pcm16wb_jitter.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/README.txt b/data/voice_engine/stereo_rtp_files/README.txt similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/README.txt rename to data/voice_engine/stereo_rtp_files/README.txt diff --git a/test/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48.rtp b/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48.rtp rename to data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp b/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp rename to data/voice_engine/stereo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/rtpplay.exe b/data/voice_engine/stereo_rtp_files/rtpplay.exe similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/rtpplay.exe rename to data/voice_engine/stereo_rtp_files/rtpplay.exe diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_g729.rtp b/data/voice_engine/stereo_rtp_files/stereo_g729.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_g729.rtp rename to data/voice_engine/stereo_rtp_files/stereo_g729.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_g729_jitter.rtp b/data/voice_engine/stereo_rtp_files/stereo_g729_jitter.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_g729_jitter.rtp rename to data/voice_engine/stereo_rtp_files/stereo_g729_jitter.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcm16wb.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcm16wb.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcm16wb.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcm16wb.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcm16wb_jitter.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcm16wb_jitter.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcm16wb_jitter.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcm16wb_jitter.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcmu.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcmu.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcmu.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcmu.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcmu_jitter.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcmu_jitter.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcmu_jitter.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcmu_jitter.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcmu_vad.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp b/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp rename to data/voice_engine/stereo_rtp_files/stereo_pcmu_vad_jitter.rtp diff --git a/test/data/voice_engine/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp b/data/voice_engine/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp similarity index 100% rename from test/data/voice_engine/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp rename to data/voice_engine/stereo_rtp_files/toggling_stereo_g729_pt18_pt125.rtp diff --git a/src/common_video/jpeg/jpeg_unittest.cc b/src/common_video/jpeg/jpeg_unittest.cc index fdcbe349f..6b2126d28 100644 --- a/src/common_video/jpeg/jpeg_unittest.cc +++ b/src/common_video/jpeg/jpeg_unittest.cc @@ -25,7 +25,7 @@ class JpegTest: public testing::Test { protected: JpegTest() : input_filename_(webrtc::test::ProjectRootPath() + - "test/data/common_video/jpeg/webrtc_logo.jpg"), + "data/common_video/jpeg/webrtc_logo.jpg"), decoded_filename_(webrtc::test::OutputPath() + "TestJpegDec.yuv"), encoded_filename_(webrtc::test::OutputPath() + "TestJpegEnc.jpg"), encoded_buffer_(NULL) {} diff --git a/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt b/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt index a52f7c1cf..e6244d70d 100644 --- a/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt +++ b/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt @@ -5,7 +5,7 @@ # This script can be used to verify the bit exactness of iLBC fixed-point version 1.0.6 # -INP=../../../../../../../test/data/audio_coding +INP=../../../../../../../data/audio_coding EXEP=../../../../../../../out/Release OUTP=./GeneratedFiles mkdir ./GeneratedFiles diff --git a/src/modules/audio_coding/main/test/APITest.cc b/src/modules/audio_coding/main/test/APITest.cc index 660b6cfa5..f3b0a8d11 100644 --- a/src/modules/audio_coding/main/test/APITest.cc +++ b/src/modules/audio_coding/main/test/APITest.cc @@ -264,7 +264,7 @@ APITest::SetUp() printf("Hit enter to accept the default values indicated in []\n\n"); //--- Input A - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); frequencyHz = 32000; printf("Enter input file at side A [%s]: ", fileName); PCMFile::ChooseFile(fileName, 499, &frequencyHz); @@ -278,7 +278,7 @@ APITest::SetUp() _outFileA.Open(fileName, frequencyHz, "wb"); //--- Input B - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); printf("\n\nEnter input file at side B [%s]: ", fileName); PCMFile::ChooseFile(fileName, 499, &frequencyHz); _inFileB.Open(fileName, frequencyHz, "rb", true); diff --git a/src/modules/audio_coding/main/test/EncodeDecodeTest.cc b/src/modules/audio_coding/main/test/EncodeDecodeTest.cc index bad822196..1127fa3e8 100644 --- a/src/modules/audio_coding/main/test/EncodeDecodeTest.cc +++ b/src/modules/audio_coding/main/test/EncodeDecodeTest.cc @@ -63,14 +63,14 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream) { // Set the codec, input file, and parameters for the current test. codecNo = codeId; // Use same input file for now. - char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char fileName[] = "./data/audio_coding/testfile32kHz.pcm"; _pcmFile.Open(fileName, 32000, "rb"); } else if (testMode == 0) { // Set the codec, input file, and parameters for the current test. codecNo = codeId; acm->Codec(codecNo, sendCodec); // Use same input file for now. - char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char fileName[] = "./data/audio_coding/testfile32kHz.pcm"; _pcmFile.Open(fileName, 32000, "rb"); } else { printf("List of supported codec.\n"); @@ -80,7 +80,7 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream) { } printf("Choose your codec:"); ASSERT_GT(scanf("%d", &codecNo), 0); - char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char fileName[] = "./data/audio_coding/testfile32kHz.pcm"; _pcmFile.Open(fileName, 32000, "rb"); } diff --git a/src/modules/audio_coding/main/test/SpatialAudio.cc b/src/modules/audio_coding/main/test/SpatialAudio.cc index 8490c235f..faafdcb72 100644 --- a/src/modules/audio_coding/main/test/SpatialAudio.cc +++ b/src/modules/audio_coding/main/test/SpatialAudio.cc @@ -56,7 +56,7 @@ SpatialAudio::Setup() char audioFileName[MAX_FILE_NAME_LENGTH_BYTE]; WebRtc_UWord16 sampFreqHz = 32000; - strncpy(audioFileName, "./test/data/audio_coding/testfile32kHz.pcm", + strncpy(audioFileName, "./data/audio_coding/testfile32kHz.pcm", MAX_FILE_NAME_LENGTH_BYTE - 1); if(_testMode == 1) { diff --git a/src/modules/audio_coding/main/test/TestAllCodecs.cc b/src/modules/audio_coding/main/test/TestAllCodecs.cc index 82217efb8..188b57b73 100644 --- a/src/modules/audio_coding/main/test/TestAllCodecs.cc +++ b/src/modules/audio_coding/main/test/TestAllCodecs.cc @@ -141,7 +141,7 @@ TestAllCodecs::~TestAllCodecs() void TestAllCodecs::Perform() { - char file[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char file[] = "./data/audio_coding/testfile32kHz.pcm"; _inFileA.Open(file, 32000, "rb"); if(_testMode == 0) diff --git a/src/modules/audio_coding/main/test/TestFEC.cc b/src/modules/audio_coding/main/test/TestFEC.cc index 9153a44b8..17f8f6bbd 100644 --- a/src/modules/audio_coding/main/test/TestFEC.cc +++ b/src/modules/audio_coding/main/test/TestFEC.cc @@ -59,7 +59,7 @@ void TestFEC::Perform() WEBRTC_TRACE(kTraceStateInfo, kTraceAudioCoding, -1, "---------- TestFEC ----------"); } - char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char fileName[] = "./data/audio_coding/testfile32kHz.pcm"; _inFileA.Open(fileName, 32000, "rb"); diff --git a/src/modules/audio_coding/main/test/TestStereo.cc b/src/modules/audio_coding/main/test/TestStereo.cc index 5266df23e..aeced5ebb 100644 --- a/src/modules/audio_coding/main/test/TestStereo.cc +++ b/src/modules/audio_coding/main/test/TestStereo.cc @@ -155,8 +155,8 @@ void TestStereo::Perform() { "---------- TestStereo ----------"); } - strcpy(file_name_stereo, "./test/data/audio_coding/teststereo32kHz.pcm"); - strcpy(file_name_mono, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(file_name_stereo, "./data/audio_coding/teststereo32kHz.pcm"); + strcpy(file_name_mono, "./data/audio_coding/testfile32kHz.pcm"); frequency_hz = 32000; in_file_stereo_ = new PCMFile(); diff --git a/src/modules/audio_coding/main/test/TestVADDTX.cc b/src/modules/audio_coding/main/test/TestVADDTX.cc index 2ba1ca851..f03700ad0 100644 --- a/src/modules/audio_coding/main/test/TestVADDTX.cc +++ b/src/modules/audio_coding/main/test/TestVADDTX.cc @@ -59,7 +59,7 @@ void TestVADDTX::Perform() WEBRTC_TRACE(webrtc::kTraceStateInfo, webrtc::kTraceAudioCoding, -1, "---------- TestVADDTX ----------"); } - char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm"; + char fileName[] = "./data/audio_coding/testfile32kHz.pcm"; _inFileA.Open(fileName, 32000, "rb"); _acmA = AudioCodingModule::Create(0); diff --git a/src/modules/audio_coding/main/test/TwoWayCommunication.cc b/src/modules/audio_coding/main/test/TwoWayCommunication.cc index c67733aa0..b43b39e4d 100644 --- a/src/modules/audio_coding/main/test/TwoWayCommunication.cc +++ b/src/modules/audio_coding/main/test/TwoWayCommunication.cc @@ -203,7 +203,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp() WebRtc_UWord16 frequencyHz; //--- Input A - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); frequencyHz = 32000; printf("Enter input file at side A [%s]: ", fileName); ChooseFile(fileName, 499, &frequencyHz); @@ -223,7 +223,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp() _outFileRefA.Open(refFileName, frequencyHz, "wb"); //--- Input B - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); frequencyHz = 32000; printf("\n\nEnter input file at side B [%s]: ", fileName); ChooseFile(fileName, 499, &frequencyHz); @@ -314,7 +314,7 @@ WebRtc_Word16 TwoWayCommunication::SetUpAutotest() //--- Input A - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); frequencyHz = 16000; _inFileA.Open(fileName, frequencyHz, "rb"); @@ -328,7 +328,7 @@ WebRtc_Word16 TwoWayCommunication::SetUpAutotest() _outFileRefA.Open(refFileName, frequencyHz, "wb"); //--- Input B - strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm"); + strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm"); frequencyHz = 16000; _inFileB.Open(fileName, frequencyHz, "rb"); diff --git a/src/modules/audio_coding/main/test/iSACTest.cc b/src/modules/audio_coding/main/test/iSACTest.cc index 966c4c580..3955b4036 100644 --- a/src/modules/audio_coding/main/test/iSACTest.cc +++ b/src/modules/audio_coding/main/test/iSACTest.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -184,7 +184,7 @@ ISACTest::Setup() CHECK_ERROR(_acmB->RegisterTransportCallback(_channel_B2A)); _channel_B2A->RegisterReceiverACM(_acmA); - strncpy(_fileNameSWB, "./test/data/audio_coding/testfile32kHz.pcm", + strncpy(_fileNameSWB, "./data/audio_coding/testfile32kHz.pcm", MAX_FILE_NAME_LENGTH_BYTE); _acmB->RegisterSendCodec(_paramISAC16kHz); diff --git a/src/modules/audio_device/main/test/func_test_manager.cc b/src/modules/audio_device/main/test/func_test_manager.cc index 506a9d3bd..fbf197508 100644 --- a/src/modules/audio_device/main/test/func_test_manager.cc +++ b/src/modules/audio_device/main/test/func_test_manager.cc @@ -559,7 +559,7 @@ WebRtc_Word32 AudioTransportImpl::NeedMorePlayData( FuncTestManager::FuncTestManager() : _resourcePath(webrtc::test::ProjectRootPath() + - "test/data/audio_device/"), + "data/audio_device/"), _processThread(NULL), _audioDevice(NULL), _audioEventObserver(NULL), diff --git a/src/modules/audio_processing/test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc index 6188d2cf0..b33314dca 100644 --- a/src/modules/audio_processing/test/unit_test.cc +++ b/src/modules/audio_processing/test/unit_test.cc @@ -109,7 +109,7 @@ class ApmTest : public ::testing::Test { ApmTest::ApmTest() : output_path_(webrtc::test::OutputPath()), ref_path_(webrtc::test::ProjectRootPath() + - "test/data/audio_processing/"), + "data/audio_processing/"), #if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE) ref_filename_(ref_path_ + "output_data_fixed.pb"), #elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE) diff --git a/src/modules/media_file/source/media_file_unittest.cc b/src/modules/media_file/source/media_file_unittest.cc index d1f74c026..07b5addb8 100644 --- a/src/modules/media_file/source/media_file_unittest.cc +++ b/src/modules/media_file/source/media_file_unittest.cc @@ -31,7 +31,7 @@ TEST_F(MediaFileTest, StartPlayingAudioFileWithoutError) { // TODO(leozwang): Use hard coded filename here, we want to // loop through all audio files in future const std::string audio_file = webrtc::test::ProjectRootPath() + - "test/data/voice_engine/audio_tiny48.wav"; + "data/voice_engine/audio_tiny48.wav"; ASSERT_EQ(0, media_file_->StartPlayingAudioFile( audio_file.c_str(), 0, diff --git a/src/voice_engine/main/test/auto_test/resource_manager.cc b/src/voice_engine/main/test/auto_test/resource_manager.cc index 65669ede1..18213f919 100644 --- a/src/voice_engine/main/test/auto_test/resource_manager.cc +++ b/src/voice_engine/main/test/auto_test/resource_manager.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -22,7 +22,7 @@ ResourceManager::ResourceManager() { long_audio_file_path_ = ""; } else { long_audio_file_path_ = - resource_path + "test/data/voice_engine/" + filename; + resource_path + "data/voice_engine/" + filename; } #endif } diff --git a/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc b/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc index a57649171..a977cc1d7 100644 --- a/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc +++ b/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -253,7 +253,7 @@ void RunTest(std::string out_path) { // Fall back to the current directory. resource_path = "./"; } else { - resource_path += "test/data/voice_engine/"; + resource_path += "data/voice_engine/"; } #endif const std::string audio_filename = resource_path + "audio_long16.pcm"; diff --git a/src/voice_engine/main/test/win_test/WinTestDlg.cc b/src/voice_engine/main/test/win_test/WinTestDlg.cc index d5fd3a488..cd55efb1c 100644 --- a/src/voice_engine/main/test/win_test/WinTestDlg.cc +++ b/src/voice_engine/main/test/win_test/WinTestDlg.cc @@ -2304,7 +2304,7 @@ void CWinTestDlg::OnBnClickedCheckExtTrans2() void CWinTestDlg::OnBnClickedCheckPlayFileIn1() { // File path is relative to the location of 'voice_engine.gyp'. - const char micFile[] = "../test/data/voice_engine/audio_short16.pcm"; + const char micFile[] = "../data/voice_engine/audio_short16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_1); @@ -2339,7 +2339,7 @@ void CWinTestDlg::OnBnClickedCheckPlayFileIn1() void CWinTestDlg::OnBnClickedCheckPlayFileIn2() { // File path is relative to the location of 'voice_engine.gyp'. - const char micFile[] = "../test/data/voice_engine/audio_long16.pcm"; + const char micFile[] = "../data/voice_engine/audio_long16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_2); @@ -2382,14 +2382,14 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1() {kFileFormatWavFile}, {kFileFormatWavFile}}; // File path is relative to the location of 'voice_engine.gyp'. - const char spkrFiles[8][64] = {{"../../test/data/voice_engine/audio_short16.pcm"}, - {"../../test/data/voice_engine/audio_tiny8.wav"}, - {"../../test/data/voice_engine/audio_tiny11.wav"}, - {"../../test/data/voice_engine/audio_tiny16.wav"}, - {"../../test/data/voice_engine/audio_tiny22.wav"}, - {"../../test/data/voice_engine/audio_tiny32.wav"}, - {"../../test/data/voice_engine/audio_tiny44.wav"}, - {"../../test/data/voice_engine/audio_tiny48.wav"}}; + const char spkrFiles[8][64] = {{"../../data/voice_engine/audio_short16.pcm"}, + {"../../data/voice_engine/audio_tiny8.wav"}, + {"../../data/voice_engine/audio_tiny11.wav"}, + {"../../data/voice_engine/audio_tiny16.wav"}, + {"../../data/voice_engine/audio_tiny22.wav"}, + {"../../data/voice_engine/audio_tiny32.wav"}, + {"../../data/voice_engine/audio_tiny44.wav"}, + {"../../data/voice_engine/audio_tiny48.wav"}}; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_1); CButton* button = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_OUT_1); @@ -2434,7 +2434,7 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1() void CWinTestDlg::OnBnClickedCheckPlayFileOut2() { // File path is relative to the location of 'voice_engine.gyp'. - const char spkrFile[] = "../test/data/voice_engine/audio_long16.pcm"; + const char spkrFile[] = "../data/voice_engine/audio_long16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_2); @@ -3095,8 +3095,8 @@ void CWinTestDlg::OnBnClickedCheckNs1() void CWinTestDlg::OnBnClickedCheckPlayFileIn() { // File path is relative to the location of 'voice_engine.gyp'. - const char micFile[] = "../../test/data/voice_engine/audio_short16.pcm"; - // const char micFile[] = "../../test/data/voice_engine/audio_long16noise.pcm"; + const char micFile[] = "../../data/voice_engine/audio_short16.pcm"; + // const char micFile[] = "../../data/voice_engine/audio_long16noise.pcm"; int channel(-1); CButton* buttonExtTrans = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_IN);