From 9c55f0f957534144d2b8a64154f0a479249b34be Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 9 Jun 2014 08:10:28 +0000 Subject: [PATCH] Rename neteq4 folder to neteq Keep the old neteq4/audio_decoder_unittests.isolate while waiting for a hard-coded reference to change. This CL effectively reverts r6257 "Rename neteq4 folder to neteq". BUG=2996 TBR=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21629004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6367 4adac7df-926f-26a2-2b94-8c16560cd09d --- WATCHLISTS | 4 - .../main/acm2/acm_codec_database.cc | 2 +- .../main/acm2/acm_codec_database.h | 2 +- .../main/acm2/acm_generic_codec.h | 4 +- .../audio_coding/main/acm2/acm_isac.cc | 2 +- .../audio_coding/main/acm2/acm_receiver.cc | 4 +- .../audio_coding/main/acm2/acm_receiver.h | 2 +- .../main/acm2/acm_receiver_unittest.cc | 2 +- .../main/acm2/audio_coding_module.gypi | 2 +- .../main/interface/audio_coding_module.h | 2 +- .../audio_coding/{neteq4 => neteq}/OWNERS | 0 .../{neteq4 => neteq}/accelerate.cc | 2 +- .../{neteq4 => neteq}/accelerate.h | 10 +-- .../{neteq4 => neteq}/audio_classifier.cc | 2 +- .../{neteq4 => neteq}/audio_classifier.h | 6 +- .../audio_classifier_unittest.cc | 2 +- .../{neteq4 => neteq}/audio_decoder.cc | 4 +- .../{neteq4 => neteq}/audio_decoder_impl.cc | 2 +- .../{neteq4 => neteq}/audio_decoder_impl.h | 8 +- .../audio_decoder_unittest.cc | 2 +- .../neteq/audio_decoder_unittests.isolate | 40 +++++++++ .../{neteq4 => neteq}/audio_multi_vector.cc | 2 +- .../{neteq4 => neteq}/audio_multi_vector.h | 8 +- .../audio_multi_vector_unittest.cc | 2 +- .../{neteq4 => neteq}/audio_vector.cc | 2 +- .../{neteq4 => neteq}/audio_vector.h | 6 +- .../audio_vector_unittest.cc | 2 +- .../{neteq4 => neteq}/background_noise.cc | 6 +- .../{neteq4 => neteq}/background_noise.h | 10 +-- .../background_noise_unittest.cc | 2 +- .../{neteq4 => neteq}/buffer_level_filter.cc | 2 +- .../{neteq4 => neteq}/buffer_level_filter.h | 6 +- .../buffer_level_filter_unittest.cc | 2 +- .../{neteq4 => neteq}/comfort_noise.cc | 10 +-- .../{neteq4 => neteq}/comfort_noise.h | 8 +- .../comfort_noise_unittest.cc | 6 +- .../{neteq4 => neteq}/decision_logic.cc | 16 ++-- .../{neteq4 => neteq}/decision_logic.h | 10 +-- .../{neteq4 => neteq}/decision_logic_fax.cc | 6 +- .../{neteq4 => neteq}/decision_logic_fax.h | 8 +- .../decision_logic_normal.cc | 14 ++-- .../{neteq4 => neteq}/decision_logic_normal.h | 8 +- .../decision_logic_unittest.cc | 12 +-- .../{neteq4 => neteq}/decoder_database.cc | 4 +- .../{neteq4 => neteq}/decoder_database.h | 10 +-- .../decoder_database_unittest.cc | 4 +- .../audio_coding/{neteq4 => neteq}/defines.h | 6 +- .../{neteq4 => neteq}/delay_manager.cc | 4 +- .../{neteq4 => neteq}/delay_manager.h | 8 +- .../delay_manager_unittest.cc | 4 +- .../{neteq4 => neteq}/delay_peak_detector.cc | 2 +- .../{neteq4 => neteq}/delay_peak_detector.h | 6 +- .../delay_peak_detector_unittest.cc | 2 +- .../{neteq4 => neteq}/dsp_helper.cc | 2 +- .../{neteq4 => neteq}/dsp_helper.h | 8 +- .../{neteq4 => neteq}/dsp_helper_unittest.cc | 4 +- .../{neteq4 => neteq}/dtmf_buffer.cc | 2 +- .../{neteq4 => neteq}/dtmf_buffer.h | 6 +- .../{neteq4 => neteq}/dtmf_buffer_unittest.cc | 2 +- .../{neteq4 => neteq}/dtmf_tone_generator.cc | 2 +- .../{neteq4 => neteq}/dtmf_tone_generator.h | 8 +- .../dtmf_tone_generator_unittest.cc | 4 +- .../audio_coding/{neteq4 => neteq}/expand.cc | 10 +-- .../audio_coding/{neteq4 => neteq}/expand.h | 8 +- .../{neteq4 => neteq}/expand_unittest.cc | 8 +- .../interface/audio_decoder.h | 6 +- .../{neteq4 => neteq}/interface/neteq.h | 8 +- .../audio_coding/{neteq4 => neteq}/merge.cc | 10 +-- .../audio_coding/{neteq4 => neteq}/merge.h | 8 +- .../{neteq4 => neteq}/merge_unittest.cc | 10 +-- .../mock/mock_audio_decoder.h | 8 +- .../mock/mock_audio_vector.h | 8 +- .../mock/mock_buffer_level_filter.h | 8 +- .../mock/mock_decoder_database.h | 8 +- .../mock/mock_delay_manager.h | 8 +- .../mock/mock_delay_peak_detector.h | 8 +- .../{neteq4 => neteq}/mock/mock_dtmf_buffer.h | 8 +- .../mock/mock_dtmf_tone_generator.h | 8 +- .../mock/mock_external_decoder_pcm16b.h | 8 +- .../mock/mock_packet_buffer.h | 8 +- .../mock/mock_payload_splitter.h | 8 +- .../audio_coding/{neteq4 => neteq}/neteq.cc | 28 +++---- .../audio_coding/{neteq4 => neteq}/neteq.gypi | 2 +- .../neteq_external_decoder_unittest.cc | 8 +- .../{neteq4 => neteq}/neteq_impl.cc | 46 +++++----- .../{neteq4 => neteq}/neteq_impl.h | 20 ++--- .../{neteq4 => neteq}/neteq_impl_unittest.cc | 32 +++---- .../neteq_stereo_unittest.cc | 6 +- .../{neteq4 => neteq}/neteq_tests.gypi | 28 +++---- .../{neteq4 => neteq}/neteq_unittest.cc | 4 +- .../audio_coding/{neteq4 => neteq}/normal.cc | 12 +-- .../audio_coding/{neteq4 => neteq}/normal.h | 10 +-- .../{neteq4 => neteq}/normal_unittest.cc | 12 +-- .../audio_coding/{neteq4 => neteq}/packet.h | 6 +- .../{neteq4 => neteq}/packet_buffer.cc | 6 +- .../{neteq4 => neteq}/packet_buffer.h | 8 +- .../packet_buffer_unittest.cc | 6 +- .../{neteq4 => neteq}/payload_splitter.cc | 4 +- .../{neteq4 => neteq}/payload_splitter.h | 8 +- .../payload_splitter_unittest.cc | 6 +- .../{neteq4 => neteq}/post_decode_vad.cc | 2 +- .../{neteq4 => neteq}/post_decode_vad.h | 12 +-- .../post_decode_vad_unittest.cc | 2 +- .../{neteq4 => neteq}/preemptive_expand.cc | 2 +- .../{neteq4 => neteq}/preemptive_expand.h | 10 +-- .../{neteq4 => neteq}/random_vector.cc | 2 +- .../{neteq4 => neteq}/random_vector.h | 6 +- .../random_vector_unittest.cc | 2 +- .../audio_coding/{neteq4 => neteq}/rtcp.cc | 2 +- .../audio_coding/{neteq4 => neteq}/rtcp.h | 8 +- .../statistics_calculator.cc | 6 +- .../{neteq4 => neteq}/statistics_calculator.h | 8 +- .../{neteq4 => neteq}/sync_buffer.cc | 2 +- .../{neteq4 => neteq}/sync_buffer.h | 8 +- .../{neteq4 => neteq}/sync_buffer_unittest.cc | 2 +- .../test/NETEQTEST_DummyRTPpacket.cc | 0 .../test/NETEQTEST_DummyRTPpacket.h | 0 .../test/NETEQTEST_RTPpacket.cc | 0 .../test/NETEQTEST_RTPpacket.h | 0 .../{neteq4 => neteq}/test/PayloadTypes.h | 0 .../{neteq4 => neteq}/test/RTPcat.cc | 2 +- .../{neteq4 => neteq}/test/RTPchange.cc | 4 +- .../{neteq4 => neteq}/test/RTPencode.cc | 4 +- .../{neteq4 => neteq}/test/RTPjitter.cc | 0 .../{neteq4 => neteq}/test/RTPtimeshift.cc | 0 .../test/audio_classifier_test.cc | 2 +- .../test/delay_tool/parse_delay_file.m | 0 .../test/delay_tool/plot_neteq_delay.m | 0 .../test/neteq_opus_fec_quality_test.cc | 2 +- .../test/neteq_performance_unittest.cc | 2 +- .../test/neteq_speed_test.cc | 2 +- .../{neteq4 => neteq}/test/rtp_to_text.cc | 0 .../{neteq4 => neteq}/time_stretch.cc | 6 +- .../{neteq4 => neteq}/time_stretch.h | 8 +- .../time_stretch_unittest.cc | 6 +- .../{neteq4 => neteq}/timestamp_scaler.cc | 6 +- .../{neteq4 => neteq}/timestamp_scaler.h | 8 +- .../timestamp_scaler_unittest.cc | 6 +- .../{neteq4 => neteq}/tools/audio_loop.cc | 2 +- .../{neteq4 => neteq}/tools/audio_loop.h | 6 +- .../tools/input_audio_file.cc | 2 +- .../tools/input_audio_file.h | 6 +- .../tools/neteq_performance_test.cc | 8 +- .../tools/neteq_performance_test.h | 6 +- .../tools/neteq_quality_test.cc | 2 +- .../tools/neteq_quality_test.h | 12 +-- .../{neteq4 => neteq}/tools/neteq_rtpplay.cc | 8 +- .../{neteq4 => neteq}/tools/packet.cc | 2 +- .../{neteq4 => neteq}/tools/packet.h | 6 +- .../{neteq4 => neteq}/tools/packet_source.h | 6 +- .../tools/packet_unittest.cc | 2 +- .../{neteq4 => neteq}/tools/rtp_analyze.cc | 4 +- .../tools/rtp_file_source.cc | 4 +- .../{neteq4 => neteq}/tools/rtp_file_source.h | 8 +- .../{neteq4 => neteq}/tools/rtp_generator.cc | 2 +- .../{neteq4 => neteq}/tools/rtp_generator.h | 6 +- webrtc/modules/modules.gyp | 84 +++++++++---------- webrtc/webrtc_tests.gypi | 2 +- 158 files changed, 547 insertions(+), 511 deletions(-) rename webrtc/modules/audio_coding/{neteq4 => neteq}/OWNERS (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/accelerate.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/accelerate.h (89%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_classifier.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_classifier.h (89%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_classifier_unittest.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_decoder.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_decoder_impl.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_decoder_impl.h (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_decoder_unittest.cc (99%) create mode 100644 webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_multi_vector.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_multi_vector.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_multi_vector_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_vector.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_vector.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/audio_vector_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/background_noise.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/background_noise.h (92%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/background_noise_unittest.cc (91%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/buffer_level_filter.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/buffer_level_filter.h (88%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/buffer_level_filter_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/comfort_noise.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/comfort_noise.h (89%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/comfort_noise_unittest.cc (80%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic.cc (93%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic_fax.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic_fax.h (90%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic_normal.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic_normal.h (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decision_logic_unittest.cc (84%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decoder_database.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decoder_database.h (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/decoder_database_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/defines.h (86%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_manager.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_manager.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_manager_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_peak_detector.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_peak_detector.h (91%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/delay_peak_detector_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dsp_helper.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dsp_helper.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dsp_helper_unittest.cc (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_buffer.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_buffer.h (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_buffer_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_tone_generator.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_tone_generator.h (87%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/dtmf_tone_generator_unittest.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/expand.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/expand.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/expand_unittest.cc (82%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/interface/audio_decoder.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/interface/neteq.h (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/merge.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/merge.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/merge_unittest.cc (74%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_audio_decoder.h (80%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_audio_vector.h (83%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_buffer_level_filter.h (75%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_decoder_database.h (87%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_delay_manager.h (86%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_delay_peak_detector.h (76%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_dtmf_buffer.h (77%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_dtmf_tone_generator.h (74%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_external_decoder_pcm16b.h (91%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_packet_buffer.h (85%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/mock/mock_payload_splitter.h (80%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq.cc (70%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq.gypi (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_external_decoder_unittest.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_impl.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_impl.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_impl_unittest.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_stereo_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_tests.gypi (93%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/neteq_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/normal.cc (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/normal.h (87%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/normal_unittest.cc (71%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/packet.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/packet_buffer.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/packet_buffer.h (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/packet_buffer_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/payload_splitter.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/payload_splitter.h (93%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/payload_splitter_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/post_decode_vad.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/post_decode_vad.h (83%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/post_decode_vad_unittest.cc (90%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/preemptive_expand.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/preemptive_expand.h (90%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/random_vector.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/random_vector.h (86%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/random_vector_unittest.cc (91%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/rtcp.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/rtcp.h (89%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/statistics_calculator.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/statistics_calculator.h (92%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/sync_buffer.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/sync_buffer.h (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/sync_buffer_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/NETEQTEST_DummyRTPpacket.cc (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/NETEQTEST_DummyRTPpacket.h (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/NETEQTEST_RTPpacket.cc (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/NETEQTEST_RTPpacket.h (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/PayloadTypes.h (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/RTPcat.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/RTPchange.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/RTPencode.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/RTPjitter.cc (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/RTPtimeshift.cc (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/audio_classifier_test.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/delay_tool/parse_delay_file.m (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/delay_tool/plot_neteq_delay.m (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/neteq_opus_fec_quality_test.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/neteq_performance_unittest.cc (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/neteq_speed_test.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/test/rtp_to_text.cc (100%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/time_stretch.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/time_stretch.h (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/time_stretch_unittest.cc (89%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/timestamp_scaler.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/timestamp_scaler.h (88%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/timestamp_scaler_unittest.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/audio_loop.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/audio_loop.h (90%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/input_audio_file.cc (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/input_audio_file.h (88%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/neteq_performance_test.cc (94%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/neteq_performance_test.h (80%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/neteq_quality_test.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/neteq_quality_test.h (87%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/neteq_rtpplay.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/packet.cc (98%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/packet.h (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/packet_source.h (80%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/packet_unittest.cc (99%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/rtp_analyze.cc (97%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/rtp_file_source.cc (96%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/rtp_file_source.h (86%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/rtp_generator.cc (95%) rename webrtc/modules/audio_coding/{neteq4 => neteq}/tools/rtp_generator.h (89%) diff --git a/WATCHLISTS b/WATCHLISTS index e21f04c029..7207f47979 100644 --- a/WATCHLISTS +++ b/WATCHLISTS @@ -60,9 +60,6 @@ 'neteq': { 'filepath': 'webrtc/modules/audio_coding/neteq/.*', }, - 'neteq4': { - 'filepath': 'webrtc/modules/audio_coding/neteq4/.*', - }, 'audio_processing': { 'filepath': 'webrtc/modules/audio_processing/.*', }, @@ -118,7 +115,6 @@ 'henrik.lundin@webrtc.org', 'kwiberg@webrtc.org'], 'neteq': ['henrik.lundin@webrtc.org'], - 'neteq4': ['henrik.lundin@webrtc.org'], 'audio_processing': ['andrew@webrtc.org', 'bjornv@webrtc.org', 'kwiberg@webrtc.org'], diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc index fd30a137ae..e55b6c4660 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc @@ -20,7 +20,7 @@ #include #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/trace.h" // Includes needed to create the codecs. diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h index 98869efeea..65be793e37 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h @@ -18,7 +18,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h index 4f5dbc6355..7e408de4a7 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/audio_coding/main/acm2/acm_isac.cc b/webrtc/modules/audio_coding/main/acm2/acm_isac.cc index e27284212f..d7be971552 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_isac.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_isac.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/trace.h" #ifdef WEBRTC_CODEC_ISAC diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc index 052bd4fccb..eeb912ad52 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/nack.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h index 748744a4c1..11440d1211 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h @@ -20,7 +20,7 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc index c55eef9526..4234f14647 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/test_suite.h" diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi index 459313bb24..90dad6c55c 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi @@ -36,7 +36,7 @@ ], 'dependencies': [ '<@(audio_coding_dependencies)', - 'NetEq4', + 'neteq', ], 'include_dirs': [ '../interface', diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h index 1bfc0d3544..cb0953aa40 100644 --- a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h +++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h @@ -15,7 +15,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq4/OWNERS b/webrtc/modules/audio_coding/neteq/OWNERS similarity index 100% rename from webrtc/modules/audio_coding/neteq4/OWNERS rename to webrtc/modules/audio_coding/neteq/OWNERS diff --git a/webrtc/modules/audio_coding/neteq4/accelerate.cc b/webrtc/modules/audio_coding/neteq/accelerate.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/accelerate.cc rename to webrtc/modules/audio_coding/neteq/accelerate.cc index eb546e9764..6acd778a23 100644 --- a/webrtc/modules/audio_coding/neteq4/accelerate.cc +++ b/webrtc/modules/audio_coding/neteq/accelerate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" diff --git a/webrtc/modules/audio_coding/neteq4/accelerate.h b/webrtc/modules/audio_coding/neteq/accelerate.h similarity index 89% rename from webrtc/modules/audio_coding/neteq4/accelerate.h rename to webrtc/modules/audio_coding/neteq/accelerate.h index 0ee69520b6..2da999326a 100644 --- a/webrtc/modules/audio_coding/neteq4/accelerate.h +++ b/webrtc/modules/audio_coding/neteq/accelerate.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -74,4 +74,4 @@ struct AccelerateFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_ACCELERATE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier.cc b/webrtc/modules/audio_coding/neteq/audio_classifier.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/audio_classifier.cc rename to webrtc/modules/audio_coding/neteq/audio_classifier.cc index a272fbce31..cc4bc97c30 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_classifier.cc +++ b/webrtc/modules/audio_coding/neteq/audio_classifier.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier.h b/webrtc/modules/audio_coding/neteq/audio_classifier.h similarity index 89% rename from webrtc/modules/audio_coding/neteq4/audio_classifier.h rename to webrtc/modules/audio_coding/neteq/audio_classifier.h index 1d041b3017..e7b7807dbe 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_classifier.h +++ b/webrtc/modules/audio_coding/neteq/audio_classifier.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ #if defined(__cplusplus) extern "C" { @@ -56,4 +56,4 @@ class AudioClassifier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_CLASSIFIER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc rename to webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc index 0a66718161..cf623ca088 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_classifier_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder.cc b/webrtc/modules/audio_coding/neteq/audio_decoder.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/audio_decoder.cc rename to webrtc/modules/audio_coding/neteq/audio_decoder.cc index 2a252e6f11..f539bb2e1e 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_decoder.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc rename to webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc index 94e507e029..6c7269a35f 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include #include // memmove diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h similarity index 97% rename from webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h rename to webrtc/modules/audio_coding/neteq/audio_decoder_impl.h index 93f6c9c6bc..265d660bd7 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ #include @@ -19,7 +19,7 @@ #include "webrtc/engine_configurations.h" #endif #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -273,4 +273,4 @@ class AudioDecoderCng : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_DECODER_IMPL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc rename to webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc index dbd9d121f4..f82644cbc2 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" +#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate new file mode 100644 index 0000000000..bb57e74b34 --- /dev/null +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate @@ -0,0 +1,40 @@ +# Copyright (c) 2013 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 +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. +{ + 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../../resources/', + '../../../../../data/', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../../../../testing/test_env.py', + '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_touched': [ + '../../../../DEPS', + ], + 'isolate_dependency_tracked': [ + '../../../../resources/audio_coding/testfile32kHz.pcm', + '../../../../testing/test_env.py', + '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + '../../../../tools/swarming_client/', + ], + }, + }], + ], +} diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc rename to webrtc/modules/audio_coding/neteq/audio_multi_vector.cc index b49f8b0e8a..5a208a6972 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector.h rename to webrtc/modules/audio_coding/neteq/audio_multi_vector.h index 25f45cf201..908de936d5 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ #include // Access to size_t. #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -131,4 +131,4 @@ class AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc rename to webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index be05a8260f..9476038526 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.cc b/webrtc/modules/audio_coding/neteq/audio_vector.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/audio_vector.cc rename to webrtc/modules/audio_coding/neteq/audio_vector.cc index cbd4616306..d9fb4e58c2 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_vector.cc +++ b/webrtc/modules/audio_coding/neteq/audio_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.h b/webrtc/modules/audio_coding/neteq/audio_vector.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/audio_vector.h rename to webrtc/modules/audio_coding/neteq/audio_vector.h index 265d68e840..f8aabdb8e8 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_vector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ #include // Access to size_t. @@ -117,4 +117,4 @@ class AudioVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc rename to webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc index de5aac2d95..50da1fb46c 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.cc b/webrtc/modules/audio_coding/neteq/background_noise.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/background_noise.cc rename to webrtc/modules/audio_coding/neteq/background_noise.cc index 2dfb3c1f39..e00c4f65e5 100644 --- a/webrtc/modules/audio_coding/neteq4/background_noise.cc +++ b/webrtc/modules/audio_coding/neteq/background_noise.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" #include #include // memcpy @@ -16,8 +16,8 @@ #include // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.h b/webrtc/modules/audio_coding/neteq/background_noise.h similarity index 92% rename from webrtc/modules/audio_coding/neteq4/background_noise.h rename to webrtc/modules/audio_coding/neteq/background_noise.h index 3a63ebb94e..8fb310ea8b 100644 --- a/webrtc/modules/audio_coding/neteq4/background_noise.h +++ b/webrtc/modules/audio_coding/neteq/background_noise.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ #include // size_t #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -134,4 +134,4 @@ class BackgroundNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc similarity index 91% rename from webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc rename to webrtc/modules/audio_coding/neteq/background_noise_unittest.cc index eb7b9fa1ed..0aee62c97b 100644 --- a/webrtc/modules/audio_coding/neteq4/background_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for BackgroundNoise class. -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc rename to webrtc/modules/audio_coding/neteq/buffer_level_filter.cc index 70b4931066..0388b19502 100644 --- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include // Provide access to std::max. diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h similarity index 88% rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter.h rename to webrtc/modules/audio_coding/neteq/buffer_level_filter.h index 842634c5b4..48f7f564c9 100644 --- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ #include "webrtc/base/constructormagic.h" @@ -44,4 +44,4 @@ class BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BUFFER_LEVEL_FILTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc rename to webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index ddaf08d1d3..9589099d4a 100644 --- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for BufferLevelFilter class. -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include // Access to pow function. diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise.cc b/webrtc/modules/audio_coding/neteq/comfort_noise.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/comfort_noise.cc rename to webrtc/modules/audio_coding/neteq/comfort_noise.cc index 360767af19..31bb40c927 100644 --- a/webrtc/modules/audio_coding/neteq4/comfort_noise.cc +++ b/webrtc/modules/audio_coding/neteq/comfort_noise.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" #include #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise.h b/webrtc/modules/audio_coding/neteq/comfort_noise.h similarity index 89% rename from webrtc/modules/audio_coding/neteq4/comfort_noise.h rename to webrtc/modules/audio_coding/neteq/comfort_noise.h index 5c4e1ce044..d465596245 100644 --- a/webrtc/modules/audio_coding/neteq4/comfort_noise.h +++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -70,4 +70,4 @@ class ComfortNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc similarity index 80% rename from webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc rename to webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc index 0e84971712..6a1bbe0d14 100644 --- a/webrtc/modules/audio_coding/neteq4/comfort_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for ComfortNoise class. -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic.cc b/webrtc/modules/audio_coding/neteq/decision_logic.cc similarity index 93% rename from webrtc/modules/audio_coding/neteq4/decision_logic.cc rename to webrtc/modules/audio_coding/neteq/decision_logic.cc index 85edbb4dc7..5fb054c785 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/decision_logic.h rename to webrtc/modules/audio_coding/neteq/decision_logic.h index 38be6e6bfa..672ce939d4 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -165,4 +165,4 @@ class DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc rename to webrtc/modules/audio_coding/neteq/decision_logic_fax.cc index 00c8bcf4a2..08a4c4cb64 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic_fax.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" #include #include -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.h b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h similarity index 90% rename from webrtc/modules/audio_coding/neteq4/decision_logic_fax.h rename to webrtc/modules/audio_coding/neteq/decision_logic_fax.h index 2e35d2667f..01a948fa42 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic_fax.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -60,4 +60,4 @@ class DecisionLogicFax : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc rename to webrtc/modules/audio_coding/neteq/decision_logic_normal.cc index a70f23b762..97a8843ae0 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decision_logic_normal.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" #include #include -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/modules/interface/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h similarity index 94% rename from webrtc/modules/audio_coding/neteq4/decision_logic_normal.h rename to webrtc/modules/audio_coding/neteq/decision_logic_normal.h index 5b21193c6d..a339d160f2 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic_normal.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -104,4 +104,4 @@ class DecisionLogicNormal : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ diff --git a/webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc similarity index 84% rename from webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc rename to webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc index 60a4b62a24..f9056a6cba 100644 --- a/webrtc/modules/audio_coding/neteq4/decision_logic_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -11,12 +11,12 @@ // Unit tests for DecisionLogic class and derived classes. #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database.cc b/webrtc/modules/audio_coding/neteq/decoder_database.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/decoder_database.cc rename to webrtc/modules/audio_coding/neteq/decoder_database.cc index 8d87519b25..5049962b45 100644 --- a/webrtc/modules/audio_coding/neteq4/decoder_database.cc +++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include #include // pair -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h similarity index 94% rename from webrtc/modules/audio_coding/neteq4/decoder_database.h rename to webrtc/modules/audio_coding/neteq/decoder_database.h index 2e8825ae1d..8a03f2123b 100644 --- a/webrtc/modules/audio_coding/neteq4/decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/decoder_database.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ #include #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -155,4 +155,4 @@ class DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECODER_DATABASE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc rename to webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc index 66eddb52ab..d0c6f5ae89 100644 --- a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include #include @@ -18,7 +18,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" #include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/defines.h b/webrtc/modules/audio_coding/neteq/defines.h similarity index 86% rename from webrtc/modules/audio_coding/neteq4/defines.h rename to webrtc/modules/audio_coding/neteq/defines.h index b6f9eb2bc1..33d1bd9c3f 100644 --- a/webrtc/modules/audio_coding/neteq4/defines.h +++ b/webrtc/modules/audio_coding/neteq/defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ namespace webrtc { @@ -48,4 +48,4 @@ enum Modes { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DEFINES_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.cc b/webrtc/modules/audio_coding/neteq/delay_manager.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/delay_manager.cc rename to webrtc/modules/audio_coding/neteq/delay_manager.cc index e80b9de514..a935561eff 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_manager.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include #include @@ -16,7 +16,7 @@ #include // max, min #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.h b/webrtc/modules/audio_coding/neteq/delay_manager.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/delay_manager.h rename to webrtc/modules/audio_coding/neteq/delay_manager.h index cc34352b5e..96b5e19ebd 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/delay_manager.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ #include // Provide access to size_t. #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -161,4 +161,4 @@ class DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc rename to webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc index 482a65c9a4..6f9733234d 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_manager_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc @@ -10,13 +10,13 @@ // Unit tests for DelayManager class. -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc rename to webrtc/modules/audio_coding/neteq/delay_peak_detector.cc index fd5b9c08f0..5996d7d197 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include // max diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h similarity index 91% rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector.h rename to webrtc/modules/audio_coding/neteq/delay_peak_detector.h index 59d27bc520..8bf6aba8b5 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ #include // size_t @@ -73,4 +73,4 @@ class DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc rename to webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc index a3b48209cf..080309be01 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for DelayPeakDetector class. -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc b/webrtc/modules/audio_coding/neteq/dsp_helper.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/dsp_helper.cc rename to webrtc/modules/audio_coding/neteq/dsp_helper.cc index e1aa0e53de..7451ae26f8 100644 --- a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc +++ b/webrtc/modules/audio_coding/neteq/dsp_helper.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include #include // Access to memset. diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.h b/webrtc/modules/audio_coding/neteq/dsp_helper.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/dsp_helper.h rename to webrtc/modules/audio_coding/neteq/dsp_helper.h index f2064858ab..af4f4d6c88 100644 --- a/webrtc/modules/audio_coding/neteq4/dsp_helper.h +++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ #include // Access to size_t. #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -133,4 +133,4 @@ class DspHelper { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc similarity index 95% rename from webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc rename to webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc index 852c2ec927..cbceff6194 100644 --- a/webrtc/modules/audio_coding/neteq4/dsp_helper_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc rename to webrtc/modules/audio_coding/neteq/dtmf_buffer.cc index 1c81ad940c..91debee14e 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #include #include // max diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h similarity index 94% rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer.h rename to webrtc/modules/audio_coding/neteq/dtmf_buffer.h index b901a971db..5dd31c2d2e 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ #include #include // size_t @@ -113,4 +113,4 @@ class DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc rename to webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc index 0b5ed65b8e..83f981386b 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #ifdef WIN32 #include // ntohl() diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc index c85534e9b7..34c615d70f 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc @@ -28,7 +28,7 @@ // 852 Hz 7 8 9 14 // 941 Hz 10 0 11 15 -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h similarity index 87% rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h index a0a83f1b55..fc1e5e4ad3 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -53,4 +53,4 @@ class DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc rename to webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index 37e8bbda96..94f79dc345 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for DtmfToneGenerator class. -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/expand.cc b/webrtc/modules/audio_coding/neteq/expand.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/expand.cc rename to webrtc/modules/audio_coding/neteq/expand.cc index 9b08de15a8..14a7798223 100644 --- a/webrtc/modules/audio_coding/neteq4/expand.cc +++ b/webrtc/modules/audio_coding/neteq/expand.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/expand.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" #include #include // memset @@ -17,10 +17,10 @@ #include // numeric_limits #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/expand.h b/webrtc/modules/audio_coding/neteq/expand.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/expand.h rename to webrtc/modules/audio_coding/neteq/expand.h index b5f4406500..1acf951b98 100644 --- a/webrtc/modules/audio_coding/neteq4/expand.h +++ b/webrtc/modules/audio_coding/neteq/expand.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -184,4 +184,4 @@ struct ExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_EXPAND_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ diff --git a/webrtc/modules/audio_coding/neteq4/expand_unittest.cc b/webrtc/modules/audio_coding/neteq/expand_unittest.cc similarity index 82% rename from webrtc/modules/audio_coding/neteq4/expand_unittest.cc rename to webrtc/modules/audio_coding/neteq/expand_unittest.cc index 353af2cf4e..bd39f408ff 100644 --- a/webrtc/modules/audio_coding/neteq4/expand_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/expand_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for Expand class. -#include "webrtc/modules/audio_coding/neteq4/expand.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h b/webrtc/modules/audio_coding/neteq/interface/audio_decoder.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h rename to webrtc/modules/audio_coding/neteq/interface/audio_decoder.h index 404572aa8a..9a2fb8b464 100644 --- a/webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h +++ b/webrtc/modules/audio_coding/neteq/interface/audio_decoder.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ #include // NULL @@ -149,4 +149,4 @@ class AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_AUDIO_DECODER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_AUDIO_DECODER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq/interface/neteq.h similarity index 97% rename from webrtc/modules/audio_coding/neteq4/interface/neteq.h rename to webrtc/modules/audio_coding/neteq/interface/neteq.h index 79a5dfb0b1..c67ab12c6c 100644 --- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h +++ b/webrtc/modules/audio_coding/neteq/interface/neteq.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ #include // Provide access to size_t. @@ -17,7 +17,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -273,4 +273,4 @@ class NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INTERFACE_NETEQ_H_ diff --git a/webrtc/modules/audio_coding/neteq4/merge.cc b/webrtc/modules/audio_coding/neteq/merge.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/merge.cc rename to webrtc/modules/audio_coding/neteq/merge.cc index 90068bb4a9..d3d8077516 100644 --- a/webrtc/modules/audio_coding/neteq4/merge.cc +++ b/webrtc/modules/audio_coding/neteq/merge.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/merge.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" #include #include // memmove, memcpy, memset, size_t @@ -16,10 +16,10 @@ #include // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/merge.h b/webrtc/modules/audio_coding/neteq/merge.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/merge.h rename to webrtc/modules/audio_coding/neteq/merge.h index 012e0af79f..1bf0483dfe 100644 --- a/webrtc/modules/audio_coding/neteq4/merge.h +++ b/webrtc/modules/audio_coding/neteq/merge.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -107,4 +107,4 @@ class Merge { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MERGE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/merge_unittest.cc b/webrtc/modules/audio_coding/neteq/merge_unittest.cc similarity index 74% rename from webrtc/modules/audio_coding/neteq4/merge_unittest.cc rename to webrtc/modules/audio_coding/neteq/merge_unittest.cc index 1d7b1f1fed..fb5f789ff1 100644 --- a/webrtc/modules/audio_coding/neteq4/merge_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/merge_unittest.cc @@ -10,15 +10,15 @@ // Unit tests for Merge class. -#include "webrtc/modules/audio_coding/neteq4/merge.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" #include #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h similarity index 80% rename from webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h rename to webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h index a6d587447d..edf3b54e9e 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "gmock/gmock.h" @@ -35,4 +35,4 @@ class MockAudioDecoder : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_DECODER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_DECODER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h similarity index 83% rename from webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h rename to webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h index 7a4747b0d3..a5a787c7aa 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_audio_vector.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ -#include "webrtc/modules/audio_coding/neteq4/audio_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_vector.h" #include "gmock/gmock.h" @@ -48,4 +48,4 @@ class MockAudioVector : public AudioVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_AUDIO_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_AUDIO_VECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h similarity index 75% rename from webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h rename to webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h index 8726551729..d9210668dd 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include "gmock/gmock.h" @@ -34,4 +34,4 @@ class MockBufferLevelFilter : public BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h similarity index 87% rename from webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h rename to webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h index c4ca25a527..583fa54ba0 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "gmock/gmock.h" @@ -61,4 +61,4 @@ class MockDecoderDatabase : public DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DECODER_DATABASE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h similarity index 86% rename from webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h rename to webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h index 1edfb87371..c21a1c28c7 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" #include "gmock/gmock.h" @@ -60,4 +60,4 @@ class MockDelayManager : public DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_MANAGER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h similarity index 76% rename from webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h rename to webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h index 211b2b91e1..26e09329e6 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "gmock/gmock.h" @@ -31,4 +31,4 @@ class MockDelayPeakDetector : public DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h similarity index 77% rename from webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h rename to webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h index 5a89db46f6..0351d6b1e5 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" #include "gmock/gmock.h" @@ -35,4 +35,4 @@ class MockDtmfBuffer : public DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h similarity index 74% rename from webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h rename to webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h index d34f7470ef..3bed4d152b 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" #include "gmock/gmock.h" @@ -32,4 +32,4 @@ class MockDtmfToneGenerator : public DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h similarity index 91% rename from webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h rename to webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index b13affe10d..9522b537e3 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "gmock/gmock.h" #include "webrtc/base/constructormagic.h" @@ -96,4 +96,4 @@ class MockExternalPcm16B : public ExternalPcm16B { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h similarity index 85% rename from webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h rename to webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h index b1d8ef901f..2882248c19 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include "gmock/gmock.h" @@ -55,4 +55,4 @@ class MockPacketBuffer : public PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PACKET_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h similarity index 80% rename from webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h rename to webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h index 369dfc43f4..f1665423af 100644 --- a/webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include "gmock/gmock.h" @@ -36,4 +36,4 @@ class MockPayloadSplitter : public PayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_MOCK_MOCK_PAYLOAD_SPLITTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PAYLOAD_SPLITTER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/neteq.cc b/webrtc/modules/audio_coding/neteq/neteq.cc similarity index 70% rename from webrtc/modules/audio_coding/neteq4/neteq.cc rename to webrtc/modules/audio_coding/neteq/neteq.cc index 48dacea10b..7edacde763 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq.cc +++ b/webrtc/modules/audio_coding/neteq/neteq.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi similarity index 99% rename from webrtc/modules/audio_coding/neteq4/neteq.gypi rename to webrtc/modules/audio_coding/neteq/neteq.gypi index 280e51181b..ccdc9f5df7 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -33,7 +33,7 @@ }, 'targets': [ { - 'target_name': 'NetEq4', + 'target_name': 'neteq', 'type': 'static_library', 'dependencies': [ '<@(neteq_dependencies)', diff --git a/webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc rename to webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 3352d18906..a40107651d 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -15,10 +15,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq/neteq_impl.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/neteq_impl.cc rename to webrtc/modules/audio_coding/neteq/neteq_impl.cc index f860766085..64a8660394 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" #include #include // memset @@ -16,28 +16,28 @@ #include #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/comfort_noise.h" -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/merge.h" -#include "webrtc/modules/audio_coding/neteq4/normal.h" -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/merge.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/neteq_impl.h rename to webrtc/modules/audio_coding/neteq/neteq_impl.h index 822a523a62..e92babd8e3 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" // Declare PacketList. -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/rtcp.h" -#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList. +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/rtcp.h" +#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" @@ -403,4 +403,4 @@ class NetEqImpl : public webrtc::NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NETEQ_IMPL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc rename to webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc index 26279aa93a..2e66487fae 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_impl_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/neteq_impl.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_buffer_level_filter.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_manager.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_delay_peak_detector.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_dtmf_tone_generator.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc rename to webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc index e1d64411d2..3c695c81d0 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_stereo_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -16,9 +16,9 @@ #include "gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi similarity index 93% rename from webrtc/modules/audio_coding/neteq4/neteq_tests.gypi rename to webrtc/modules/audio_coding/neteq/neteq_tests.gypi index 2be4737961..4d2ce252bd 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi @@ -12,8 +12,8 @@ 'target_name': 'neteq_rtpplay', 'type': 'executable', 'dependencies': [ - 'NetEq4', - 'NetEq4TestTools', + 'neteq', + 'neteq_test_tools', 'neteq_unittest_tools', 'PCM16B', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -31,7 +31,7 @@ 'type': 'executable', 'dependencies': [ # TODO(hlundin): Make RTPencode use ACM to encode files. - 'NetEq4TestTools',# Test helpers + 'neteq_test_tools',# Test helpers 'G711', 'G722', 'PCM16B', @@ -99,7 +99,7 @@ 'target_name': 'RTPchange', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -111,7 +111,7 @@ 'target_name': 'RTPtimeshift', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -123,7 +123,7 @@ 'target_name': 'RTPcat', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', ], 'sources': [ @@ -135,7 +135,7 @@ 'target_name': 'rtp_to_text', 'type': 'executable', 'dependencies': [ - 'NetEq4TestTools', + 'neteq_test_tools', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'sources': [ @@ -147,7 +147,7 @@ 'target_name': 'audio_classifier_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', ], 'sources': [ 'test/audio_classifier_test.cc', @@ -158,7 +158,7 @@ 'target_name': 'neteq_test_support', 'type': 'static_library', 'dependencies': [ - 'NetEq4', + 'neteq', 'PCM16B', 'neteq_unittest_tools', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -173,10 +173,10 @@ }, # neteq_test_support { - 'target_name': 'neteq4_speed_test', + 'target_name': 'neteq_speed_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', 'neteq_test_support', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -187,10 +187,10 @@ }, { - 'target_name': 'neteq4_opus_fec_quality_test', + 'target_name': 'neteq_opus_fec_quality_test', 'type': 'executable', 'dependencies': [ - 'NetEq4', + 'neteq', 'neteq_test_support', 'webrtc_opus', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -203,7 +203,7 @@ }, { - 'target_name': 'NetEq4TestTools', + 'target_name': 'neteq_test_tools', # Collection of useful functions used in other tests. 'type': 'static_library', 'variables': { diff --git a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/neteq_unittest.cc rename to webrtc/modules/audio_coding/neteq/neteq_unittest.cc index c1a7e16526..0233e19500 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -12,7 +12,7 @@ * This file includes unit tests for NetEQ. */ -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include #include @@ -25,7 +25,7 @@ #include "gflags/gflags.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq4/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc similarity index 95% rename from webrtc/modules/audio_coding/neteq4/normal.cc rename to webrtc/modules/audio_coding/neteq/normal.cc index 8d9c020f96..bfde179bd1 100644 --- a/webrtc/modules/audio_coding/neteq4/normal.cc +++ b/webrtc/modules/audio_coding/neteq/normal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/normal.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" #include // memset, memcpy @@ -16,11 +16,11 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/normal.h b/webrtc/modules/audio_coding/neteq/normal.h similarity index 87% rename from webrtc/modules/audio_coding/neteq4/normal.h rename to webrtc/modules/audio_coding/neteq/normal.h index 1be5c7fd42..aa24b528af 100644 --- a/webrtc/modules/audio_coding/neteq4/normal.h +++ b/webrtc/modules/audio_coding/neteq/normal.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ #include // Access to size_t. #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -65,4 +65,4 @@ class Normal { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ diff --git a/webrtc/modules/audio_coding/neteq4/normal_unittest.cc b/webrtc/modules/audio_coding/neteq/normal_unittest.cc similarity index 71% rename from webrtc/modules/audio_coding/neteq4/normal_unittest.cc rename to webrtc/modules/audio_coding/neteq/normal_unittest.cc index 2bd7b894f4..c855865cfa 100644 --- a/webrtc/modules/audio_coding/neteq4/normal_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/normal_unittest.cc @@ -10,16 +10,16 @@ // Unit tests for Normal class. -#include "webrtc/modules/audio_coding/neteq4/normal.h" +#include "webrtc/modules/audio_coding/neteq/normal.h" #include #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/expand.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/packet.h b/webrtc/modules/audio_coding/neteq/packet.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/packet.h rename to webrtc/modules/audio_coding/neteq/packet.h index 4518f91381..89ddda782c 100644 --- a/webrtc/modules/audio_coding/neteq4/packet.h +++ b/webrtc/modules/audio_coding/neteq/packet.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ #include @@ -85,4 +85,4 @@ struct Packet { typedef std::list PacketList; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc b/webrtc/modules/audio_coding/neteq/packet_buffer.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/packet_buffer.cc rename to webrtc/modules/audio_coding/neteq/packet_buffer.cc index da3bdf14b5..8a81c2598b 100644 --- a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/packet_buffer.cc @@ -12,12 +12,12 @@ // an STL list. The list is kept sorted at all times so that the next packet to // decode is at the beginning of the list. -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include // find_if() -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer.h b/webrtc/modules/audio_coding/neteq/packet_buffer.h similarity index 95% rename from webrtc/modules/audio_coding/neteq4/packet_buffer.h rename to webrtc/modules/audio_coding/neteq/packet_buffer.h index 3b068c3a99..76c4ddd161 100644 --- a/webrtc/modules/audio_coding/neteq4/packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -132,4 +132,4 @@ class PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc rename to webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc index 387ca146cf..5e6b89fdc4 100644 --- a/webrtc/modules/audio_coding/neteq4/packet_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for PacketBuffer class. -#include "webrtc/modules/audio_coding/neteq4/packet_buffer.h" +#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" using ::testing::Return; using ::testing::_; diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter.cc b/webrtc/modules/audio_coding/neteq/payload_splitter.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/payload_splitter.cc rename to webrtc/modules/audio_coding/neteq/payload_splitter.cc index 0e97b7d8f3..1d61ef0cf4 100644 --- a/webrtc/modules/audio_coding/neteq4/payload_splitter.cc +++ b/webrtc/modules/audio_coding/neteq/payload_splitter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter.h b/webrtc/modules/audio_coding/neteq/payload_splitter.h similarity index 93% rename from webrtc/modules/audio_coding/neteq4/payload_splitter.h rename to webrtc/modules/audio_coding/neteq/payload_splitter.h index 5086409ad4..a3dd77e5a5 100644 --- a/webrtc/modules/audio_coding/neteq4/payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/payload_splitter.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" namespace webrtc { @@ -87,4 +87,4 @@ class PayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PAYLOAD_SPLITTER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc rename to webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc index c83a9b5824..5cde1bda5e 100644 --- a/webrtc/modules/audio_coding/neteq4/payload_splitter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc @@ -10,15 +10,15 @@ // Unit tests for PayloadSplitter class. -#include "webrtc/modules/audio_coding/neteq4/payload_splitter.h" +#include "webrtc/modules/audio_coding/neteq/payload_splitter.h" #include #include // pair #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" using ::testing::Return; diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/post_decode_vad.cc rename to webrtc/modules/audio_coding/neteq/post_decode_vad.cc index c3d5c7edd7..7ae7f97abc 100644 --- a/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad.h b/webrtc/modules/audio_coding/neteq/post_decode_vad.h similarity index 83% rename from webrtc/modules/audio_coding/neteq4/post_decode_vad.h rename to webrtc/modules/audio_coding/neteq/post_decode_vad.h index 327de1aac6..e713009c85 100644 --- a/webrtc/modules/audio_coding/neteq4/post_decode_vad.h +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ #include // size_t #include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/neteq4/defines.h" -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ class PostDecodeVad { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_POST_DECODE_VAD_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ diff --git a/webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc similarity index 90% rename from webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc rename to webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc index a4d9da8e16..ed48db858d 100644 --- a/webrtc/modules/audio_coding/neteq4/post_decode_vad_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for PostDecodeVad class. -#include "webrtc/modules/audio_coding/neteq4/post_decode_vad.h" +#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/preemptive_expand.cc rename to webrtc/modules/audio_coding/neteq/preemptive_expand.cc index dace45eb98..b2dc3e60cb 100644 --- a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc +++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" #include // min, max diff --git a/webrtc/modules/audio_coding/neteq4/preemptive_expand.h b/webrtc/modules/audio_coding/neteq/preemptive_expand.h similarity index 90% rename from webrtc/modules/audio_coding/neteq4/preemptive_expand.h rename to webrtc/modules/audio_coding/neteq/preemptive_expand.h index 4d20ae634f..1aa6133014 100644 --- a/webrtc/modules/audio_coding/neteq4/preemptive_expand.h +++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -84,4 +84,4 @@ struct PreemptiveExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PREEMPTIVE_EXPAND_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.cc b/webrtc/modules/audio_coding/neteq/random_vector.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/random_vector.cc rename to webrtc/modules/audio_coding/neteq/random_vector.cc index e7a5a1d1bc..b12f217155 100644 --- a/webrtc/modules/audio_coding/neteq4/random_vector.cc +++ b/webrtc/modules/audio_coding/neteq/random_vector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.h b/webrtc/modules/audio_coding/neteq/random_vector.h similarity index 86% rename from webrtc/modules/audio_coding/neteq4/random_vector.h rename to webrtc/modules/audio_coding/neteq/random_vector.h index 2c67ebbf0c..767dc48eee 100644 --- a/webrtc/modules/audio_coding/neteq4/random_vector.h +++ b/webrtc/modules/audio_coding/neteq/random_vector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ #include // size_t @@ -47,4 +47,4 @@ class RandomVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc similarity index 91% rename from webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc rename to webrtc/modules/audio_coding/neteq/random_vector_unittest.cc index 83193e2a7b..cbdcdf7c82 100644 --- a/webrtc/modules/audio_coding/neteq4/random_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for RandomVector class. -#include "webrtc/modules/audio_coding/neteq4/random_vector.h" +#include "webrtc/modules/audio_coding/neteq/random_vector.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/rtcp.cc b/webrtc/modules/audio_coding/neteq/rtcp.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/rtcp.cc rename to webrtc/modules/audio_coding/neteq/rtcp.cc index bc178fc3aa..cf8e0280bb 100644 --- a/webrtc/modules/audio_coding/neteq4/rtcp.cc +++ b/webrtc/modules/audio_coding/neteq/rtcp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/rtcp.h" +#include "webrtc/modules/audio_coding/neteq/rtcp.h" #include diff --git a/webrtc/modules/audio_coding/neteq4/rtcp.h b/webrtc/modules/audio_coding/neteq/rtcp.h similarity index 89% rename from webrtc/modules/audio_coding/neteq4/rtcp.h rename to webrtc/modules/audio_coding/neteq/rtcp.h index d465667826..2a765efa58 100644 --- a/webrtc/modules/audio_coding/neteq4/rtcp.h +++ b/webrtc/modules/audio_coding/neteq/rtcp.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -55,4 +55,4 @@ class Rtcp { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/statistics_calculator.cc rename to webrtc/modules/audio_coding/neteq/statistics_calculator.cc index b6e9222d47..383f705554 100644 --- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h" +#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include #include // memset -#include "webrtc/modules/audio_coding/neteq4/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq4/delay_manager.h" +#include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/modules/audio_coding/neteq/delay_manager.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h similarity index 92% rename from webrtc/modules/audio_coding/neteq4/statistics_calculator.h rename to webrtc/modules/audio_coding/neteq/statistics_calculator.h index 30f9377a05..07ef8536fa 100644 --- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.h +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -106,4 +106,4 @@ class StatisticsCalculator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_STATISTICS_CALCULATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer.cc b/webrtc/modules/audio_coding/neteq/sync_buffer.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/sync_buffer.cc rename to webrtc/modules/audio_coding/neteq/sync_buffer.cc index 75ee6ece08..d1802e174f 100644 --- a/webrtc/modules/audio_coding/neteq4/sync_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/sync_buffer.cc @@ -12,7 +12,7 @@ #include // Access to min. -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer.h b/webrtc/modules/audio_coding/neteq/sync_buffer.h similarity index 94% rename from webrtc/modules/audio_coding/neteq4/sync_buffer.h rename to webrtc/modules/audio_coding/neteq/sync_buffer.h index 8deb95003d..59bd4d87e2 100644 --- a/webrtc/modules/audio_coding/neteq4/sync_buffer.h +++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -98,4 +98,4 @@ class SyncBuffer : public AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc rename to webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc index 1aafa22ab8..1a3d0fe781 100644 --- a/webrtc/modules/audio_coding/neteq4/sync_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/sync_buffer.h" +#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.cc rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.cc diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.cc rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc diff --git a/webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h rename to webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h diff --git a/webrtc/modules/audio_coding/neteq4/test/PayloadTypes.h b/webrtc/modules/audio_coding/neteq/test/PayloadTypes.h similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/PayloadTypes.h rename to webrtc/modules/audio_coding/neteq/test/PayloadTypes.h diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPcat.cc b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/test/RTPcat.cc rename to webrtc/modules/audio_coding/neteq/test/RTPcat.cc index 87189cfe90..f06b574f04 100644 --- a/webrtc/modules/audio_coding/neteq4/test/RTPcat.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPcat.cc @@ -14,7 +14,7 @@ #include #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPchange.cc b/webrtc/modules/audio_coding/neteq/test/RTPchange.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/test/RTPchange.cc rename to webrtc/modules/audio_coding/neteq/test/RTPchange.cc index 30bee86a68..54395c026a 100644 --- a/webrtc/modules/audio_coding/neteq4/test/RTPchange.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPchange.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 //#define WEBRTC_DUMMY_RTP diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/test/RTPencode.cc rename to webrtc/modules/audio_coding/neteq/test/RTPencode.cc index bc806091b0..93b366b9a2 100644 --- a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc @@ -25,8 +25,8 @@ #include "webrtc/typedefs.h" // needed for NetEqDecoder -#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" /************************/ /* Define payload types */ diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc rename to webrtc/modules/audio_coding/neteq/test/RTPjitter.cc diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPtimeshift.cc b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/RTPtimeshift.cc rename to webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc diff --git a/webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc b/webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc rename to webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc index 730406bb93..aa2b61d067 100644 --- a/webrtc/modules/audio_coding/neteq4/test/audio_classifier_test.cc +++ b/webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/audio_classifier.h" +#include "webrtc/modules/audio_coding/neteq/audio_classifier.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m b/webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/delay_tool/parse_delay_file.m rename to webrtc/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m diff --git a/webrtc/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m b/webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/delay_tool/plot_neteq_delay.m rename to webrtc/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc rename to webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc index aa4522b1fa..ad6d8ece45 100644 --- a/webrtc/modules/audio_coding/neteq4/test/neteq_opus_fec_quality_test.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_opus_fec_quality_test.cc @@ -10,7 +10,7 @@ #include #include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "webrtc/test/testsupport/fileutils.h" using google::RegisterFlagValidator; diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc similarity index 95% rename from webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc rename to webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc index f669742ce0..14857c772b 100644 --- a/webrtc/modules/audio_coding/neteq4/test/neteq_performance_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/test/testsupport/perf_test.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc rename to webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc index cecd48b701..05e75f34e4 100644 --- a/webrtc/modules/audio_coding/neteq4/test/neteq_speed_test.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_speed_test.cc @@ -13,7 +13,7 @@ #include #include "gflags/gflags.h" -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/typedefs.h" // Flag validators. diff --git a/webrtc/modules/audio_coding/neteq4/test/rtp_to_text.cc b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc similarity index 100% rename from webrtc/modules/audio_coding/neteq4/test/rtp_to_text.cc rename to webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.cc b/webrtc/modules/audio_coding/neteq/time_stretch.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/time_stretch.cc rename to webrtc/modules/audio_coding/neteq/time_stretch.cc index 5b246c1134..a9228d4988 100644 --- a/webrtc/modules/audio_coding/neteq4/time_stretch.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/time_stretch.h" +#include "webrtc/modules/audio_coding/neteq/time_stretch.h" #include // min, max #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" -#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.h b/webrtc/modules/audio_coding/neteq/time_stretch.h similarity index 94% rename from webrtc/modules/audio_coding/neteq4/time_stretch.h rename to webrtc/modules/audio_coding/neteq/time_stretch.h index cd110b12ea..9396d8ff51 100644 --- a/webrtc/modules/audio_coding/neteq4/time_stretch.h +++ b/webrtc/modules/audio_coding/neteq/time_stretch.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ #include #include // memset, size_t #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" +#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -108,4 +108,4 @@ class TimeStretch { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc similarity index 89% rename from webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc rename to webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc index 529038ac38..64789b4d43 100644 --- a/webrtc/modules/audio_coding/neteq4/time_stretch_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for Accelerate and PreemptiveExpand classes. -#include "webrtc/modules/audio_coding/neteq4/accelerate.h" -#include "webrtc/modules/audio_coding/neteq4/preemptive_expand.h" +#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/background_noise.h" +#include "webrtc/modules/audio_coding/neteq/background_noise.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc rename to webrtc/modules/audio_coding/neteq/timestamp_scaler.cc index b2b5b40a3a..01890136a9 100644 --- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "webrtc/modules/audio_coding/neteq4/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/defines.h" +#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/system_wrappers/interface/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.h b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h similarity index 88% rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler.h rename to webrtc/modules/audio_coding/neteq/timestamp_scaler.h index 604b5999bb..59b8cc7d1d 100644 --- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler.h +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -65,4 +65,4 @@ class TimestampScaler { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ diff --git a/webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc rename to webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc index c676094672..8cbbfa393a 100644 --- a/webrtc/modules/audio_coding/neteq4/timestamp_scaler_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/timestamp_scaler.h" +#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq4/packet.h" +#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "webrtc/modules/audio_coding/neteq/packet.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc rename to webrtc/modules/audio_coding/neteq/tools/audio_loop.cc index 94ea5bef01..2d2a7e3dd4 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.cc +++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h" +#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include #include diff --git a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.h b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h similarity index 90% rename from webrtc/modules/audio_coding/neteq4/tools/audio_loop.h rename to webrtc/modules/audio_coding/neteq/tools/audio_loop.h index 144898eb53..9647d827ac 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/audio_loop.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ #include @@ -56,4 +56,4 @@ class AudioLoop { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_AUDIO_LOOP_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc similarity index 95% rename from webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc rename to webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc index 62692e27dc..806317320f 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.cc +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h similarity index 88% rename from webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h rename to webrtc/modules/audio_coding/neteq/tools/input_audio_file.h index 7325d04657..274f8ea07e 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ #include @@ -48,4 +48,4 @@ class InputAudioFile { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc similarity index 94% rename from webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc rename to webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc index 2eb74628b4..433546fbcb 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/audio_loop.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h similarity index 80% rename from webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h rename to webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h index 1b205c03c1..d094db0f9b 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_performance_test.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ #include "webrtc/typedefs.h" @@ -29,4 +29,4 @@ class NetEqPerformanceTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc rename to webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 8daca18fb0..fc5d8abaf8 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -9,7 +9,7 @@ */ #include -#include "webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h" +#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h similarity index 87% rename from webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h rename to webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h index 03aabc8842..87fc50794c 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_quality_test.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -97,4 +97,4 @@ class NetEqQualityTest : public ::testing::Test { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_NETEQ_QUALITY_TEST_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc rename to webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index 1308bf5dcd..3c5f6b0bba 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -20,10 +20,10 @@ #include "google/gflags.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_RTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/test/NETEQTEST_DummyRTPpacket.h" -#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" +#include "webrtc/modules/audio_coding/neteq/interface/neteq.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" +#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet.cc b/webrtc/modules/audio_coding/neteq/tools/packet.cc similarity index 98% rename from webrtc/modules/audio_coding/neteq4/tools/packet.cc rename to webrtc/modules/audio_coding/neteq/tools/packet.cc index 6e0778b387..d8fb7134f1 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/packet.cc +++ b/webrtc/modules/audio_coding/neteq/tools/packet.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet.h b/webrtc/modules/audio_coding/neteq/tools/packet.h similarity index 96% rename from webrtc/modules/audio_coding/neteq4/tools/packet.h rename to webrtc/modules/audio_coding/neteq/tools/packet.h index 03586bc0d9..eb8ce28a22 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/packet.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ #include @@ -114,4 +114,4 @@ class Packet { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet_source.h b/webrtc/modules/audio_coding/neteq/tools/packet_source.h similarity index 80% rename from webrtc/modules/audio_coding/neteq4/tools/packet_source.h rename to webrtc/modules/audio_coding/neteq/tools/packet_source.h index 261ae7886f..c539b8e833 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/packet_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet_source.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ #include "webrtc/base/constructormagic.h" @@ -33,4 +33,4 @@ class PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc similarity index 99% rename from webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc rename to webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc index b6c0713d1f..df844ee84f 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/packet_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for test Packet class. -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc similarity index 97% rename from webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc rename to webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc index 71a6c3c6c3..773cc2c896 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/rtp_analyze.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc @@ -13,8 +13,8 @@ #include #include "google/gflags.h" -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" // Flag validator. diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc similarity index 96% rename from webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc rename to webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc index ceedde01c6..8278635394 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include #include @@ -18,7 +18,7 @@ #include #endif -#include "webrtc/modules/audio_coding/neteq4/tools/packet.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h similarity index 86% rename from webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h rename to webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h index 86197d911d..527018e180 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ #include #include #include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq4/tools/packet_source.h" +#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" @@ -63,4 +63,4 @@ class RtpFileSource : public PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_FILE_SOURCE_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc similarity index 95% rename from webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc rename to webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc index 8d9a89d545..17ac209f1d 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h" +#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h similarity index 89% rename from webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h rename to webrtc/modules/audio_coding/neteq/tools/rtp_generator.h index e1fe8027bf..d3824c8d22 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ +#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ +#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ #include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" @@ -54,4 +54,4 @@ class RtpGenerator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_RTP_GENERATOR_H_ +#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 701ee77005..8dec125b09 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -17,7 +17,7 @@ 'audio_coding/codecs/isac/fix/source/isacfix.gypi', 'audio_coding/codecs/pcm16b/pcm16b.gypi', 'audio_coding/main/acm2/audio_coding_module.gypi', - 'audio_coding/neteq4/neteq.gypi', + 'audio_coding/neteq/neteq.gypi', 'audio_conference_mixer/source/audio_conference_mixer.gypi', 'audio_device/audio_device.gypi', 'audio_processing/audio_processing.gypi', @@ -75,8 +75,8 @@ 'desktop_capture', 'iSACFix', 'media_file', - 'NetEq4', - 'NetEq4TestTools', + 'neteq', + 'neteq_test_tools', 'neteq_unittest_tools', 'paced_sender', 'PCM16B', # Needed by NetEq tests. @@ -112,45 +112,45 @@ 'audio_coding/codecs/isac/fix/source/transform_unittest.cc', 'audio_coding/codecs/isac/main/source/isac_unittest.cc', 'audio_coding/codecs/opus/opus_unittest.cc', - 'audio_coding/neteq4/audio_classifier_unittest.cc', - 'audio_coding/neteq4/audio_multi_vector_unittest.cc', - 'audio_coding/neteq4/audio_vector_unittest.cc', - 'audio_coding/neteq4/background_noise_unittest.cc', - 'audio_coding/neteq4/buffer_level_filter_unittest.cc', - 'audio_coding/neteq4/comfort_noise_unittest.cc', - 'audio_coding/neteq4/decision_logic_unittest.cc', - 'audio_coding/neteq4/decoder_database_unittest.cc', - 'audio_coding/neteq4/delay_manager_unittest.cc', - 'audio_coding/neteq4/delay_peak_detector_unittest.cc', - 'audio_coding/neteq4/dsp_helper_unittest.cc', - 'audio_coding/neteq4/dtmf_buffer_unittest.cc', - 'audio_coding/neteq4/dtmf_tone_generator_unittest.cc', - 'audio_coding/neteq4/expand_unittest.cc', - 'audio_coding/neteq4/merge_unittest.cc', - 'audio_coding/neteq4/neteq_external_decoder_unittest.cc', - 'audio_coding/neteq4/neteq_impl_unittest.cc', - 'audio_coding/neteq4/neteq_stereo_unittest.cc', - 'audio_coding/neteq4/neteq_unittest.cc', - 'audio_coding/neteq4/normal_unittest.cc', - 'audio_coding/neteq4/packet_buffer_unittest.cc', - 'audio_coding/neteq4/payload_splitter_unittest.cc', - 'audio_coding/neteq4/post_decode_vad_unittest.cc', - 'audio_coding/neteq4/random_vector_unittest.cc', - 'audio_coding/neteq4/sync_buffer_unittest.cc', - 'audio_coding/neteq4/timestamp_scaler_unittest.cc', - 'audio_coding/neteq4/time_stretch_unittest.cc', - 'audio_coding/neteq4/mock/mock_audio_decoder.h', - 'audio_coding/neteq4/mock/mock_audio_vector.h', - 'audio_coding/neteq4/mock/mock_buffer_level_filter.h', - 'audio_coding/neteq4/mock/mock_decoder_database.h', - 'audio_coding/neteq4/mock/mock_delay_manager.h', - 'audio_coding/neteq4/mock/mock_delay_peak_detector.h', - 'audio_coding/neteq4/mock/mock_dtmf_buffer.h', - 'audio_coding/neteq4/mock/mock_dtmf_tone_generator.h', - 'audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h', - 'audio_coding/neteq4/mock/mock_packet_buffer.h', - 'audio_coding/neteq4/mock/mock_payload_splitter.h', - 'audio_coding/neteq4/tools/packet_unittest.cc', + 'audio_coding/neteq/audio_classifier_unittest.cc', + 'audio_coding/neteq/audio_multi_vector_unittest.cc', + 'audio_coding/neteq/audio_vector_unittest.cc', + 'audio_coding/neteq/background_noise_unittest.cc', + 'audio_coding/neteq/buffer_level_filter_unittest.cc', + 'audio_coding/neteq/comfort_noise_unittest.cc', + 'audio_coding/neteq/decision_logic_unittest.cc', + 'audio_coding/neteq/decoder_database_unittest.cc', + 'audio_coding/neteq/delay_manager_unittest.cc', + 'audio_coding/neteq/delay_peak_detector_unittest.cc', + 'audio_coding/neteq/dsp_helper_unittest.cc', + 'audio_coding/neteq/dtmf_buffer_unittest.cc', + 'audio_coding/neteq/dtmf_tone_generator_unittest.cc', + 'audio_coding/neteq/expand_unittest.cc', + 'audio_coding/neteq/merge_unittest.cc', + 'audio_coding/neteq/neteq_external_decoder_unittest.cc', + 'audio_coding/neteq/neteq_impl_unittest.cc', + 'audio_coding/neteq/neteq_stereo_unittest.cc', + 'audio_coding/neteq/neteq_unittest.cc', + 'audio_coding/neteq/normal_unittest.cc', + 'audio_coding/neteq/packet_buffer_unittest.cc', + 'audio_coding/neteq/payload_splitter_unittest.cc', + 'audio_coding/neteq/post_decode_vad_unittest.cc', + 'audio_coding/neteq/random_vector_unittest.cc', + 'audio_coding/neteq/sync_buffer_unittest.cc', + 'audio_coding/neteq/timestamp_scaler_unittest.cc', + 'audio_coding/neteq/time_stretch_unittest.cc', + 'audio_coding/neteq/mock/mock_audio_decoder.h', + 'audio_coding/neteq/mock/mock_audio_vector.h', + 'audio_coding/neteq/mock/mock_buffer_level_filter.h', + 'audio_coding/neteq/mock/mock_decoder_database.h', + 'audio_coding/neteq/mock/mock_delay_manager.h', + 'audio_coding/neteq/mock/mock_delay_peak_detector.h', + 'audio_coding/neteq/mock/mock_dtmf_buffer.h', + 'audio_coding/neteq/mock/mock_dtmf_tone_generator.h', + 'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h', + 'audio_coding/neteq/mock/mock_packet_buffer.h', + 'audio_coding/neteq/mock/mock_payload_splitter.h', + 'audio_coding/neteq/tools/packet_unittest.cc', 'audio_processing/aec/system_delay_unittest.cc', 'audio_processing/aec/echo_cancellation_unittest.cc', 'audio_processing/echo_cancellation_impl_unittest.cc', diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index a76126c8d9..3c1dca69e3 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -75,7 +75,7 @@ 'target_name': 'webrtc_perf_tests', 'type': '<(gtest_target_type)', 'sources': [ - 'modules/audio_coding/neteq4/test/neteq_performance_unittest.cc', + 'modules/audio_coding/neteq/test/neteq_performance_unittest.cc', 'video/call_perf_tests.cc', 'video/full_stack.cc', 'video/rampup_tests.cc',