diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 58300a43a0..a45e2fc090 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -334,7 +334,6 @@ rtc_static_library("webrtc_common") { "config.cc", "config.h", "typedefs.h", - "voice_engine_configurations.h", ] if (!build_with_chromium && is_clang) { diff --git a/webrtc/modules/audio_coding/acm2/acm_codec_database.h b/webrtc/modules/audio_coding/acm2/acm_codec_database.h index 98569dd7bc..22c40dbb7d 100644 --- a/webrtc/modules/audio_coding/acm2/acm_codec_database.h +++ b/webrtc/modules/audio_coding/acm2/acm_codec_database.h @@ -19,7 +19,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/acm_common_defs.h b/webrtc/modules/audio_coding/acm2/acm_common_defs.h index e708978632..085193233a 100644 --- a/webrtc/modules/audio_coding/acm2/acm_common_defs.h +++ b/webrtc/modules/audio_coding/acm2/acm_common_defs.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_COMMON_DEFS_H_ #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_COMMON_DEFS_H_ -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" // Checks for enabled codecs, we prevent enabling codecs which are not // compatible. diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h index 64150744e3..63ed43d8fa 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.h +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h @@ -27,7 +27,6 @@ #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.cc b/webrtc/modules/audio_coding/acm2/codec_manager.cc index afeefc78c2..734358a925 100644 --- a/webrtc/modules/audio_coding/acm2/codec_manager.cc +++ b/webrtc/modules/audio_coding/acm2/codec_manager.cc @@ -14,7 +14,7 @@ #include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { namespace acm2 { diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h index 559664433a..5b064ec322 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h @@ -20,7 +20,6 @@ #endif #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/webrtc/modules/audio_coding/test/APITest.cc index 326a303ea3..1b9981341b 100644 --- a/webrtc/modules/audio_coding/test/APITest.cc +++ b/webrtc/modules/audio_coding/test/APITest.cc @@ -29,7 +29,7 @@ #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/RTPFile.cc b/webrtc/modules/audio_coding/test/RTPFile.cc index a61d0b0392..4bf4c9820a 100644 --- a/webrtc/modules/audio_coding/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/test/RTPFile.cc @@ -23,7 +23,7 @@ #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" // TODO(tlegrand): Consider removing usage of gtest. #include "webrtc/test/gtest.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/test/TestAllCodecs.cc index 6753d8e2c7..30f0226600 100644 --- a/webrtc/modules/audio_coding/test/TestAllCodecs.cc +++ b/webrtc/modules/audio_coding/test/TestAllCodecs.cc @@ -23,7 +23,6 @@ #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" // Description of the test: // In this test we set up a one-way communication channel from a participant diff --git a/webrtc/modules/audio_coding/test/TestRedFec.cc b/webrtc/modules/audio_coding/test/TestRedFec.cc index 7c252a13d9..7877204890 100644 --- a/webrtc/modules/audio_coding/test/TestRedFec.cc +++ b/webrtc/modules/audio_coding/test/TestRedFec.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_coding/test/utility.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" #ifdef SUPPORT_RED_WB #undef SUPPORT_RED_WB diff --git a/webrtc/modules/audio_coding/test/TestStereo.cc b/webrtc/modules/audio_coding/test/TestStereo.cc index 57b7a54c87..f18166b7dd 100644 --- a/webrtc/modules/audio_coding/test/TestStereo.cc +++ b/webrtc/modules/audio_coding/test/TestStereo.cc @@ -21,7 +21,7 @@ #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/TestVADDTX.cc b/webrtc/modules/audio_coding/test/TestVADDTX.cc index dd5b3a76e9..ad5e066b54 100644 --- a/webrtc/modules/audio_coding/test/TestVADDTX.cc +++ b/webrtc/modules/audio_coding/test/TestVADDTX.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_coding/test/PCMFile.h" #include "webrtc/modules/audio_coding/test/utility.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/test/TwoWayCommunication.cc index 7f2af7d716..d080811c40 100644 --- a/webrtc/modules/audio_coding/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/test/TwoWayCommunication.cc @@ -28,7 +28,7 @@ #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/delay_test.cc b/webrtc/modules/audio_coding/test/delay_test.cc index 9adeca1e5d..d39daf29b1 100644 --- a/webrtc/modules/audio_coding/test/delay_test.cc +++ b/webrtc/modules/audio_coding/test/delay_test.cc @@ -26,7 +26,7 @@ #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" DEFINE_string(codec, "isac", "Codec Name"); DEFINE_int32(sample_rate_hz, 16000, "Sampling rate in Hertz."); diff --git a/webrtc/modules/audio_coding/test/opus_test.cc b/webrtc/modules/audio_coding/test/opus_test.cc index bb595615d8..892eb37c3f 100644 --- a/webrtc/modules/audio_coding/test/opus_test.cc +++ b/webrtc/modules/audio_coding/test/opus_test.cc @@ -23,7 +23,7 @@ #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index 45d6d2ff6a..c2fbe98fa0 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -19,7 +19,7 @@ #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { class AudioProcessing; diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h index 7d69f7fba4..63bc7404d4 100644 --- a/webrtc/modules/audio_mixer/audio_mixer_impl.h +++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h @@ -22,7 +22,7 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/media_file/media_file_defines.h b/webrtc/modules/media_file/media_file_defines.h index aa024ce0d6..3113620ede 100644 --- a/webrtc/modules/media_file/media_file_defines.h +++ b/webrtc/modules/media_file/media_file_defines.h @@ -13,7 +13,6 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { // Callback class for the MediaFile class. diff --git a/webrtc/modules/media_file/media_file_utility.cc b/webrtc/modules/media_file/media_file_utility.cc index 0096ac59cd..ae8d06f634 100644 --- a/webrtc/modules/media_file/media_file_utility.cc +++ b/webrtc/modules/media_file/media_file_utility.cc @@ -21,7 +21,7 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" namespace { diff --git a/webrtc/modules/utility/include/file_player.h b/webrtc/modules/utility/include/file_player.h index cafd3a6405..1adbb9d70e 100644 --- a/webrtc/modules/utility/include/file_player.h +++ b/webrtc/modules/utility/include/file_player.h @@ -16,7 +16,6 @@ #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/modules/utility/include/file_recorder.h b/webrtc/modules/utility/include/file_recorder.h index 96bc5cfce6..6d4d321354 100644 --- a/webrtc/modules/utility/include/file_recorder.h +++ b/webrtc/modules/utility/include/file_recorder.h @@ -17,7 +17,6 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/file_player.cc b/webrtc/modules/utility/source/file_player.cc index 1559e9d91b..fa5bc3d2e4 100644 --- a/webrtc/modules/utility/source/file_player.cc +++ b/webrtc/modules/utility/source/file_player.cc @@ -18,7 +18,6 @@ #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/file_recorder.cc b/webrtc/modules/utility/source/file_recorder.cc index 6432a92311..34bd3945fa 100644 --- a/webrtc/modules/utility/source/file_recorder.cc +++ b/webrtc/modules/utility/source/file_recorder.cc @@ -22,7 +22,6 @@ #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" -#include "webrtc/voice_engine_configurations.h" namespace webrtc { diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h index cec27cb37d..205f8aa513 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h @@ -14,7 +14,7 @@ #include "webrtc/common_types.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_audio_processing.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_codec.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc index 22a4d1cfa1..fdf453a90a 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc @@ -15,13 +15,13 @@ #include #include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_neteq_stats.h" #include "webrtc/voice_engine/test/auto_test/automated_mode.h" #include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" #include "webrtc/voice_engine/test/auto_test/voe_stress_test.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" #include "webrtc/voice_engine/voice_engine_defines.h" -#include "webrtc/voice_engine_configurations.h" DEFINE_bool(include_timing_dependent_tests, true, "If true, we will include tests / parts of tests that are known " diff --git a/webrtc/voice_engine/test/auto_test/voe_test_common.h b/webrtc/voice_engine/test/auto_test/voe_test_common.h index 74710ccebe..67478ffcad 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_common.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_common.h @@ -25,9 +25,6 @@ #define TEST_LOG_FLUSH fflush(NULL) #endif -// Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags -#include "webrtc/voice_engine_configurations.h" - // Time in ms to test each packet size for each codec #define CODEC_TEST_TIME 400 diff --git a/webrtc/voice_engine/test/auto_test/voe_test_defines.h b/webrtc/voice_engine/test/auto_test/voe_test_defines.h index c08fb49393..4e24d1acf1 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_defines.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_defines.h @@ -13,9 +13,6 @@ #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" -// Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags -#include "webrtc/voice_engine_configurations.h" - // Select the tests to execute, list order below is same as they will be // executed. Note that, all settings below will be overriden by sub-API // settings in voice_engine_configurations.h. diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc index 69bb7ed5da..0b5af8db93 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -24,6 +24,7 @@ #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/trace_to_stderr.h" +#include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_audio_processing.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_codec.h" @@ -37,7 +38,6 @@ #include "webrtc/voice_engine/include/voe_video_sync.h" #include "webrtc/voice_engine/include/voe_volume_control.h" #include "webrtc/voice_engine/test/channel_transport/channel_transport.h" -#include "webrtc/voice_engine_configurations.h" DEFINE_bool(use_log_file, false, "Output logs to a file; by default they will be printed to stderr."); diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index 9408b5a2bb..295f209834 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -18,7 +18,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" // ---------------------------------------------------------------------------- // Enumerators diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h index b0c821eb5d..1528379f50 100644 --- a/webrtc/voice_engine/voice_engine_impl.h +++ b/webrtc/voice_engine/voice_engine_impl.h @@ -14,7 +14,7 @@ #include #include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/voice_engine_configurations.h" +#include "webrtc/typedefs.h" #include "webrtc/voice_engine/voe_base_impl.h" #include "webrtc/voice_engine/voe_audio_processing_impl.h" #include "webrtc/voice_engine/voe_codec_impl.h" diff --git a/webrtc/voice_engine_configurations.h b/webrtc/voice_engine_configurations.h deleted file mode 100644 index f801ba1ebc..0000000000 --- a/webrtc/voice_engine_configurations.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * 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. - */ - -#ifndef WEBRTC_VOICE_ENGINE_CONFIGURATIONS_H_ -#define WEBRTC_VOICE_ENGINE_CONFIGURATIONS_H_ - -#include "webrtc/typedefs.h" - -#endif // WEBRTC_VOICE_ENGINE_CONFIGURATIONS_H_