diff --git a/.gitignore b/.gitignore index 90c43dfb82..c1e6b5da41 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,9 @@ /tools_webrtc/video_quality_toolchain/mac/zxing /tools_webrtc/video_quality_toolchain/win/*.dll /tools_webrtc/video_quality_toolchain/win/*.exe -/webrtc/rtc_tools/testing/*.zip -/webrtc/rtc_tools/testing/*.gz -/webrtc/rtc_tools/testing/golang/*/*.gz -/webrtc/rtc_tools/testing/golang/*/*.zip +/rtc_tools/testing/*.zip +/rtc_tools/testing/*.gz +/rtc_tools/testing/golang/*/*.gz +/rtc_tools/testing/golang/*/*.zip /x86-generic_out/ /xcodebuild diff --git a/.gn b/.gn index 7591ffbb89..882d220fdb 100644 --- a/.gn +++ b/.gn @@ -20,7 +20,29 @@ secondary_source = "//build/secondary/" # matching these patterns (see "gn help label_pattern" for format) will have # their includes checked for proper dependencies when you run either # "gn check" or "gn gen --check". -check_targets = [ "//webrtc/*" ] +check_targets = [ + "//api/*", + "//audio/*", + "//backup/*", + "//call/*", + "//common_audio/*", + "//common_video/*", + "//examples/*", + "//logging/*", + "//media/*", + "//modules/*", + "//ortc/*", + "//p2p/*", + "//pc/*", + "//rtc_base/*", + "//rtc_tools/*", + "//sdk/*", + "//stats/*", + "//system_wrappers/*", + "//test/*", + "//video/*", + "//voice_engine/*", +] # These are the list of GN files that run exec_script. This whitelist exists # to force additional review for new uses of exec_script, which is strongly diff --git a/BUILD.gn b/BUILD.gn index 6641e2f636..ed80cbeb2c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -431,8 +431,8 @@ if (rtc_include_tests) { # TODO(pbos): Rename test suite, this is no longer "just" for video targets. video_engine_tests_resources = [ - "../resources/foreman_cif_short.yuv", - "../resources/voice_engine/audio_long16.pcm", + "resources/foreman_cif_short.yuv", + "resources/voice_engine/audio_long16.pcm", ] if (is_ios) { @@ -475,19 +475,19 @@ if (rtc_include_tests) { } webrtc_perf_tests_resources = [ - "../resources/audio_coding/speech_mono_16kHz.pcm", - "../resources/audio_coding/speech_mono_32_48kHz.pcm", - "../resources/audio_coding/testfile32kHz.pcm", - "../resources/ConferenceMotion_1280_720_50.yuv", - "../resources/difficult_photo_1850_1110.yuv", - "../resources/foreman_cif.yuv", - "../resources/google-wifi-3mbps.rx", - "../resources/paris_qcif.yuv", - "../resources/photo_1850_1110.yuv", - "../resources/presentation_1850_1110.yuv", - "../resources/verizon4g-downlink.rx", - "../resources/voice_engine/audio_long16.pcm", - "../resources/web_screenshot_1850_1110.yuv", + "resources/audio_coding/speech_mono_16kHz.pcm", + "resources/audio_coding/speech_mono_32_48kHz.pcm", + "resources/audio_coding/testfile32kHz.pcm", + "resources/ConferenceMotion_1280_720_50.yuv", + "resources/difficult_photo_1850_1110.yuv", + "resources/foreman_cif.yuv", + "resources/google-wifi-3mbps.rx", + "resources/paris_qcif.yuv", + "resources/photo_1850_1110.yuv", + "resources/presentation_1850_1110.yuv", + "resources/verizon4g-downlink.rx", + "resources/voice_engine/audio_long16.pcm", + "resources/web_screenshot_1850_1110.yuv", ] if (is_ios) { diff --git a/DEPS b/DEPS index d19c70c49b..1e0ca42e1e 100644 --- a/DEPS +++ b/DEPS @@ -113,7 +113,7 @@ deps_os = { 'src/third_party/ub-uiautomator/lib': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434', # Gradle 3.5.0. Used for testing Android Studio project generation for WebRTC. - 'src/webrtc/examples/androidtests/third_party/gradle': + 'src/examples/androidtests/third_party/gradle': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' + '941559e020f6c357ebb08d5c67acdb858a3defc2', }, @@ -554,26 +554,26 @@ include_rules = [ "+libyuv", "-webrtc", # Has to be disabled; otherwise all dirs below will be allowed. # Individual headers that will be moved out of here, see webrtc:4243. - "+webrtc/call/rtp_config.h", - "+webrtc/common_types.h", - "+webrtc/transport.h", - "+webrtc/typedefs.h", - "+webrtc/voice_engine_configurations.h", + "+call/rtp_config.h", + "+common_types.h", + "+transport.h", + "+typedefs.h", + "+voice_engine_configurations.h", "+WebRTC", - "+webrtc/api", - "+webrtc/modules/include", - "+webrtc/rtc_base", - "+webrtc/test", - "+webrtc/rtc_tools", + "+api", + "+modules/include", + "+rtc_base", + "+test", + "+rtc_tools", ] # The below rules will be removed when webrtc:4243 is fixed. specific_include_rules = { "video_receive_stream\.h": [ - "+webrtc/call/video_receive_stream.h", + "+call/video_receive_stream.h", ], "video_send_stream\.h": [ - "+webrtc/call/video_send_stream.h", + "+call/video_send_stream.h", ], } diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 927869f5f9..66d6892634 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -15,29 +15,29 @@ import sys # Files and directories that are *skipped* by cpplint in the presubmit script. CPPLINT_BLACKLIST = [ + 'api/video_codecs/video_decoder.h', + 'common_types.cc', + 'common_types.h', + 'examples/objc', + 'media', + 'modules/audio_coding', + 'modules/audio_conference_mixer', + 'modules/audio_device', + 'modules/audio_processing', + 'modules/desktop_capture', + 'modules/include/module_common_types.h', + 'modules/media_file', + 'modules/utility', + 'modules/video_capture', + 'p2p', + 'pc', + 'rtc_base', + 'sdk/android/src/jni', + 'sdk/objc', + 'system_wrappers', + 'test', 'tools_webrtc', - 'webrtc/api/video_codecs/video_decoder.h', - 'webrtc/examples/objc', - 'webrtc/media', - 'webrtc/modules/audio_coding', - 'webrtc/modules/audio_conference_mixer', - 'webrtc/modules/audio_device', - 'webrtc/modules/audio_processing', - 'webrtc/modules/desktop_capture', - 'webrtc/modules/include/module_common_types.h', - 'webrtc/modules/media_file', - 'webrtc/modules/utility', - 'webrtc/modules/video_capture', - 'webrtc/p2p', - 'webrtc/pc', - 'webrtc/rtc_base', - 'webrtc/sdk/android/src/jni', - 'webrtc/sdk/objc', - 'webrtc/system_wrappers', - 'webrtc/test', - 'webrtc/voice_engine', - 'webrtc/common_types.h', - 'webrtc/common_types.cc', + 'voice_engine', ] # These filters will always be removed, even if the caller specifies a filter @@ -62,34 +62,33 @@ BLACKLIST_LINT_FILTERS = [ # webrtc-users@google.com (internal list). # 4. (later) The deprecated APIs are removed. NATIVE_API_DIRS = ( - 'webrtc', - 'webrtc/api', - 'webrtc/media', - 'webrtc/modules/audio_device/include', - 'webrtc/pc', + 'api', + 'media', + 'modules/audio_device/include', + 'pc', ) # These directories should not be used but are maintained only to avoid breaking # some legacy downstream code. LEGACY_API_DIRS = ( - 'webrtc/common_audio/include', - 'webrtc/modules/audio_coding/include', - 'webrtc/modules/audio_conference_mixer/include', - 'webrtc/modules/audio_processing/include', - 'webrtc/modules/bitrate_controller/include', - 'webrtc/modules/congestion_controller/include', - 'webrtc/modules/include', - 'webrtc/modules/remote_bitrate_estimator/include', - 'webrtc/modules/rtp_rtcp/include', - 'webrtc/modules/rtp_rtcp/source', - 'webrtc/modules/utility/include', - 'webrtc/modules/video_coding/codecs/h264/include', - 'webrtc/modules/video_coding/codecs/i420/include', - 'webrtc/modules/video_coding/codecs/vp8/include', - 'webrtc/modules/video_coding/codecs/vp9/include', - 'webrtc/modules/video_coding/include', - 'webrtc/rtc_base', - 'webrtc/system_wrappers/include', - 'webrtc/voice_engine/include', + 'common_audio/include', + 'modules/audio_coding/include', + 'modules/audio_conference_mixer/include', + 'modules/audio_processing/include', + 'modules/bitrate_controller/include', + 'modules/congestion_controller/include', + 'modules/include', + 'modules/remote_bitrate_estimator/include', + 'modules/rtp_rtcp/include', + 'modules/rtp_rtcp/source', + 'modules/utility/include', + 'modules/video_coding/codecs/h264/include', + 'modules/video_coding/codecs/i420/include', + 'modules/video_coding/codecs/vp8/include', + 'modules/video_coding/codecs/vp9/include', + 'modules/video_coding/include', + 'rtc_base', + 'system_wrappers/include', + 'voice_engine/include', ) API_DIRS = NATIVE_API_DIRS[:] + LEGACY_API_DIRS[:] @@ -331,8 +330,7 @@ def CheckNoPackageBoundaryViolations(input_api, gn_files, output_api): cwd = input_api.PresubmitLocalPath() script_path = os.path.join('tools_webrtc', 'presubmit_checks_lib', 'check_package_boundaries.py') - webrtc_path = os.path.join('webrtc') - command = [sys.executable, script_path, webrtc_path] + command = [sys.executable, script_path] command += [gn_file.LocalPath() for gn_file in gn_files] returncode, _, stderr = _RunCommand(command, cwd) if returncode: @@ -347,8 +345,7 @@ def CheckGnChanges(input_api, output_api): gn_files = [] for f in input_api.AffectedSourceFiles(source_file_filter): - if f.LocalPath().startswith('webrtc'): - gn_files.append(f) + gn_files.append(f) result = [] if gn_files: @@ -494,9 +491,9 @@ def RunPythonTests(input_api, output_api): test_directories = [ input_api.PresubmitLocalPath(), - Join('webrtc', 'rtc_tools', 'py_event_log_analyzer'), - Join('webrtc', 'rtc_tools'), - Join('webrtc', 'audio', 'test', 'unittests'), + Join('rtc_tools', 'py_event_log_analyzer'), + Join('rtc_tools'), + Join('audio', 'test', 'unittests'), ] + [ root for root, _, files in os.walk(Join('tools_webrtc')) if any(f.endswith('_test.py') for f in files) @@ -517,7 +514,7 @@ def CheckUsageOfGoogleProtobufNamespace(input_api, output_api): """Checks that the namespace google::protobuf has not been used.""" files = [] pattern = input_api.re.compile(r'google::protobuf') - proto_utils_path = os.path.join('webrtc', 'rtc_base', 'protobuf_utils.h') + proto_utils_path = os.path.join('rtc_base', 'protobuf_utils.h') for f in input_api.AffectedSourceFiles(input_api.FilterSourceFile): if f.LocalPath() in [proto_utils_path, 'PRESUBMIT.py']: continue @@ -533,6 +530,28 @@ def CheckUsageOfGoogleProtobufNamespace(input_api, output_api): return [] +def _LicenseHeader(input_api): + """Returns the license header regexp.""" + # Accept any year number from 2003 to the current year + current_year = int(input_api.time.strftime('%Y')) + allowed_years = (str(s) for s in reversed(xrange(2003, current_year + 1))) + years_re = '(' + '|'.join(allowed_years) + ')' + license_header = ( + r'.*? Copyright( \(c\))? %(year)s The WebRTC [Pp]roject [Aa]uthors\. ' + r'All [Rr]ights [Rr]eserved\.\n' + r'.*?\n' + r'.*? Use of this source code is governed by a BSD-style license\n' + r'.*? that can be found in the LICENSE file in the root of the source\n' + r'.*? tree\. An additional intellectual property rights grant can be ' + r'found\n' + r'.*? in the file PATENTS\. All contributing project authors may\n' + r'.*? be found in the AUTHORS file in the root of the source tree\.\n' + ) % { + 'year': years_re, + } + return license_header + + def CommonChecks(input_api, output_api): """Checks common to both upload and commit.""" results = [] @@ -541,11 +560,12 @@ def CommonChecks(input_api, output_api): black_list = input_api.DEFAULT_BLACK_LIST + ( r".*\bobjc[\\\/].*", r".*objc\.[hcm]+$", - r"webrtc\/build\/ios\/SDK\/.*", ) source_file_filter = lambda x: input_api.FilterSourceFile(x, None, black_list) results.extend(CheckApprovedFilesLintClean( input_api, output_api, source_file_filter)) + results.extend(input_api.canned_checks.CheckLicense( + input_api, output_api, _LicenseHeader(input_api))) results.extend(input_api.canned_checks.RunPylint(input_api, output_api, black_list=(r'^base[\\\/].*\.py$', r'^build[\\\/].*\.py$', @@ -599,8 +619,13 @@ def CommonChecks(input_api, output_api): results.extend(CheckJSONParseErrors(input_api, output_api)) results.extend(RunPythonTests(input_api, output_api)) results.extend(CheckUsageOfGoogleProtobufNamespace(input_api, output_api)) - results.extend(CheckOrphanHeaders(input_api, output_api)) - results.extend(CheckNewLineAtTheEndOfProtoFiles(input_api, output_api)) + # TODO(mbonadei): re-enable after the migration from src/webrtc to src/ + # in order to avoid to trigger an error for each orphan header (we are + # moving all of them). + # results.extend(CheckOrphanHeaders(input_api, output_api)) + # TODO(mbonadei): check before re-enable because it seems it is reporting + # some false positives. + # results.extend(CheckNewLineAtTheEndOfProtoFiles(input_api, output_api)) return results diff --git a/api/DEPS b/api/DEPS index fad1d841d8..1e8e347924 100644 --- a/api/DEPS +++ b/api/DEPS @@ -1,30 +1,30 @@ include_rules = [ "+third_party/libyuv", - "+webrtc/common_video", - "+webrtc/media", - "+webrtc/p2p", - "+webrtc/pc", + "+common_video", + "+media", + "+p2p", + "+pc", ] specific_include_rules = { "peerconnection_jni\.cc": [ - "+webrtc/voice_engine", + "+voice_engine", ], # TODO(ossu): Remove this exception when {builtin_,}audio_encoder_factory.h # has moved to api/. "peerconnectioninterface\.h": [ - "+webrtc/call/callfactoryinterface.h", - "+webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h", - "+webrtc/modules/audio_coding/codecs/audio_encoder_factory.h", - "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h", + "+call/callfactoryinterface.h", + "+logging/rtc_event_log/rtc_event_log_factory_interface.h", + "+modules/audio_coding/codecs/audio_encoder_factory.h", + "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h", ], # Needed because AudioEncoderOpus is in the wrong place for # backwards compatibilty reasons. See # https://bugs.chromium.org/p/webrtc/issues/detail?id=7847 "audio_encoder_opus\.h": [ - "+webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h", + "+modules/audio_coding/codecs/opus/audio_encoder_opus.h", ], # We allow .cc files in webrtc/api/ to #include a bunch of stuff @@ -32,10 +32,10 @@ specific_include_rules = { # their #includes to whoever's #including them, but .cc files do not # since no one #includes them. ".*\.cc": [ - "+webrtc/modules/audio_coding", + "+modules/audio_coding", ], ".*i420_buffer\.h": [ - "+webrtc/system_wrappers/include/aligned_malloc.h", + "+system_wrappers/include/aligned_malloc.h", ], } diff --git a/api/array_view.h b/api/array_view.h index c97d388cc9..d951d0f02d 100644 --- a/api/array_view.h +++ b/api/array_view.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ARRAY_VIEW_H_ -#define WEBRTC_API_ARRAY_VIEW_H_ +#ifndef API_ARRAY_VIEW_H_ +#define API_ARRAY_VIEW_H_ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/type_traits.h" +#include "rtc_base/checks.h" +#include "rtc_base/type_traits.h" namespace rtc { @@ -260,4 +260,4 @@ inline ArrayView MakeArrayView(T* data, size_t size) { } // namespace rtc -#endif // WEBRTC_API_ARRAY_VIEW_H_ +#endif // API_ARRAY_VIEW_H_ diff --git a/api/array_view_unittest.cc b/api/array_view_unittest.cc index b19abc195c..48dff2c266 100644 --- a/api/array_view_unittest.cc +++ b/api/array_view_unittest.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/test/gmock.h" +#include "api/array_view.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "test/gmock.h" namespace rtc { diff --git a/api/audio/audio_mixer.h b/api/audio/audio_mixer.h index d1abf9a787..63b8b8ff9b 100644 --- a/api/audio/audio_mixer.h +++ b/api/audio/audio_mixer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_AUDIO_MIXER_H_ -#define WEBRTC_API_AUDIO_AUDIO_MIXER_H_ +#ifndef API_AUDIO_AUDIO_MIXER_H_ +#define API_AUDIO_AUDIO_MIXER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/refcount.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -77,4 +77,4 @@ class AudioMixer : public rtc::RefCountInterface { }; } // namespace webrtc -#endif // WEBRTC_API_AUDIO_AUDIO_MIXER_H_ +#endif // API_AUDIO_AUDIO_MIXER_H_ diff --git a/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc index b5a64d854c..db3d169a4d 100644 --- a/api/audio_codecs/L16/audio_decoder_L16.cc +++ b/api/audio_codecs/L16/audio_decoder_L16.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/L16/audio_decoder_L16.h" +#include "api/audio_codecs/L16/audio_decoder_L16.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/L16/audio_decoder_L16.h b/api/audio_codecs/L16/audio_decoder_L16.h index 39b389a0ec..db863b37de 100644 --- a/api/audio_codecs/L16/audio_decoder_L16.h +++ b/api/audio_codecs/L16/audio_decoder_L16.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ -#define WEBRTC_API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ +#ifndef API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ +#define API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -41,4 +41,4 @@ struct AudioDecoderL16 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ +#endif // API_AUDIO_CODECS_L16_AUDIO_DECODER_L16_H_ diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc index 99af03d87d..8c8e625a4b 100644 --- a/api/audio_codecs/L16/audio_encoder_L16.cc +++ b/api/audio_codecs/L16/audio_encoder_L16.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/L16/audio_encoder_L16.h" +#include "api/audio_codecs/L16/audio_encoder_L16.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/L16/audio_encoder_L16.h b/api/audio_codecs/L16/audio_encoder_L16.h index 3ac0423af9..e099bd5747 100644 --- a/api/audio_codecs/L16/audio_encoder_L16.h +++ b/api/audio_codecs/L16/audio_encoder_L16.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ -#define WEBRTC_API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ +#ifndef API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ +#define API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -45,4 +45,4 @@ struct AudioEncoderL16 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ +#endif // API_AUDIO_CODECS_L16_AUDIO_ENCODER_L16_H_ diff --git a/api/audio_codecs/audio_decoder.cc b/api/audio_codecs/audio_decoder.cc index b25e85bd91..af579f444c 100644 --- a/api/audio_codecs/audio_decoder.cc +++ b/api/audio_codecs/audio_decoder.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_decoder.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/array_view.h" +#include "rtc_base/checks.h" +#include "rtc_base/sanitizer.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h index 2d850fd461..6df124230f 100644 --- a/api/audio_codecs/audio_decoder.h +++ b/api/audio_codecs/audio_decoder.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_H_ +#ifndef API_AUDIO_CODECS_AUDIO_DECODER_H_ +#define API_AUDIO_CODECS_AUDIO_DECODER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -174,4 +174,4 @@ class AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_H_ +#endif // API_AUDIO_CODECS_AUDIO_DECODER_H_ diff --git a/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h index 0becf6ffc4..ac0f4519d8 100644 --- a/api/audio_codecs/audio_decoder_factory.h +++ b/api/audio_codecs/audio_decoder_factory.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ +#ifndef API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ +#define API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/rtc_base/refcount.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -34,4 +34,4 @@ class AudioDecoderFactory : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ +#endif // API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_H_ diff --git a/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h index 422a514b8a..eb13e9ffca 100644 --- a/api/audio_codecs/audio_decoder_factory_template.h +++ b/api/audio_codecs/audio_decoder_factory_template.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ +#ifndef API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ +#define API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -121,4 +121,4 @@ rtc::scoped_refptr CreateAudioDecoderFactory() { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ +#endif // API_AUDIO_CODECS_AUDIO_DECODER_FACTORY_TEMPLATE_H_ diff --git a/api/audio_codecs/audio_encoder.cc b/api/audio_codecs/audio_encoder.cc index d5be26c5a1..ccdc61111a 100644 --- a/api/audio_codecs/audio_encoder.cc +++ b/api/audio_codecs/audio_encoder.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_encoder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/trace_event.h" +#include "rtc_base/checks.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/api/audio_codecs/audio_encoder.h b/api/audio_codecs/audio_encoder.h index a1f36ae83e..92528b0a2b 100644 --- a/api/audio_codecs/audio_encoder.h +++ b/api/audio_codecs/audio_encoder.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_H_ +#ifndef API_AUDIO_CODECS_AUDIO_ENCODER_H_ +#define API_AUDIO_CODECS_AUDIO_ENCODER_H_ #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "rtc_base/buffer.h" +#include "rtc_base/deprecation.h" +#include "typedefs.h" namespace webrtc { @@ -248,4 +248,4 @@ class AudioEncoder { rtc::Buffer* encoded) = 0; }; } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_H_ +#endif // API_AUDIO_CODECS_AUDIO_ENCODER_H_ diff --git a/api/audio_codecs/audio_encoder_factory.h b/api/audio_codecs/audio_encoder_factory.h index 820651f177..43461f6b9a 100644 --- a/api/audio_codecs/audio_encoder_factory.h +++ b/api/audio_codecs/audio_encoder_factory.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ +#ifndef API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ +#define API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/rtc_base/refcount.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -43,4 +43,4 @@ class AudioEncoderFactory : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ +#endif // API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_H_ diff --git a/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h index 00bba46f94..8df582e274 100644 --- a/api/audio_codecs/audio_encoder_factory_template.h +++ b/api/audio_codecs/audio_encoder_factory_template.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ +#ifndef API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ +#define API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -139,4 +139,4 @@ rtc::scoped_refptr CreateAudioEncoderFactory() { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ +#endif // API_AUDIO_CODECS_AUDIO_ENCODER_FACTORY_TEMPLATE_H_ diff --git a/api/audio_codecs/audio_format.cc b/api/audio_codecs/audio_format.cc index de8b1fd8d4..45b2e8e191 100644 --- a/api/audio_codecs/audio_format.cc +++ b/api/audio_codecs/audio_format.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/audio_format.h" +#include "api/audio_codecs/audio_format.h" -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { diff --git a/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h index ab825bb960..12e9552e93 100644 --- a/api/audio_codecs/audio_format.h +++ b/api/audio_codecs/audio_format.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_AUDIO_FORMAT_H_ -#define WEBRTC_API_AUDIO_CODECS_AUDIO_FORMAT_H_ +#ifndef API_AUDIO_CODECS_AUDIO_FORMAT_H_ +#define API_AUDIO_CODECS_AUDIO_FORMAT_H_ #include #include #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -139,4 +139,4 @@ std::ostream& operator<<(std::ostream& os, const AudioCodecSpec& acs); } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_AUDIO_FORMAT_H_ +#endif // API_AUDIO_CODECS_AUDIO_FORMAT_H_ diff --git a/api/audio_codecs/builtin_audio_decoder_factory.cc b/api/audio_codecs/builtin_audio_decoder_factory.cc index 69a3e7c533..45354b667f 100644 --- a/api/audio_codecs/builtin_audio_decoder_factory.cc +++ b/api/audio_codecs/builtin_audio_decoder_factory.cc @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" #include #include -#include "webrtc/api/audio_codecs/L16/audio_decoder_L16.h" -#include "webrtc/api/audio_codecs/audio_decoder_factory_template.h" -#include "webrtc/api/audio_codecs/g711/audio_decoder_g711.h" +#include "api/audio_codecs/L16/audio_decoder_L16.h" +#include "api/audio_codecs/audio_decoder_factory_template.h" +#include "api/audio_codecs/g711/audio_decoder_g711.h" #if WEBRTC_USE_BUILTIN_G722 -#include "webrtc/api/audio_codecs/g722/audio_decoder_g722.h" // nogncheck +#include "api/audio_codecs/g722/audio_decoder_g722.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_ILBC -#include "webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h" // nogncheck +#include "api/audio_codecs/ilbc/audio_decoder_ilbc.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_ISAC_FIX -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.h" // nogncheck +#include "api/audio_codecs/isac/audio_decoder_isac_fix.h" // nogncheck #elif WEBRTC_USE_BUILTIN_ISAC_FLOAT -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_float.h" // nogncheck +#include "api/audio_codecs/isac/audio_decoder_isac_float.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_OPUS -#include "webrtc/api/audio_codecs/opus/audio_decoder_opus.h" // nogncheck +#include "api/audio_codecs/opus/audio_decoder_opus.h" // nogncheck #endif namespace webrtc { diff --git a/api/audio_codecs/builtin_audio_decoder_factory.h b/api/audio_codecs/builtin_audio_decoder_factory.h index 5b93158b62..3127403e24 100644 --- a/api/audio_codecs/builtin_audio_decoder_factory.h +++ b/api/audio_codecs/builtin_audio_decoder_factory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ -#define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#ifndef API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#define API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -22,4 +22,4 @@ rtc::scoped_refptr CreateBuiltinAudioDecoderFactory(); } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#endif // API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ diff --git a/api/audio_codecs/builtin_audio_encoder_factory.cc b/api/audio_codecs/builtin_audio_encoder_factory.cc index ae1bf4b306..4b045d6b2f 100644 --- a/api/audio_codecs/builtin_audio_encoder_factory.cc +++ b/api/audio_codecs/builtin_audio_encoder_factory.cc @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" #include #include -#include "webrtc/api/audio_codecs/L16/audio_encoder_L16.h" -#include "webrtc/api/audio_codecs/audio_encoder_factory_template.h" -#include "webrtc/api/audio_codecs/g711/audio_encoder_g711.h" +#include "api/audio_codecs/L16/audio_encoder_L16.h" +#include "api/audio_codecs/audio_encoder_factory_template.h" +#include "api/audio_codecs/g711/audio_encoder_g711.h" #if WEBRTC_USE_BUILTIN_G722 -#include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" // nogncheck +#include "api/audio_codecs/g722/audio_encoder_g722.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_ILBC -#include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h" // nogncheck +#include "api/audio_codecs/ilbc/audio_encoder_ilbc.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_ISAC_FIX -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.h" // nogncheck +#include "api/audio_codecs/isac/audio_encoder_isac_fix.h" // nogncheck #elif WEBRTC_USE_BUILTIN_ISAC_FLOAT -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_float.h" // nogncheck +#include "api/audio_codecs/isac/audio_encoder_isac_float.h" // nogncheck #endif #if WEBRTC_USE_BUILTIN_OPUS -#include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h" // nogncheck +#include "api/audio_codecs/opus/audio_encoder_opus.h" // nogncheck #endif namespace webrtc { diff --git a/api/audio_codecs/builtin_audio_encoder_factory.h b/api/audio_codecs/builtin_audio_encoder_factory.h index 1546cfb575..d37ff257e6 100644 --- a/api/audio_codecs/builtin_audio_encoder_factory.h +++ b/api/audio_codecs/builtin_audio_encoder_factory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ -#define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#ifndef API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#define API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -22,4 +22,4 @@ rtc::scoped_refptr CreateBuiltinAudioEncoderFactory(); } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#endif // API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ diff --git a/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc index cb4b074fee..9453916c30 100644 --- a/api/audio_codecs/g711/audio_decoder_g711.cc +++ b/api/audio_codecs/g711/audio_decoder_g711.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/g711/audio_decoder_g711.h" +#include "api/audio_codecs/g711/audio_decoder_g711.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/g711/audio_decoder_g711.h b/api/audio_codecs/g711/audio_decoder_g711.h index 2824c32fd1..652e23ebcf 100644 --- a/api/audio_codecs/g711/audio_decoder_g711.h +++ b/api/audio_codecs/g711/audio_decoder_g711.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ -#define WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ +#ifndef API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ +#define API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -40,4 +40,4 @@ struct AudioDecoderG711 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ +#endif // API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc index 28fb951409..3031da6ac6 100644 --- a/api/audio_codecs/g711/audio_encoder_g711.cc +++ b/api/audio_codecs/g711/audio_encoder_g711.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/g711/audio_encoder_g711.h" +#include "api/audio_codecs/g711/audio_encoder_g711.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/string_to_number.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/g711/audio_encoder_g711.h b/api/audio_codecs/g711/audio_encoder_g711.h index 57501002c1..ecdb9a3901 100644 --- a/api/audio_codecs/g711/audio_encoder_g711.h +++ b/api/audio_codecs/g711/audio_encoder_g711.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ -#define WEBRTC_API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ +#ifndef API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ +#define API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -45,4 +45,4 @@ struct AudioEncoderG711 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ +#endif // API_AUDIO_CODECS_G711_AUDIO_ENCODER_G711_H_ diff --git a/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc index 6f3ce97de9..bbe0dedf69 100644 --- a/api/audio_codecs/g722/audio_decoder_g722.cc +++ b/api/audio_codecs/g722/audio_decoder_g722.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/g722/audio_decoder_g722.h" +#include "api/audio_codecs/g722/audio_decoder_g722.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/api/audio_codecs/g722/audio_decoder_g722.h b/api/audio_codecs/g722/audio_decoder_g722.h index cf0dfa9602..fddb89aaf8 100644 --- a/api/audio_codecs/g722/audio_decoder_g722.h +++ b/api/audio_codecs/g722/audio_decoder_g722.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ -#define WEBRTC_API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ +#ifndef API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ +#define API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -36,4 +36,4 @@ struct AudioDecoderG722 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ +#endif // API_AUDIO_CODECS_G722_AUDIO_DECODER_G722_H_ diff --git a/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc index b9df585c5f..7686c04f9c 100644 --- a/api/audio_codecs/g722/audio_encoder_g722.cc +++ b/api/audio_codecs/g722/audio_encoder_g722.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" +#include "api/audio_codecs/g722/audio_encoder_g722.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/string_to_number.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/g722/audio_encoder_g722.h b/api/audio_codecs/g722/audio_encoder_g722.h index 37cb968ee3..6c8b689894 100644 --- a/api/audio_codecs/g722/audio_encoder_g722.h +++ b/api/audio_codecs/g722/audio_encoder_g722.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ -#define WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ +#ifndef API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ +#define API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/audio_codecs/g722/audio_encoder_g722_config.h" +#include "api/optional.h" namespace webrtc { @@ -37,4 +37,4 @@ struct AudioEncoderG722 { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ +#endif // API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_H_ diff --git a/api/audio_codecs/g722/audio_encoder_g722_config.h b/api/audio_codecs/g722/audio_encoder_g722_config.h index fa26942976..773e430ce3 100644 --- a/api/audio_codecs/g722/audio_encoder_g722_config.h +++ b/api/audio_codecs/g722/audio_encoder_g722_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ -#define WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ +#ifndef API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ +#define API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ namespace webrtc { @@ -24,4 +24,4 @@ struct AudioEncoderG722Config { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ +#endif // API_AUDIO_CODECS_G722_AUDIO_ENCODER_G722_CONFIG_H_ diff --git a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc index dc1775189e..17b11516a4 100644 --- a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc +++ b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h" +#include "api/audio_codecs/ilbc/audio_decoder_ilbc.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/api/audio_codecs/ilbc/audio_decoder_ilbc.h b/api/audio_codecs/ilbc/audio_decoder_ilbc.h index 343308df9a..f7292d60c6 100644 --- a/api/audio_codecs/ilbc/audio_decoder_ilbc.h +++ b/api/audio_codecs/ilbc/audio_decoder_ilbc.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ -#define WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#ifndef API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#define API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -33,4 +33,4 @@ struct AudioDecoderIlbc { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#endif // API_AUDIO_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc index fd11f006eb..990a2b4245 100644 --- a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc +++ b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h" +#include "api/audio_codecs/ilbc/audio_encoder_ilbc.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/string_to_number.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/string_to_number.h" namespace webrtc { namespace { diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc.h b/api/audio_codecs/ilbc/audio_encoder_ilbc.h index a30d1092e8..22c7a67071 100644 --- a/api/audio_codecs/ilbc/audio_encoder_ilbc.h +++ b/api/audio_codecs/ilbc/audio_encoder_ilbc.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ -#define WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#ifndef API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#define API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" +#include "api/optional.h" namespace webrtc { @@ -37,4 +37,4 @@ struct AudioEncoderIlbc { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#endif // API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h b/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h index 429ac8112d..22909a957b 100644 --- a/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h +++ b/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ -#define WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ +#ifndef API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ +#define API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ namespace webrtc { @@ -26,4 +26,4 @@ struct AudioEncoderIlbcConfig { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ +#endif // API_AUDIO_CODECS_ILBC_AUDIO_ENCODER_ILBC_CONFIG_H_ diff --git a/api/audio_codecs/isac/audio_decoder_isac_fix.cc b/api/audio_codecs/isac/audio_decoder_isac_fix.cc index ef8655fc25..d84d6dd9bb 100644 --- a/api/audio_codecs/isac/audio_decoder_isac_fix.cc +++ b/api/audio_codecs/isac/audio_decoder_isac_fix.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.h" +#include "api/audio_codecs/isac/audio_decoder_isac_fix.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/api/audio_codecs/isac/audio_decoder_isac_fix.h b/api/audio_codecs/isac/audio_decoder_isac_fix.h index 7662002a84..f3d210eb84 100644 --- a/api/audio_codecs/isac/audio_decoder_isac_fix.h +++ b/api/audio_codecs/isac/audio_decoder_isac_fix.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ -#define WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ +#ifndef API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ +#define API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -33,4 +33,4 @@ struct AudioDecoderIsacFix { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ +#endif // API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FIX_H_ diff --git a/api/audio_codecs/isac/audio_decoder_isac_float.cc b/api/audio_codecs/isac/audio_decoder_isac_float.cc index e26e6514bb..ebe01e7154 100644 --- a/api/audio_codecs/isac/audio_decoder_isac_float.cc +++ b/api/audio_codecs/isac/audio_decoder_isac_float.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_float.h" +#include "api/audio_codecs/isac/audio_decoder_isac_float.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/api/audio_codecs/isac/audio_decoder_isac_float.h b/api/audio_codecs/isac/audio_decoder_isac_float.h index f0232e9209..1decd5af3d 100644 --- a/api/audio_codecs/isac/audio_decoder_isac_float.h +++ b/api/audio_codecs/isac/audio_decoder_isac_float.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ -#define WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ +#ifndef API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ +#define API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -38,4 +38,4 @@ struct AudioDecoderIsacFloat { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ +#endif // API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_ diff --git a/api/audio_codecs/isac/audio_encoder_isac_fix.cc b/api/audio_codecs/isac/audio_encoder_isac_fix.cc index c07957d984..2b3a9566bb 100644 --- a/api/audio_codecs/isac/audio_encoder_isac_fix.cc +++ b/api/audio_codecs/isac/audio_encoder_isac_fix.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.h" +#include "api/audio_codecs/isac/audio_encoder_isac_fix.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/string_to_number.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/isac/audio_encoder_isac_fix.h b/api/audio_codecs/isac/audio_encoder_isac_fix.h index ce4a1d01b3..5970c02534 100644 --- a/api/audio_codecs/isac/audio_encoder_isac_fix.h +++ b/api/audio_codecs/isac/audio_encoder_isac_fix.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ -#define WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ +#ifndef API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ +#define API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -38,4 +38,4 @@ struct AudioEncoderIsacFix { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ +#endif // API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FIX_H_ diff --git a/api/audio_codecs/isac/audio_encoder_isac_float.cc b/api/audio_codecs/isac/audio_encoder_isac_float.cc index 500cfd1797..8e3afe252a 100644 --- a/api/audio_codecs/isac/audio_encoder_isac_float.cc +++ b/api/audio_codecs/isac/audio_encoder_isac_float.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_float.h" +#include "api/audio_codecs/isac/audio_encoder_isac_float.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/string_to_number.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/string_to_number.h" namespace webrtc { diff --git a/api/audio_codecs/isac/audio_encoder_isac_float.h b/api/audio_codecs/isac/audio_encoder_isac_float.h index 244e59b11d..f14c2a25f5 100644 --- a/api/audio_codecs/isac/audio_encoder_isac_float.h +++ b/api/audio_codecs/isac/audio_encoder_isac_float.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ -#define WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ +#ifndef API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ +#define API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -43,4 +43,4 @@ struct AudioEncoderIsacFloat { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ +#endif // API_AUDIO_CODECS_ISAC_AUDIO_ENCODER_ISAC_FLOAT_H_ diff --git a/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc index 7f478febd1..1dd315eed6 100644 --- a/api/audio_codecs/opus/audio_decoder_opus.cc +++ b/api/audio_codecs/opus/audio_decoder_opus.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/opus/audio_decoder_opus.h" +#include "api/audio_codecs/opus/audio_decoder_opus.h" #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/api/audio_codecs/opus/audio_decoder_opus.h b/api/audio_codecs/opus/audio_decoder_opus.h index 272503da94..0cd917f04b 100644 --- a/api/audio_codecs/opus/audio_decoder_opus.h +++ b/api/audio_codecs/opus/audio_decoder_opus.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ -#define WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#ifndef API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#define API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -35,4 +35,4 @@ struct AudioDecoderOpus { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#endif // API_AUDIO_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ diff --git a/api/audio_codecs/opus/audio_encoder_opus.h b/api/audio_codecs/opus/audio_encoder_opus.h index 4763f44910..3108cbfb2a 100644 --- a/api/audio_codecs/opus/audio_encoder_opus.h +++ b/api/audio_codecs/opus/audio_encoder_opus.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ -#define WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#ifndef API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#define API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" namespace webrtc { @@ -37,4 +37,4 @@ struct AudioEncoderOpus { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#endif // API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ diff --git a/api/audio_codecs/opus/audio_encoder_opus_config.cc b/api/audio_codecs/opus/audio_encoder_opus_config.cc index 7d29883b39..301c25695d 100644 --- a/api/audio_codecs/opus/audio_encoder_opus_config.cc +++ b/api/audio_codecs/opus/audio_encoder_opus_config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h" +#include "api/audio_codecs/opus/audio_encoder_opus_config.h" namespace webrtc { diff --git a/api/audio_codecs/opus/audio_encoder_opus_config.h b/api/audio_codecs/opus/audio_encoder_opus_config.h index d07f7848e7..d586592ab0 100644 --- a/api/audio_codecs/opus/audio_encoder_opus_config.h +++ b/api/audio_codecs/opus/audio_encoder_opus_config.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ -#define WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ +#ifndef API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ +#define API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -70,4 +70,4 @@ struct AudioEncoderOpusConfig { } // namespace webrtc -#endif // WEBRTC_API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ +#endif // API_AUDIO_CODECS_OPUS_AUDIO_ENCODER_OPUS_CONFIG_H_ diff --git a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc index 0b1135cf2b..25876c2fe5 100644 --- a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc +++ b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/audio_decoder_factory_template.h" -#include "webrtc/api/audio_codecs/L16/audio_decoder_L16.h" -#include "webrtc/api/audio_codecs/g711/audio_decoder_g711.h" -#include "webrtc/api/audio_codecs/g722/audio_decoder_g722.h" -#include "webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h" -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_fix.h" -#include "webrtc/api/audio_codecs/isac/audio_decoder_isac_float.h" -#include "webrtc/api/audio_codecs/opus/audio_decoder_opus.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder.h" +#include "api/audio_codecs/audio_decoder_factory_template.h" +#include "api/audio_codecs/L16/audio_decoder_L16.h" +#include "api/audio_codecs/g711/audio_decoder_g711.h" +#include "api/audio_codecs/g722/audio_decoder_g722.h" +#include "api/audio_codecs/ilbc/audio_decoder_ilbc.h" +#include "api/audio_codecs/isac/audio_decoder_isac_fix.h" +#include "api/audio_codecs/isac/audio_decoder_isac_float.h" +#include "api/audio_codecs/opus/audio_decoder_opus.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder.h" namespace webrtc { diff --git a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc index 891821a803..9468235dcd 100644 --- a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc +++ b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/audio_encoder_factory_template.h" -#include "webrtc/api/audio_codecs/L16/audio_encoder_L16.h" -#include "webrtc/api/audio_codecs/g711/audio_encoder_g711.h" -#include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" -#include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h" -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_fix.h" -#include "webrtc/api/audio_codecs/isac/audio_encoder_isac_float.h" -#include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" +#include "api/audio_codecs/audio_encoder_factory_template.h" +#include "api/audio_codecs/L16/audio_encoder_L16.h" +#include "api/audio_codecs/g711/audio_encoder_g711.h" +#include "api/audio_codecs/g722/audio_encoder_g722.h" +#include "api/audio_codecs/ilbc/audio_encoder_ilbc.h" +#include "api/audio_codecs/isac/audio_encoder_isac_fix.h" +#include "api/audio_codecs/isac/audio_encoder_isac_float.h" +#include "api/audio_codecs/opus/audio_encoder_opus.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" namespace webrtc { diff --git a/api/call/audio_sink.h b/api/call/audio_sink.h index 8d38763f94..fa4c3f6814 100644 --- a/api/call/audio_sink.h +++ b/api/call/audio_sink.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_CALL_AUDIO_SINK_H_ -#define WEBRTC_API_CALL_AUDIO_SINK_H_ +#ifndef API_CALL_AUDIO_SINK_H_ +#define API_CALL_AUDIO_SINK_H_ #if defined(WEBRTC_POSIX) && !defined(__STDC_FORMAT_MACROS) // Avoid conflict with format_macros.h. @@ -50,4 +50,4 @@ class AudioSinkInterface { } // namespace webrtc -#endif // WEBRTC_API_CALL_AUDIO_SINK_H_ +#endif // API_CALL_AUDIO_SINK_H_ diff --git a/api/call/transport.h b/api/call/transport.h index 1126f628fe..1cdb0d366d 100644 --- a/api/call/transport.h +++ b/api/call/transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_CALL_TRANSPORT_H_ -#define WEBRTC_API_CALL_TRANSPORT_H_ +#ifndef API_CALL_TRANSPORT_H_ +#define API_CALL_TRANSPORT_H_ #include #include @@ -37,4 +37,4 @@ class Transport { } // namespace webrtc -#endif // WEBRTC_API_CALL_TRANSPORT_H_ +#endif // API_CALL_TRANSPORT_H_ diff --git a/api/datachannel.h b/api/datachannel.h index 28112addbb..70be913a81 100644 --- a/api/datachannel.h +++ b/api/datachannel.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_DATACHANNEL_H_ -#define WEBRTC_API_DATACHANNEL_H_ +#ifndef API_DATACHANNEL_H_ +#define API_DATACHANNEL_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/datachannel.h" +#include "pc/datachannel.h" -#endif // WEBRTC_API_DATACHANNEL_H_ +#endif // API_DATACHANNEL_H_ diff --git a/api/datachannelinterface.h b/api/datachannelinterface.h index 1395a2e855..4ab7efb740 100644 --- a/api/datachannelinterface.h +++ b/api/datachannelinterface.h @@ -11,15 +11,15 @@ // This file contains interfaces for DataChannels // http://dev.w3.org/2011/webrtc/editor/webrtc.html#rtcdatachannel -#ifndef WEBRTC_API_DATACHANNELINTERFACE_H_ -#define WEBRTC_API_DATACHANNELINTERFACE_H_ +#ifndef API_DATACHANNELINTERFACE_H_ +#define API_DATACHANNELINTERFACE_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -180,4 +180,4 @@ class DataChannelInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_DATACHANNELINTERFACE_H_ +#endif // API_DATACHANNELINTERFACE_H_ diff --git a/api/dtmfsenderinterface.h b/api/dtmfsenderinterface.h index 68a08ffc92..8f0ab71206 100644 --- a/api/dtmfsenderinterface.h +++ b/api/dtmfsenderinterface.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_DTMFSENDERINTERFACE_H_ -#define WEBRTC_API_DTMFSENDERINTERFACE_H_ +#ifndef API_DTMFSENDERINTERFACE_H_ +#define API_DTMFSENDERINTERFACE_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/rtc_base/refcount.h" +#include "api/mediastreaminterface.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -94,4 +94,4 @@ class DtmfSenderInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_DTMFSENDERINTERFACE_H_ +#endif // API_DTMFSENDERINTERFACE_H_ diff --git a/api/fakemetricsobserver.cc b/api/fakemetricsobserver.cc index d804f0dfb9..d09bf17185 100644 --- a/api/fakemetricsobserver.cc +++ b/api/fakemetricsobserver.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/rtc_base/checks.h" +#include "api/fakemetricsobserver.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/api/fakemetricsobserver.h b/api/fakemetricsobserver.h index 760801238c..afd019391a 100644 --- a/api/fakemetricsobserver.h +++ b/api/fakemetricsobserver.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_FAKEMETRICSOBSERVER_H_ -#define WEBRTC_API_FAKEMETRICSOBSERVER_H_ +#ifndef API_FAKEMETRICSOBSERVER_H_ +#define API_FAKEMETRICSOBSERVER_H_ #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/peerconnectioninterface.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -49,4 +49,4 @@ class FakeMetricsObserver : public MetricsObserverInterface { } // namespace webrtc -#endif // WEBRTC_API_FAKEMETRICSOBSERVER_H_ +#endif // API_FAKEMETRICSOBSERVER_H_ diff --git a/api/jsep.h b/api/jsep.h index cfb604d92e..acfffd4d0a 100644 --- a/api/jsep.h +++ b/api/jsep.h @@ -17,15 +17,15 @@ // Though in the future, we're planning to provide an SDP parsing API, with a // structure more friendly than cricket::SessionDescription. -#ifndef WEBRTC_API_JSEP_H_ -#define WEBRTC_API_JSEP_H_ +#ifndef API_JSEP_H_ +#define API_JSEP_H_ #include #include #include -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/refcount.h" namespace cricket { class Candidate; @@ -172,4 +172,4 @@ class SetSessionDescriptionObserver : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_JSEP_H_ +#endif // API_JSEP_H_ diff --git a/api/jsepicecandidate.h b/api/jsepicecandidate.h index 0b349917b7..2965e866af 100644 --- a/api/jsepicecandidate.h +++ b/api/jsepicecandidate.h @@ -11,16 +11,16 @@ // TODO(deadbeef): Move this out of api/; it's an implementation detail and // shouldn't be used externally. -#ifndef WEBRTC_API_JSEPICECANDIDATE_H_ -#define WEBRTC_API_JSEPICECANDIDATE_H_ +#ifndef API_JSEPICECANDIDATE_H_ +#define API_JSEPICECANDIDATE_H_ #include #include #include -#include "webrtc/api/jsep.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/jsep.h" +#include "p2p/base/candidate.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -90,4 +90,4 @@ class JsepCandidateCollection : public IceCandidateCollection { } // namespace webrtc -#endif // WEBRTC_API_JSEPICECANDIDATE_H_ +#endif // API_JSEPICECANDIDATE_H_ diff --git a/api/jsepsessiondescription.h b/api/jsepsessiondescription.h index 69945b411e..21adfeefc0 100644 --- a/api/jsepsessiondescription.h +++ b/api/jsepsessiondescription.h @@ -11,17 +11,17 @@ // TODO(deadbeef): Move this out of api/; it's an implementation detail and // shouldn't be used externally. -#ifndef WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ -#define WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ +#ifndef API_JSEPSESSIONDESCRIPTION_H_ +#define API_JSEPSESSIONDESCRIPTION_H_ #include #include #include -#include "webrtc/api/jsep.h" -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/jsep.h" +#include "api/jsepicecandidate.h" +#include "p2p/base/candidate.h" +#include "rtc_base/constructormagic.h" namespace cricket { class SessionDescription; @@ -86,4 +86,4 @@ class JsepSessionDescription : public SessionDescriptionInterface { } // namespace webrtc -#endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ +#endif // API_JSEPSESSIONDESCRIPTION_H_ diff --git a/api/mediaconstraintsinterface.cc b/api/mediaconstraintsinterface.cc index 15deebf2a3..2894f5b23d 100644 --- a/api/mediaconstraintsinterface.cc +++ b/api/mediaconstraintsinterface.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediaconstraintsinterface.h" +#include "api/mediaconstraintsinterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/rtc_base/stringencode.h" +#include "api/peerconnectioninterface.h" +#include "rtc_base/stringencode.h" namespace { diff --git a/api/mediaconstraintsinterface.h b/api/mediaconstraintsinterface.h index eb89b3ee52..ebeec0018f 100644 --- a/api/mediaconstraintsinterface.h +++ b/api/mediaconstraintsinterface.h @@ -17,14 +17,14 @@ // from WebRTC too. // https://bugs.chromium.org/p/webrtc/issues/detail?id=5617 -#ifndef WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_ -#define WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_ +#ifndef API_MEDIACONSTRAINTSINTERFACE_H_ +#define API_MEDIACONSTRAINTSINTERFACE_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/peerconnectioninterface.h" +#include "api/optional.h" +#include "api/peerconnectioninterface.h" namespace webrtc { @@ -151,4 +151,4 @@ void CopyConstraintsIntoAudioOptions( } // namespace webrtc -#endif // WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_ +#endif // API_MEDIACONSTRAINTSINTERFACE_H_ diff --git a/api/mediastream.h b/api/mediastream.h index e6556c5833..f7bae635a2 100644 --- a/api/mediastream.h +++ b/api/mediastream.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_MEDIASTREAM_H_ -#define WEBRTC_API_MEDIASTREAM_H_ +#ifndef API_MEDIASTREAM_H_ +#define API_MEDIASTREAM_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/mediastream.h" +#include "pc/mediastream.h" -#endif // WEBRTC_API_MEDIASTREAM_H_ +#endif // API_MEDIASTREAM_H_ diff --git a/api/mediastreaminterface.cc b/api/mediastreaminterface.cc index d4fe5cbc2b..465aac6f4b 100644 --- a/api/mediastreaminterface.cc +++ b/api/mediastreaminterface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" namespace webrtc { diff --git a/api/mediastreaminterface.h b/api/mediastreaminterface.h index c3966dc3e2..4e5fde1822 100644 --- a/api/mediastreaminterface.h +++ b/api/mediastreaminterface.h @@ -14,27 +14,27 @@ // interfaces must be used only with PeerConnection. PeerConnectionManager // interface provides the factory methods to create MediaStream and MediaTracks. -#ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_ -#define WEBRTC_API_MEDIASTREAMINTERFACE_H_ +#ifndef API_MEDIASTREAMINTERFACE_H_ +#define API_MEDIASTREAMINTERFACE_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_frame.h" +#include "api/optional.h" +#include "api/video/video_frame.h" // TODO(zhihuang): Remove unrelated headers once downstream applications stop // relying on them; they were previously transitively included by // mediachannel.h, which is no longer a dependency of this file. -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "media/base/streamparams.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace webrtc { @@ -321,4 +321,4 @@ class MediaStreamInterface : public rtc::RefCountInterface, } // namespace webrtc -#endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_ +#endif // API_MEDIASTREAMINTERFACE_H_ diff --git a/api/mediastreamproxy.h b/api/mediastreamproxy.h index 15b40eda52..e32d52b16b 100644 --- a/api/mediastreamproxy.h +++ b/api/mediastreamproxy.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_MEDIASTREAMPROXY_H_ -#define WEBRTC_API_MEDIASTREAMPROXY_H_ +#ifndef API_MEDIASTREAMPROXY_H_ +#define API_MEDIASTREAMPROXY_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/proxy.h" +#include "api/mediastreaminterface.h" +#include "api/proxy.h" namespace webrtc { @@ -41,4 +41,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_MEDIASTREAMPROXY_H_ +#endif // API_MEDIASTREAMPROXY_H_ diff --git a/api/mediastreamtrack.h b/api/mediastreamtrack.h index 6075abec63..4b214a48d0 100644 --- a/api/mediastreamtrack.h +++ b/api/mediastreamtrack.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_MEDIASTREAMTRACK_H_ -#define WEBRTC_API_MEDIASTREAMTRACK_H_ +#ifndef API_MEDIASTREAMTRACK_H_ +#define API_MEDIASTREAMTRACK_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/mediastreamtrack.h" +#include "pc/mediastreamtrack.h" -#endif // WEBRTC_API_MEDIASTREAMTRACK_H_ +#endif // API_MEDIASTREAMTRACK_H_ diff --git a/api/mediastreamtrackproxy.h b/api/mediastreamtrackproxy.h index 605f3f2dfe..57a7695599 100644 --- a/api/mediastreamtrackproxy.h +++ b/api/mediastreamtrackproxy.h @@ -11,13 +11,13 @@ // This file includes proxy classes for tracks. The purpose is // to make sure tracks are only accessed from the signaling thread. -#ifndef WEBRTC_API_MEDIASTREAMTRACKPROXY_H_ -#define WEBRTC_API_MEDIASTREAMTRACKPROXY_H_ +#ifndef API_MEDIASTREAMTRACKPROXY_H_ +#define API_MEDIASTREAMTRACKPROXY_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/proxy.h" +#include "api/mediastreaminterface.h" +#include "api/proxy.h" namespace webrtc { @@ -62,4 +62,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_MEDIASTREAMTRACKPROXY_H_ +#endif // API_MEDIASTREAMTRACKPROXY_H_ diff --git a/api/mediatypes.cc b/api/mediatypes.cc index 108b69795f..599542db08 100644 --- a/api/mediatypes.cc +++ b/api/mediatypes.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediatypes.h" +#include "api/mediatypes.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/rtc_base/checks.h" +#include "api/mediastreaminterface.h" +#include "rtc_base/checks.h" namespace { static const char* kMediaTypeData = "data"; diff --git a/api/mediatypes.h b/api/mediatypes.h index ec3a70a5e8..93ce1a231d 100644 --- a/api/mediatypes.h +++ b/api/mediatypes.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_MEDIATYPES_H_ -#define WEBRTC_API_MEDIATYPES_H_ +#ifndef API_MEDIATYPES_H_ +#define API_MEDIATYPES_H_ #include @@ -28,4 +28,4 @@ MediaType MediaTypeFromString(const std::string& type_str); } // namespace cricket -#endif // WEBRTC_API_MEDIATYPES_H_ +#endif // API_MEDIATYPES_H_ diff --git a/api/notifier.h b/api/notifier.h index e142d14576..ceeda4de55 100644 --- a/api/notifier.h +++ b/api/notifier.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_NOTIFIER_H_ -#define WEBRTC_API_NOTIFIER_H_ +#ifndef API_NOTIFIER_H_ +#define API_NOTIFIER_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/rtc_base/checks.h" +#include "api/mediastreaminterface.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -58,4 +58,4 @@ class Notifier : public T { } // namespace webrtc -#endif // WEBRTC_API_NOTIFIER_H_ +#endif // API_NOTIFIER_H_ diff --git a/api/optional.cc b/api/optional.cc index ec8696661f..ab0157bef9 100644 --- a/api/optional.cc +++ b/api/optional.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace rtc { namespace optional_internal { diff --git a/api/optional.h b/api/optional.h index de1ec764bf..ae4cd5f1d2 100644 --- a/api/optional.h +++ b/api/optional.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_OPTIONAL_H_ -#define WEBRTC_API_OPTIONAL_H_ +#ifndef API_OPTIONAL_H_ +#define API_OPTIONAL_H_ #include #include @@ -20,9 +20,9 @@ #include #endif // UNIT_TEST -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "api/array_view.h" +#include "rtc_base/checks.h" +#include "rtc_base/sanitizer.h" namespace rtc { @@ -404,4 +404,4 @@ void PrintTo(const rtc::Optional& opt, std::ostream* os) { } // namespace rtc -#endif // WEBRTC_API_OPTIONAL_H_ +#endif // API_OPTIONAL_H_ diff --git a/api/optional_unittest.cc b/api/optional_unittest.cc index f8f9cf300a..d149620360 100644 --- a/api/optional_unittest.cc +++ b/api/optional_unittest.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/optional.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/api/ortc/mediadescription.cc b/api/ortc/mediadescription.cc index 9fca55c9e5..d5155f22fe 100644 --- a/api/ortc/mediadescription.cc +++ b/api/ortc/mediadescription.cc @@ -8,6 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/ortc/mediadescription.h" +#include "api/ortc/mediadescription.h" namespace webrtc {} diff --git a/api/ortc/mediadescription.h b/api/ortc/mediadescription.h index d638dfc433..008aa31f32 100644 --- a/api/ortc/mediadescription.h +++ b/api/ortc/mediadescription.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_MEDIADESCRIPTION_H_ -#define WEBRTC_API_ORTC_MEDIADESCRIPTION_H_ +#ifndef API_ORTC_MEDIADESCRIPTION_H_ +#define API_ORTC_MEDIADESCRIPTION_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/media/base/cryptoparams.h" +#include "api/optional.h" +#include "media/base/cryptoparams.h" namespace webrtc { @@ -50,4 +50,4 @@ class MediaDescription { } // namespace webrtc -#endif // WEBRTC_API_ORTC_MEDIADESCRIPTION_H_ +#endif // API_ORTC_MEDIADESCRIPTION_H_ diff --git a/api/ortc/mediadescription_unittest.cc b/api/ortc/mediadescription_unittest.cc index d033a4eafb..9ff943af6f 100644 --- a/api/ortc/mediadescription_unittest.cc +++ b/api/ortc/mediadescription_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/ortc/mediadescription.h" -#include "webrtc/test/gtest.h" +#include "api/ortc/mediadescription.h" +#include "test/gtest.h" namespace webrtc { diff --git a/api/ortc/ortcfactoryinterface.h b/api/ortc/ortcfactoryinterface.h index 4880d9d9ca..15be4f0250 100644 --- a/api/ortc/ortcfactoryinterface.h +++ b/api/ortc/ortcfactoryinterface.h @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_ORTCFACTORYINTERFACE_H_ -#define WEBRTC_API_ORTC_ORTCFACTORYINTERFACE_H_ +#ifndef API_ORTC_ORTCFACTORYINTERFACE_H_ +#define API_ORTC_ORTCFACTORYINTERFACE_H_ #include #include #include // For std::move. -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/ortc/ortcrtpreceiverinterface.h" -#include "webrtc/api/ortc/ortcrtpsenderinterface.h" -#include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/api/ortc/rtptransportcontrollerinterface.h" -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/api/ortc/srtptransportinterface.h" -#include "webrtc/api/ortc/udptransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/p2p/base/packetsocketfactory.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" +#include "api/mediaconstraintsinterface.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/ortc/ortcrtpreceiverinterface.h" +#include "api/ortc/ortcrtpsenderinterface.h" +#include "api/ortc/packettransportinterface.h" +#include "api/ortc/rtptransportcontrollerinterface.h" +#include "api/ortc/rtptransportinterface.h" +#include "api/ortc/srtptransportinterface.h" +#include "api/ortc/udptransportinterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" +#include "p2p/base/packetsocketfactory.h" +#include "rtc_base/network.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -236,4 +236,4 @@ class OrtcFactoryInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_ORTCFACTORYINTERFACE_H_ +#endif // API_ORTC_ORTCFACTORYINTERFACE_H_ diff --git a/api/ortc/ortcrtpreceiverinterface.h b/api/ortc/ortcrtpreceiverinterface.h index 1fad29c581..59ff977621 100644 --- a/api/ortc/ortcrtpreceiverinterface.h +++ b/api/ortc/ortcrtpreceiverinterface.h @@ -15,14 +15,14 @@ // DtlsTransport. This is to allow different types of RTP transports (besides // DTLS-SRTP) to be used. -#ifndef WEBRTC_API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ -#define WEBRTC_API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ +#ifndef API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ +#define API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/ortc/rtptransportinterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" namespace webrtc { @@ -81,4 +81,4 @@ class OrtcRtpReceiverInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ +#endif // API_ORTC_ORTCRTPRECEIVERINTERFACE_H_ diff --git a/api/ortc/ortcrtpsenderinterface.h b/api/ortc/ortcrtpsenderinterface.h index a0fc208a58..fd4dfaa790 100644 --- a/api/ortc/ortcrtpsenderinterface.h +++ b/api/ortc/ortcrtpsenderinterface.h @@ -15,14 +15,14 @@ // DtlsTransport. This is to allow different types of RTP transports (besides // DTLS-SRTP) to be used. -#ifndef WEBRTC_API_ORTC_ORTCRTPSENDERINTERFACE_H_ -#define WEBRTC_API_ORTC_ORTCRTPSENDERINTERFACE_H_ +#ifndef API_ORTC_ORTCRTPSENDERINTERFACE_H_ +#define API_ORTC_ORTCRTPSENDERINTERFACE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/ortc/rtptransportinterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" namespace webrtc { @@ -74,4 +74,4 @@ class OrtcRtpSenderInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_ORTCRTPSENDERINTERFACE_H_ +#endif // API_ORTC_ORTCRTPSENDERINTERFACE_H_ diff --git a/api/ortc/packettransportinterface.h b/api/ortc/packettransportinterface.h index 2677ce62ca..9d53ad311b 100644 --- a/api/ortc/packettransportinterface.h +++ b/api/ortc/packettransportinterface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_PACKETTRANSPORTINTERFACE_H_ -#define WEBRTC_API_ORTC_PACKETTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_PACKETTRANSPORTINTERFACE_H_ +#define API_ORTC_PACKETTRANSPORTINTERFACE_H_ namespace rtc { @@ -35,4 +35,4 @@ class PacketTransportInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_PACKETTRANSPORTINTERFACE_H_ +#endif // API_ORTC_PACKETTRANSPORTINTERFACE_H_ diff --git a/api/ortc/rtptransportcontrollerinterface.h b/api/ortc/rtptransportcontrollerinterface.h index d1d0e448b7..85f37fa7a0 100644 --- a/api/ortc/rtptransportcontrollerinterface.h +++ b/api/ortc/rtptransportcontrollerinterface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ -#define WEBRTC_API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ +#ifndef API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ +#define API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ #include -#include "webrtc/api/ortc/rtptransportinterface.h" +#include "api/ortc/rtptransportinterface.h" namespace webrtc { @@ -54,4 +54,4 @@ class RtpTransportControllerInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ +#endif // API_ORTC_RTPTRANSPORTCONTROLLERINTERFACE_H_ diff --git a/api/ortc/rtptransportinterface.h b/api/ortc/rtptransportinterface.h index 1fdc12caab..53b0a53195 100644 --- a/api/ortc/rtptransportinterface.h +++ b/api/ortc/rtptransportinterface.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_RTPTRANSPORTINTERFACE_H_ -#define WEBRTC_API_ORTC_RTPTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_RTPTRANSPORTINTERFACE_H_ +#define API_ORTC_RTPTRANSPORTINTERFACE_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/common_types.h" +#include "api/optional.h" +#include "api/ortc/packettransportinterface.h" +#include "api/rtcerror.h" +#include "common_types.h" namespace webrtc { @@ -120,4 +120,4 @@ class RtpTransportInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_RTPTRANSPORTINTERFACE_H_ +#endif // API_ORTC_RTPTRANSPORTINTERFACE_H_ diff --git a/api/ortc/sessiondescription.cc b/api/ortc/sessiondescription.cc index c1d4bbb6f1..1078884ecb 100644 --- a/api/ortc/sessiondescription.cc +++ b/api/ortc/sessiondescription.cc @@ -8,6 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/ortc/sessiondescription.h" +#include "api/ortc/sessiondescription.h" namespace webrtc {} diff --git a/api/ortc/sessiondescription.h b/api/ortc/sessiondescription.h index 52f9b0c93c..ebbaa27d6f 100644 --- a/api/ortc/sessiondescription.h +++ b/api/ortc/sessiondescription.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_SESSIONDESCRIPTION_H_ -#define WEBRTC_API_ORTC_SESSIONDESCRIPTION_H_ +#ifndef API_ORTC_SESSIONDESCRIPTION_H_ +#define API_ORTC_SESSIONDESCRIPTION_H_ #include #include @@ -42,4 +42,4 @@ class SessionDescription { } // namespace webrtc -#endif // WEBRTC_API_ORTC_SESSIONDESCRIPTION_H_ +#endif // API_ORTC_SESSIONDESCRIPTION_H_ diff --git a/api/ortc/sessiondescription_unittest.cc b/api/ortc/sessiondescription_unittest.cc index 00d9198062..fd6f43de43 100644 --- a/api/ortc/sessiondescription_unittest.cc +++ b/api/ortc/sessiondescription_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/ortc/sessiondescription.h" -#include "webrtc/test/gtest.h" +#include "api/ortc/sessiondescription.h" +#include "test/gtest.h" namespace webrtc { diff --git a/api/ortc/srtptransportinterface.h b/api/ortc/srtptransportinterface.h index f64618c5dc..79950d63a9 100644 --- a/api/ortc/srtptransportinterface.h +++ b/api/ortc/srtptransportinterface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_SRTPTRANSPORTINTERFACE_H_ -#define WEBRTC_API_ORTC_SRTPTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_SRTPTRANSPORTINTERFACE_H_ +#define API_ORTC_SRTPTRANSPORTINTERFACE_H_ -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/media/base/cryptoparams.h" +#include "api/ortc/rtptransportinterface.h" +#include "api/rtcerror.h" +#include "media/base/cryptoparams.h" namespace webrtc { @@ -45,4 +45,4 @@ class SrtpTransportInterface : public RtpTransportInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_SRTPTRANSPORTINTERFACE_H_ +#endif // API_ORTC_SRTPTRANSPORTINTERFACE_H_ diff --git a/api/ortc/udptransportinterface.h b/api/ortc/udptransportinterface.h index cdcd3213e2..f246a25e9d 100644 --- a/api/ortc/udptransportinterface.h +++ b/api/ortc/udptransportinterface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ORTC_UDPTRANSPORTINTERFACE_H_ -#define WEBRTC_API_ORTC_UDPTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_UDPTRANSPORTINTERFACE_H_ +#define API_ORTC_UDPTRANSPORTINTERFACE_H_ -#include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/api/proxy.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "api/ortc/packettransportinterface.h" +#include "api/proxy.h" +#include "rtc_base/socketaddress.h" namespace webrtc { @@ -46,4 +46,4 @@ class UdpTransportInterface : public virtual PacketTransportInterface { } // namespace webrtc -#endif // WEBRTC_API_ORTC_UDPTRANSPORTINTERFACE_H_ +#endif // API_ORTC_UDPTRANSPORTINTERFACE_H_ diff --git a/api/peerconnectionfactoryproxy.h b/api/peerconnectionfactoryproxy.h index 52f510919d..430bca525e 100644 --- a/api/peerconnectionfactoryproxy.h +++ b/api/peerconnectionfactoryproxy.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ -#define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ +#ifndef API_PEERCONNECTIONFACTORYPROXY_H_ +#define API_PEERCONNECTIONFACTORYPROXY_H_ #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/proxy.h" -#include "webrtc/rtc_base/bind.h" +#include "api/peerconnectioninterface.h" +#include "api/proxy.h" +#include "rtc_base/bind.h" namespace webrtc { @@ -75,4 +75,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ +#endif // API_PEERCONNECTIONFACTORYPROXY_H_ diff --git a/api/peerconnectioninterface.h b/api/peerconnectioninterface.h index e23b70592f..13e78e6455 100644 --- a/api/peerconnectioninterface.h +++ b/api/peerconnectioninterface.h @@ -64,37 +64,37 @@ // 7. Once a candidate has been gathered, the PeerConnection will call the // observer function OnIceCandidate. Send these candidates to the remote peer. -#ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ -#define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ +#ifndef API_PEERCONNECTIONINTERFACE_H_ +#define API_PEERCONNECTIONINTERFACE_H_ #include #include #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/api/dtmfsenderinterface.h" -#include "webrtc/api/jsep.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/api/stats/rtcstatscollectorcallback.h" -#include "webrtc/api/statstypes.h" -#include "webrtc/api/umametrics.h" -#include "webrtc/call/callfactoryinterface.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/rtccertificategenerator.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/datachannelinterface.h" +#include "api/dtmfsenderinterface.h" +#include "api/jsep.h" +#include "api/mediastreaminterface.h" +#include "api/rtcerror.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "api/stats/rtcstatscollectorcallback.h" +#include "api/statstypes.h" +#include "api/umametrics.h" +#include "call/callfactoryinterface.h" +#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "media/base/mediachannel.h" +#include "media/base/videocapturer.h" +#include "p2p/base/portallocator.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/network.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/sslstreamadapter.h" namespace rtc { class SSLIdentity; @@ -1224,4 +1224,4 @@ CreateModularPeerConnectionFactory( } // namespace webrtc -#endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ +#endif // API_PEERCONNECTIONINTERFACE_H_ diff --git a/api/peerconnectionproxy.h b/api/peerconnectionproxy.h index c68bee6afd..ad21a0756e 100644 --- a/api/peerconnectionproxy.h +++ b/api/peerconnectionproxy.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_PEERCONNECTIONPROXY_H_ -#define WEBRTC_API_PEERCONNECTIONPROXY_H_ +#ifndef API_PEERCONNECTIONPROXY_H_ +#define API_PEERCONNECTIONPROXY_H_ #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/proxy.h" +#include "api/peerconnectioninterface.h" +#include "api/proxy.h" namespace webrtc { @@ -111,4 +111,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_PEERCONNECTIONPROXY_H_ +#endif // API_PEERCONNECTIONPROXY_H_ diff --git a/api/proxy.h b/api/proxy.h index 03b6ff741e..c597165315 100644 --- a/api/proxy.h +++ b/api/proxy.h @@ -49,14 +49,14 @@ // The variant defined with BEGIN_OWNED_PROXY_MAP does not use // refcounting, and instead just takes ownership of the object being proxied. -#ifndef WEBRTC_API_PROXY_H_ -#define WEBRTC_API_PROXY_H_ +#ifndef API_PROXY_H_ +#define API_PROXY_H_ #include #include -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/event.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -579,4 +579,4 @@ class MethodCall5 : public rtc::Message, } // namespace webrtc -#endif // WEBRTC_API_PROXY_H_ +#endif // API_PROXY_H_ diff --git a/api/rtcerror.cc b/api/rtcerror.cc index f956484658..f9a31d0893 100644 --- a/api/rtcerror.cc +++ b/api/rtcerror.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/rtcerror.h" +#include "api/rtcerror.h" -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" namespace { diff --git a/api/rtcerror.h b/api/rtcerror.h index 7451fef962..b412b29501 100644 --- a/api/rtcerror.h +++ b/api/rtcerror.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_RTCERROR_H_ -#define WEBRTC_API_RTCERROR_H_ +#ifndef API_RTCERROR_H_ +#define API_RTCERROR_H_ #include #include #include // For std::move. -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { @@ -297,4 +297,4 @@ class RTCErrorOr { } // namespace webrtc -#endif // WEBRTC_API_RTCERROR_H_ +#endif // API_RTCERROR_H_ diff --git a/api/rtcerror_unittest.cc b/api/rtcerror_unittest.cc index 486a029fbe..d8f7ca6d49 100644 --- a/api/rtcerror_unittest.cc +++ b/api/rtcerror_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/api/rtcerror.h" -#include "webrtc/test/gtest.h" +#include "api/rtcerror.h" +#include "test/gtest.h" namespace { diff --git a/api/rtpparameters.cc b/api/rtpparameters.cc index 29b14fb60a..160a0690e0 100644 --- a/api/rtpparameters.cc +++ b/api/rtpparameters.cc @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/rtpparameters.h" +#include "api/rtpparameters.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/api/rtpparameters.h b/api/rtpparameters.h index 96e2955503..e6bd25e3ae 100644 --- a/api/rtpparameters.h +++ b/api/rtpparameters.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_RTPPARAMETERS_H_ -#define WEBRTC_API_RTPPARAMETERS_H_ +#ifndef API_RTPPARAMETERS_H_ +#define API_RTPPARAMETERS_H_ #include #include #include -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/optional.h" +#include "api/mediatypes.h" +#include "api/optional.h" namespace webrtc { @@ -546,4 +546,4 @@ struct RtpParameters { } // namespace webrtc -#endif // WEBRTC_API_RTPPARAMETERS_H_ +#endif // API_RTPPARAMETERS_H_ diff --git a/api/rtpparameters_unittest.cc b/api/rtpparameters_unittest.cc index 6cb90c2df1..ac3b1c7cc3 100644 --- a/api/rtpparameters_unittest.cc +++ b/api/rtpparameters_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/api/rtpparameters.h" -#include "webrtc/test/gtest.h" +#include "api/rtpparameters.h" +#include "test/gtest.h" namespace webrtc { diff --git a/api/rtpreceiverinterface.h b/api/rtpreceiverinterface.h index 3119fb781d..afb737b71e 100644 --- a/api/rtpreceiverinterface.h +++ b/api/rtpreceiverinterface.h @@ -11,18 +11,18 @@ // This file contains interfaces for RtpReceivers // http://w3c.github.io/webrtc-pc/#rtcrtpreceiver-interface -#ifndef WEBRTC_API_RTPRECEIVERINTERFACE_H_ -#define WEBRTC_API_RTPRECEIVERINTERFACE_H_ +#ifndef API_RTPRECEIVERINTERFACE_H_ +#define API_RTPRECEIVERINTERFACE_H_ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/proxy.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/proxy.h" +#include "api/rtpparameters.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -140,4 +140,4 @@ BEGIN_SIGNALING_PROXY_MAP(RtpReceiver) } // namespace webrtc -#endif // WEBRTC_API_RTPRECEIVERINTERFACE_H_ +#endif // API_RTPRECEIVERINTERFACE_H_ diff --git a/api/rtpsender.h b/api/rtpsender.h index 3b7faec631..567a7af92b 100644 --- a/api/rtpsender.h +++ b/api/rtpsender.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_RTPSENDER_H_ -#define WEBRTC_API_RTPSENDER_H_ +#ifndef API_RTPSENDER_H_ +#define API_RTPSENDER_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/rtpsender.h" +#include "pc/rtpsender.h" -#endif // WEBRTC_API_RTPSENDER_H_ +#endif // API_RTPSENDER_H_ diff --git a/api/rtpsenderinterface.h b/api/rtpsenderinterface.h index b2d59c4824..a7fbbda46b 100644 --- a/api/rtpsenderinterface.h +++ b/api/rtpsenderinterface.h @@ -11,19 +11,19 @@ // This file contains interfaces for RtpSenders // http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface -#ifndef WEBRTC_API_RTPSENDERINTERFACE_H_ -#define WEBRTC_API_RTPSENDERINTERFACE_H_ +#ifndef API_RTPSENDERINTERFACE_H_ +#define API_RTPSENDERINTERFACE_H_ #include #include -#include "webrtc/api/dtmfsenderinterface.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/proxy.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/dtmfsenderinterface.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/proxy.h" +#include "api/rtpparameters.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -81,4 +81,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_RTPSENDERINTERFACE_H_ +#endif // API_RTPSENDERINTERFACE_H_ diff --git a/api/stats/rtcstats.h b/api/stats/rtcstats.h index d9ed7bc2f6..887d602042 100644 --- a/api/stats/rtcstats.h +++ b/api/stats/rtcstats.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_STATS_RTCSTATS_H_ -#define WEBRTC_API_STATS_RTCSTATS_H_ +#ifndef API_STATS_RTCSTATS_H_ +#define API_STATS_RTCSTATS_H_ #include #include @@ -17,7 +17,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -329,4 +329,4 @@ class RTCStatsMember : public RTCStatsMemberInterface { } // namespace webrtc -#endif // WEBRTC_API_STATS_RTCSTATS_H_ +#endif // API_STATS_RTCSTATS_H_ diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index 0cbea7cff5..a600fb995c 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_ -#define WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_ +#ifndef API_STATS_RTCSTATS_OBJECTS_H_ +#define API_STATS_RTCSTATS_OBJECTS_H_ #include #include -#include "webrtc/api/stats/rtcstats.h" +#include "api/stats/rtcstats.h" namespace webrtc { @@ -415,4 +415,4 @@ class RTCTransportStats final : public RTCStats { } // namespace webrtc -#endif // WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_ +#endif // API_STATS_RTCSTATS_OBJECTS_H_ diff --git a/api/stats/rtcstatscollectorcallback.h b/api/stats/rtcstatscollectorcallback.h index 90e6085876..2c67bb81bb 100644 --- a/api/stats/rtcstatscollectorcallback.h +++ b/api/stats/rtcstatscollectorcallback.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ -#define WEBRTC_API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ +#ifndef API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ +#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ -#include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/stats/rtcstatsreport.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -27,4 +27,4 @@ class RTCStatsCollectorCallback : public virtual rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ +#endif // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ diff --git a/api/stats/rtcstatsreport.h b/api/stats/rtcstatsreport.h index 3efe6c9510..027041aef8 100644 --- a/api/stats/rtcstatsreport.h +++ b/api/stats/rtcstatsreport.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_STATS_RTCSTATSREPORT_H_ -#define WEBRTC_API_STATS_RTCSTATSREPORT_H_ +#ifndef API_STATS_RTCSTATSREPORT_H_ +#define API_STATS_RTCSTATSREPORT_H_ #include #include #include #include -#include "webrtc/api/stats/rtcstats.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/stats/rtcstats.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -96,4 +96,4 @@ class RTCStatsReport : public rtc::RefCountInterface { } // namespace webrtc -#endif // WEBRTC_API_STATS_RTCSTATSREPORT_H_ +#endif // API_STATS_RTCSTATSREPORT_H_ diff --git a/api/statstypes.cc b/api/statstypes.cc index 687b6b2fea..29b3e5e432 100644 --- a/api/statstypes.cc +++ b/api/statstypes.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/statstypes.h" +#include "api/statstypes.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // TODO(tommi): Could we have a static map of value name -> expected type // and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)? diff --git a/api/statstypes.h b/api/statstypes.h index 6391ff569f..431a1ce6bc 100644 --- a/api/statstypes.h +++ b/api/statstypes.h @@ -11,8 +11,8 @@ // This file contains structures used for retrieving statistics from an ongoing // libjingle session. -#ifndef WEBRTC_API_STATSTYPES_H_ -#define WEBRTC_API_STATSTYPES_H_ +#ifndef API_STATSTYPES_H_ +#define API_STATSTYPES_H_ #include #include @@ -20,12 +20,12 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -441,4 +441,4 @@ class StatsCollection { } // namespace webrtc -#endif // WEBRTC_API_STATSTYPES_H_ +#endif // API_STATSTYPES_H_ diff --git a/api/streamcollection.h b/api/streamcollection.h index 0f847f11f7..d14e3d484d 100644 --- a/api/streamcollection.h +++ b/api/streamcollection.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_STREAMCOLLECTION_H_ -#define WEBRTC_API_STREAMCOLLECTION_H_ +#ifndef API_STREAMCOLLECTION_H_ +#define API_STREAMCOLLECTION_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/streamcollection.h" +#include "pc/streamcollection.h" -#endif // WEBRTC_API_STREAMCOLLECTION_H_ +#endif // API_STREAMCOLLECTION_H_ diff --git a/api/test/fakeconstraints.h b/api/test/fakeconstraints.h index d7b70118bb..2010400aa4 100644 --- a/api/test/fakeconstraints.h +++ b/api/test/fakeconstraints.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_TEST_FAKECONSTRAINTS_H_ -#define WEBRTC_API_TEST_FAKECONSTRAINTS_H_ +#ifndef API_TEST_FAKECONSTRAINTS_H_ +#define API_TEST_FAKECONSTRAINTS_H_ #include #include -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/rtc_base/stringencode.h" +#include "api/mediaconstraintsinterface.h" +#include "rtc_base/stringencode.h" namespace webrtc { @@ -113,4 +113,4 @@ class FakeConstraints : public webrtc::MediaConstraintsInterface { } // namespace webrtc -#endif // WEBRTC_API_TEST_FAKECONSTRAINTS_H_ +#endif // API_TEST_FAKECONSTRAINTS_H_ diff --git a/api/test/mock_audio_mixer.h b/api/test/mock_audio_mixer.h index 189455ff8a..7a6c7420e8 100644 --- a/api/test/mock_audio_mixer.h +++ b/api/test/mock_audio_mixer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_TEST_MOCK_AUDIO_MIXER_H_ -#define WEBRTC_API_TEST_MOCK_AUDIO_MIXER_H_ +#ifndef API_TEST_MOCK_AUDIO_MIXER_H_ +#define API_TEST_MOCK_AUDIO_MIXER_H_ -#include "webrtc/api/audio/audio_mixer.h" +#include "api/audio/audio_mixer.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -29,4 +29,4 @@ class MockAudioMixer : public AudioMixer { } // namespace test } // namespace webrtc -#endif // WEBRTC_API_TEST_MOCK_AUDIO_MIXER_H_ +#endif // API_TEST_MOCK_AUDIO_MIXER_H_ diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h index 552a653100..7097adc02d 100644 --- a/api/test/mock_rtpreceiver.h +++ b/api/test/mock_rtpreceiver.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_TEST_MOCK_RTPRECEIVER_H_ -#define WEBRTC_API_TEST_MOCK_RTPRECEIVER_H_ +#ifndef API_TEST_MOCK_RTPRECEIVER_H_ +#define API_TEST_MOCK_RTPRECEIVER_H_ #include #include -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/test/gmock.h" +#include "api/rtpreceiverinterface.h" +#include "test/gmock.h" namespace webrtc { @@ -33,4 +33,4 @@ class MockRtpReceiver : public rtc::RefCountedObject { } // namespace webrtc -#endif // WEBRTC_API_TEST_MOCK_RTPRECEIVER_H_ +#endif // API_TEST_MOCK_RTPRECEIVER_H_ diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h index 7458f45cd5..a89fa9264a 100644 --- a/api/test/mock_rtpsender.h +++ b/api/test/mock_rtpsender.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_TEST_MOCK_RTPSENDER_H_ -#define WEBRTC_API_TEST_MOCK_RTPSENDER_H_ +#ifndef API_TEST_MOCK_RTPSENDER_H_ +#define API_TEST_MOCK_RTPSENDER_H_ #include #include -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/test/gmock.h" +#include "api/rtpsenderinterface.h" +#include "test/gmock.h" namespace webrtc { @@ -34,4 +34,4 @@ class MockRtpSender : public rtc::RefCountedObject { } // namespace webrtc -#endif // WEBRTC_API_TEST_MOCK_RTPSENDER_H_ +#endif // API_TEST_MOCK_RTPSENDER_H_ diff --git a/api/umametrics.h b/api/umametrics.h index 81238c9fea..825950db34 100644 --- a/api/umametrics.h +++ b/api/umametrics.h @@ -10,10 +10,10 @@ // This file contains enums related to IPv4/IPv6 metrics. -#ifndef WEBRTC_API_UMAMETRICS_H_ -#define WEBRTC_API_UMAMETRICS_H_ +#ifndef API_UMAMETRICS_H_ +#define API_UMAMETRICS_H_ -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -139,4 +139,4 @@ typedef MetricsObserverInterface UMAObserver; } // namespace webrtc -#endif // WEBRTC_API_UMAMETRICS_H_ +#endif // API_UMAMETRICS_H_ diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc index 56b8ecc809..d9f73085f6 100644 --- a/api/video/i420_buffer.cc +++ b/api/video/i420_buffer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/i420_buffer.h" +#include "api/video/i420_buffer.h" #include @@ -17,8 +17,8 @@ #include "libyuv/convert.h" #include "libyuv/planar_functions.h" #include "libyuv/scale.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "rtc_base/checks.h" +#include "rtc_base/keep_ref_until_done.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git a/api/video/i420_buffer.h b/api/video/i420_buffer.h index 31014a31f0..bdac80bbc1 100644 --- a/api/video/i420_buffer.h +++ b/api/video/i420_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_I420_BUFFER_H_ -#define WEBRTC_API_VIDEO_I420_BUFFER_H_ +#ifndef API_VIDEO_I420_BUFFER_H_ +#define API_VIDEO_I420_BUFFER_H_ #include -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "api/video/video_rotation.h" +#include "api/video/video_frame_buffer.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { @@ -108,4 +108,4 @@ class I420Buffer : public I420BufferInterface { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_I420_BUFFER_H_ +#endif // API_VIDEO_I420_BUFFER_H_ diff --git a/api/video/video_content_type.cc b/api/video/video_content_type.cc index 3839ff4f2b..149b4f9926 100644 --- a/api/video/video_content_type.cc +++ b/api/video/video_content_type.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/video_content_type.h" +#include "api/video/video_content_type.h" // VideoContentType stored as a single byte, which is sent over the network. // Structure: diff --git a/api/video/video_content_type.h b/api/video/video_content_type.h index f9c6a98418..8c6460288d 100644 --- a/api/video/video_content_type.h +++ b/api/video/video_content_type.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_VIDEO_CONTENT_TYPE_H_ -#define WEBRTC_API_VIDEO_VIDEO_CONTENT_TYPE_H_ +#ifndef API_VIDEO_VIDEO_CONTENT_TYPE_H_ +#define API_VIDEO_VIDEO_CONTENT_TYPE_H_ #include @@ -38,4 +38,4 @@ const char* ToString(const VideoContentType& content_type); } // namespace webrtc -#endif // WEBRTC_API_VIDEO_VIDEO_CONTENT_TYPE_H_ +#endif // API_VIDEO_VIDEO_CONTENT_TYPE_H_ diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc index fa3ad3dd88..93b3c9c6b9 100644 --- a/api/video/video_frame.cc +++ b/api/video/video_frame.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/video_frame.h" +#include "api/video/video_frame.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/api/video/video_frame.h b/api/video/video_frame.h index 3ee381b091..a72bef1d32 100644 --- a/api/video/video_frame.h +++ b/api/video/video_frame.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_VIDEO_FRAME_H_ -#define WEBRTC_API_VIDEO_VIDEO_FRAME_H_ +#ifndef API_VIDEO_VIDEO_FRAME_H_ +#define API_VIDEO_VIDEO_FRAME_H_ #include -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "api/video/video_frame_buffer.h" namespace webrtc { @@ -112,4 +112,4 @@ class VideoFrame { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ +#endif // API_VIDEO_VIDEO_FRAME_H_ diff --git a/api/video/video_frame_buffer.cc b/api/video/video_frame_buffer.cc index d771e6ac42..dd869f7747 100644 --- a/api/video/video_frame_buffer.cc +++ b/api/video/video_frame_buffer.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/video_frame_buffer.h" +#include "api/video/video_frame_buffer.h" #include "libyuv/convert.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "api/video/i420_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/api/video/video_frame_buffer.h b/api/video/video_frame_buffer.h index a2ace6e06a..c8d02a153f 100644 --- a/api/video/video_frame_buffer.h +++ b/api/video/video_frame_buffer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_VIDEO_FRAME_BUFFER_H_ -#define WEBRTC_API_VIDEO_VIDEO_FRAME_BUFFER_H_ +#ifndef API_VIDEO_VIDEO_FRAME_BUFFER_H_ +#define API_VIDEO_VIDEO_FRAME_BUFFER_H_ #include -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -123,4 +123,4 @@ class I444BufferInterface : public PlanarYuvBuffer { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_VIDEO_FRAME_BUFFER_H_ +#endif // API_VIDEO_VIDEO_FRAME_BUFFER_H_ diff --git a/api/video/video_rotation.h b/api/video/video_rotation.h index b8b2767404..6a29588ee5 100644 --- a/api/video/video_rotation.h +++ b/api/video/video_rotation.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_VIDEO_ROTATION_H_ -#define WEBRTC_API_VIDEO_VIDEO_ROTATION_H_ +#ifndef API_VIDEO_VIDEO_ROTATION_H_ +#define API_VIDEO_VIDEO_ROTATION_H_ namespace webrtc { @@ -23,4 +23,4 @@ enum VideoRotation { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_VIDEO_ROTATION_H_ +#endif // API_VIDEO_VIDEO_ROTATION_H_ diff --git a/api/video/video_timing.cc b/api/video/video_timing.cc index 2804c8ba45..3ccbe4eae5 100644 --- a/api/video/video_timing.cc +++ b/api/video/video_timing.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/video_timing.h" +#include "api/video/video_timing.h" #include diff --git a/api/video/video_timing.h b/api/video/video_timing.h index e75c0c1070..c2cd0492ac 100644 --- a/api/video/video_timing.h +++ b/api/video/video_timing.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_VIDEO_TIMING_H_ -#define WEBRTC_API_VIDEO_VIDEO_TIMING_H_ +#ifndef API_VIDEO_VIDEO_TIMING_H_ +#define API_VIDEO_VIDEO_TIMING_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { @@ -117,4 +117,4 @@ struct TimingFrameInfo { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_VIDEO_TIMING_H_ +#endif // API_VIDEO_VIDEO_TIMING_H_ diff --git a/api/video_codecs/sdp_video_format.h b/api/video_codecs/sdp_video_format.h index bee4bf04bd..542353aea7 100644 --- a/api/video_codecs/sdp_video_format.h +++ b/api/video_codecs/sdp_video_format.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ -#define WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ +#ifndef API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ +#define API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ #include #include @@ -39,4 +39,4 @@ struct SdpVideoFormat { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ +#endif // API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_ diff --git a/api/video_codecs/video_decoder.h b/api/video_codecs/video_decoder.h index ea531e4c1a..79e5c723b8 100644 --- a/api/video_codecs/video_decoder.h +++ b/api/video_codecs/video_decoder.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_H_ -#define WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_H_ +#ifndef API_VIDEO_CODECS_VIDEO_DECODER_H_ +#define API_VIDEO_CODECS_VIDEO_DECODER_H_ #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "common_types.h" +#include "common_video/include/video_frame.h" +#include "typedefs.h" namespace webrtc { @@ -84,4 +84,4 @@ class VideoDecoder { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_H_ +#endif // API_VIDEO_CODECS_VIDEO_DECODER_H_ diff --git a/api/video_codecs/video_decoder_factory.h b/api/video_codecs/video_decoder_factory.h index 2a442075a6..9c58ad468d 100644 --- a/api/video_codecs/video_decoder_factory.h +++ b/api/video_codecs/video_decoder_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ -#define WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ +#ifndef API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ +#define API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ #include #include @@ -36,4 +36,4 @@ class VideoDecoderFactory { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ +#endif // API_VIDEO_CODECS_VIDEO_DECODER_FACTORY_H_ diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index f61e4e14f8..e3cc516d6f 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder.h" namespace webrtc { diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index 4ec6e45f00..3942471914 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_H_ -#define WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_H_ +#ifndef API_VIDEO_CODECS_VIDEO_ENCODER_H_ +#define API_VIDEO_CODECS_VIDEO_ENCODER_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "api/video/video_frame.h" +#include "common_types.h" +#include "common_video/include/video_frame.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { @@ -180,4 +180,4 @@ class VideoEncoder { virtual const char* ImplementationName() const; }; } // namespace webrtc -#endif // WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_H_ +#endif // API_VIDEO_CODECS_VIDEO_ENCODER_H_ diff --git a/api/video_codecs/video_encoder_factory.h b/api/video_codecs/video_encoder_factory.h index 4e77392c8e..7958d16acc 100644 --- a/api/video_codecs/video_encoder_factory.h +++ b/api/video_codecs/video_encoder_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ -#define WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ +#ifndef API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ +#define API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ #include #include @@ -54,4 +54,4 @@ class VideoEncoderFactory { } // namespace webrtc -#endif // WEBRTC_API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ +#endif // API_VIDEO_CODECS_VIDEO_ENCODER_FACTORY_H_ diff --git a/api/videosourceproxy.h b/api/videosourceproxy.h index a00a21d021..f2d8be0681 100644 --- a/api/videosourceproxy.h +++ b/api/videosourceproxy.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEOSOURCEPROXY_H_ -#define WEBRTC_API_VIDEOSOURCEPROXY_H_ +#ifndef API_VIDEOSOURCEPROXY_H_ +#define API_VIDEOSOURCEPROXY_H_ -#include "webrtc/api/proxy.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/proxy.h" +#include "api/mediastreaminterface.h" namespace webrtc { @@ -38,4 +38,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_API_VIDEOSOURCEPROXY_H_ +#endif // API_VIDEOSOURCEPROXY_H_ diff --git a/api/videotracksource.h b/api/videotracksource.h index 45366cd152..5ed49834d9 100644 --- a/api/videotracksource.h +++ b/api/videotracksource.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_VIDEOTRACKSOURCE_H_ -#define WEBRTC_API_VIDEOTRACKSOURCE_H_ +#ifndef API_VIDEOTRACKSOURCE_H_ +#define API_VIDEOTRACKSOURCE_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/videotracksource.h" +#include "pc/videotracksource.h" -#endif // WEBRTC_API_VIDEOTRACKSOURCE_H_ +#endif // API_VIDEOTRACKSOURCE_H_ diff --git a/api/webrtcsdp.h b/api/webrtcsdp.h index bd7809a2c7..cc0d292c75 100644 --- a/api/webrtcsdp.h +++ b/api/webrtcsdp.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_WEBRTCSDP_H_ -#define WEBRTC_API_WEBRTCSDP_H_ +#ifndef API_WEBRTCSDP_H_ +#define API_WEBRTCSDP_H_ // Including this file is deprecated. It is no longer part of the public API. // This only includes the file in its new location for backwards compatibility. -#include "webrtc/pc/webrtcsdp.h" +#include "pc/webrtcsdp.h" -#endif // WEBRTC_API_WEBRTCSDP_H_ +#endif // API_WEBRTCSDP_H_ diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 890de510d6..aa33192712 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -153,9 +153,9 @@ if (rtc_include_tests) { } data = [ - "../../resources/voice_engine/audio_tiny16.wav", - "../../resources/voice_engine/audio_tiny48.wav", - "../../resources/voice_engine/audio_dtx16.wav", + "../resources/voice_engine/audio_tiny16.wav", + "../resources/voice_engine/audio_tiny48.wav", + "../resources/voice_engine/audio_dtx16.wav", ] if (!build_with_chromium && is_clang) { diff --git a/audio/DEPS b/audio/DEPS index e77e1d1f4c..0f952a3e7a 100644 --- a/audio/DEPS +++ b/audio/DEPS @@ -1,28 +1,28 @@ include_rules = [ - "+webrtc/call", - "+webrtc/common_audio", - "+webrtc/logging/rtc_event_log", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_mixer", - "+webrtc/modules/audio_processing/include", - "+webrtc/modules/bitrate_controller", - "+webrtc/modules/congestion_controller", - "+webrtc/modules/pacing", - "+webrtc/modules/remote_bitrate_estimator", - "+webrtc/modules/rtp_rtcp", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", + "+call", + "+common_audio", + "+logging/rtc_event_log", + "+modules/audio_coding", + "+modules/audio_device", + "+modules/audio_mixer", + "+modules/audio_processing/include", + "+modules/bitrate_controller", + "+modules/congestion_controller", + "+modules/pacing", + "+modules/remote_bitrate_estimator", + "+modules/rtp_rtcp", + "+system_wrappers", + "+voice_engine", ] specific_include_rules = { "audio_send_stream.cc": [ - "+webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h", + "+modules/audio_coding/codecs/cng/audio_encoder_cng.h", ], # TODO(ossu): Remove this exception when builtin_audio_encoder_factory.h # has moved to api/, or when the proper mocks have been made. "audio_send_stream_unittest.cc": [ - "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h", + "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h", ], } diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index b7ea047a79..0c83319ad7 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/audio_receive_stream.h" +#include "audio/audio_receive_stream.h" #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/audio/audio_send_stream.h" -#include "webrtc/audio/audio_state.h" -#include "webrtc/audio/conversion.h" -#include "webrtc/call/rtp_stream_receiver_controller_interface.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/voice_engine/channel_proxy.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "api/call/audio_sink.h" +#include "audio/audio_send_stream.h" +#include "audio/audio_state.h" +#include "audio/conversion.h" +#include "call/rtp_stream_receiver_controller_interface.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "voice_engine/channel_proxy.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h index 0615dc1586..a61c8963d2 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ -#define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ +#ifndef AUDIO_AUDIO_RECEIVE_STREAM_H_ +#define AUDIO_AUDIO_RECEIVE_STREAM_H_ #include #include -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/audio/audio_state.h" -#include "webrtc/call/audio_receive_stream.h" -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/call/syncable.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/audio/audio_mixer.h" +#include "audio/audio_state.h" +#include "call/audio_receive_stream.h" +#include "call/rtp_packet_sink_interface.h" +#include "call/syncable.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_checker.h" namespace webrtc { class PacketRouter; @@ -99,4 +99,4 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream, } // namespace internal } // namespace webrtc -#endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ +#endif // AUDIO_AUDIO_RECEIVE_STREAM_H_ diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index 0d58614d09..7bcb85adb9 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -12,19 +12,19 @@ #include #include -#include "webrtc/api/test/mock_audio_mixer.h" -#include "webrtc/audio/audio_receive_stream.h" -#include "webrtc/audio/conversion.h" -#include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" -#include "webrtc/test/mock_voe_channel_proxy.h" -#include "webrtc/test/mock_voice_engine.h" +#include "api/test/mock_audio_mixer.h" +#include "audio/audio_receive_stream.h" +#include "audio/conversion.h" +#include "call/rtp_stream_receiver_controller.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/audio_processing/include/mock_audio_processing.h" +#include "modules/bitrate_controller/include/mock/mock_bitrate_controller.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" +#include "test/mock_voe_channel_proxy.h" +#include "test/mock_voice_engine.h" namespace webrtc { namespace test { diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index cb73e84a23..4bdd42b6ae 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/audio_send_stream.h" +#include "audio/audio_send_stream.h" #include #include #include -#include "webrtc/audio/audio_state.h" -#include "webrtc/audio/conversion.h" -#include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/voice_engine/channel_proxy.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/transmit_mixer.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "audio/audio_state.h" +#include "audio/conversion.h" +#include "audio/scoped_voe_interface.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/pacing/paced_sender.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/function_view.h" +#include "rtc_base/logging.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" +#include "voice_engine/channel_proxy.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/transmit_mixer.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/audio/audio_send_stream.h b/audio/audio_send_stream.h index cf36c1393f..a46dc3b16f 100644 --- a/audio/audio_send_stream.h +++ b/audio/audio_send_stream.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ -#define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ +#ifndef AUDIO_AUDIO_SEND_STREAM_H_ +#define AUDIO_AUDIO_SEND_STREAM_H_ #include #include -#include "webrtc/audio/time_interval.h" -#include "webrtc/call/audio_send_stream.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/call/bitrate_allocator.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" +#include "audio/time_interval.h" +#include "call/audio_send_stream.h" +#include "call/audio_state.h" +#include "call/bitrate_allocator.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_checker.h" +#include "voice_engine/transport_feedback_packet_loss_tracker.h" namespace webrtc { class VoiceEngine; @@ -128,4 +128,4 @@ class AudioSendStream final : public webrtc::AudioSendStream, } // namespace internal } // namespace webrtc -#endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ +#endif // AUDIO_AUDIO_SEND_STREAM_H_ diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index 4c29f6ac63..b789b29a3d 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -12,27 +12,27 @@ #include #include -#include "webrtc/audio/audio_send_stream.h" -#include "webrtc/audio/audio_state.h" -#include "webrtc/audio/conversion.h" -#include "webrtc/call/fake_rtp_transport_controller_send.h" -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_observer.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/modules/pacing/mock/mock_paced_sender.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" -#include "webrtc/test/mock_audio_encoder_factory.h" -#include "webrtc/test/mock_voe_channel_proxy.h" -#include "webrtc/test/mock_voice_engine.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "audio/audio_send_stream.h" +#include "audio/audio_state.h" +#include "audio/conversion.h" +#include "call/fake_rtp_transport_controller_send.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_processing/include/mock_audio_processing.h" +#include "modules/congestion_controller/include/mock/mock_congestion_observer.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/pacing/mock/mock_paced_sender.h" +#include "modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/task_queue.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" +#include "test/mock_audio_encoder_factory.h" +#include "test/mock_voe_channel_proxy.h" +#include "test/mock_voice_engine.h" +#include "voice_engine/transmit_mixer.h" namespace webrtc { namespace test { diff --git a/audio/audio_state.cc b/audio/audio_state.cc index 0e3f5f6f20..36d9d476a3 100644 --- a/audio/audio_state.cc +++ b/audio/audio_state.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/audio_state.h" +#include "audio/audio_state.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/voice_engine/include/voe_errors.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "voice_engine/include/voe_errors.h" namespace webrtc { namespace internal { diff --git a/audio/audio_state.h b/audio/audio_state.h index 893c1f9406..16d66380e2 100644 --- a/audio/audio_state.h +++ b/audio/audio_state.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_AUDIO_STATE_H_ -#define WEBRTC_AUDIO_AUDIO_STATE_H_ +#ifndef AUDIO_AUDIO_STATE_H_ +#define AUDIO_AUDIO_STATE_H_ -#include "webrtc/audio/audio_transport_proxy.h" -#include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "audio/audio_transport_proxy.h" +#include "audio/scoped_voe_interface.h" +#include "call/audio_state.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" +#include "voice_engine/include/voe_base.h" namespace webrtc { namespace internal { @@ -69,4 +69,4 @@ class AudioState final : public webrtc::AudioState, } // namespace internal } // namespace webrtc -#endif // WEBRTC_AUDIO_AUDIO_STATE_H_ +#endif // AUDIO_AUDIO_STATE_H_ diff --git a/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc index ffaacb62ca..26fa31c4aa 100644 --- a/audio/audio_state_unittest.cc +++ b/audio/audio_state_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/audio/audio_state.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_voice_engine.h" +#include "audio/audio_state.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_processing/include/mock_audio_processing.h" +#include "test/gtest.h" +#include "test/mock_voice_engine.h" namespace webrtc { namespace test { diff --git a/audio/audio_transport_proxy.cc b/audio/audio_transport_proxy.cc index 73b0091540..e3201ea79b 100644 --- a/audio/audio_transport_proxy.cc +++ b/audio/audio_transport_proxy.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/audio_transport_proxy.h" +#include "audio/audio_transport_proxy.h" namespace webrtc { diff --git a/audio/audio_transport_proxy.h b/audio/audio_transport_proxy.h index 7d2dea1f94..a51a7dba31 100644 --- a/audio/audio_transport_proxy.h +++ b/audio/audio_transport_proxy.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_ -#define WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_ +#ifndef AUDIO_AUDIO_TRANSPORT_PROXY_H_ +#define AUDIO_AUDIO_TRANSPORT_PROXY_H_ -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio/audio_mixer.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -75,4 +75,4 @@ class AudioTransportProxy : public AudioTransport { }; } // namespace webrtc -#endif // WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_ +#endif // AUDIO_AUDIO_TRANSPORT_PROXY_H_ diff --git a/audio/conversion.h b/audio/conversion.h index 6ae32432d3..920aa3a434 100644 --- a/audio/conversion.h +++ b/audio/conversion.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_CONVERSION_H_ -#define WEBRTC_AUDIO_CONVERSION_H_ +#ifndef AUDIO_CONVERSION_H_ +#define AUDIO_CONVERSION_H_ namespace webrtc { @@ -24,4 +24,4 @@ inline float Q14ToFloat(uint32_t v) { } } // namespace webrtc -#endif // WEBRTC_AUDIO_CONVERSION_H_ +#endif // AUDIO_CONVERSION_H_ diff --git a/audio/scoped_voe_interface.h b/audio/scoped_voe_interface.h index 59631bfd16..7aa2d1dacf 100644 --- a/audio/scoped_voe_interface.h +++ b/audio/scoped_voe_interface.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_ -#define WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_ +#ifndef AUDIO_SCOPED_VOE_INTERFACE_H_ +#define AUDIO_SCOPED_VOE_INTERFACE_H_ -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -42,4 +42,4 @@ template class ScopedVoEInterface { } // namespace internal } // namespace webrtc -#endif // WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_ +#endif // AUDIO_SCOPED_VOE_INTERFACE_H_ diff --git a/audio/test/audio_bwe_integration_test.cc b/audio/test/audio_bwe_integration_test.cc index 265738cbc0..d57fef8453 100644 --- a/audio/test/audio_bwe_integration_test.cc +++ b/audio/test/audio_bwe_integration_test.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/test/audio_bwe_integration_test.h" +#include "audio/test/audio_bwe_integration_test.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/wav_file.h" +#include "rtc_base/ptr_util.h" +#include "system_wrappers/include/sleep.h" +#include "test/field_trial.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/audio/test/audio_bwe_integration_test.h b/audio/test/audio_bwe_integration_test.h index 729b18f9d1..0b0cb6c73b 100644 --- a/audio/test/audio_bwe_integration_test.h +++ b/audio/test/audio_bwe_integration_test.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ -#define WEBRTC_AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ +#ifndef AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ +#define AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ #include #include -#include "webrtc/test/call_test.h" -#include "webrtc/test/fake_audio_device.h" -#include "webrtc/test/single_threaded_task_queue.h" +#include "test/call_test.h" +#include "test/fake_audio_device.h" +#include "test/single_threaded_task_queue.h" namespace webrtc { namespace test { @@ -54,4 +54,4 @@ class AudioBweTest : public test::EndToEndTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ +#endif // AUDIO_TEST_AUDIO_BWE_INTEGRATION_TEST_H_ diff --git a/audio/test/audio_end_to_end_test.cc b/audio/test/audio_end_to_end_test.cc index 5d4cbf024a..2ae9390bc8 100644 --- a/audio/test/audio_end_to_end_test.cc +++ b/audio/test/audio_end_to_end_test.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/audio/test/audio_end_to_end_test.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/fake_audio_device.h" -#include "webrtc/test/gtest.h" +#include "audio/test/audio_end_to_end_test.h" +#include "system_wrappers/include/sleep.h" +#include "test/fake_audio_device.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/audio/test/audio_end_to_end_test.h b/audio/test/audio_end_to_end_test.h index d14b7a108f..921de84483 100644 --- a/audio/test/audio_end_to_end_test.h +++ b/audio/test/audio_end_to_end_test.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ -#define WEBRTC_AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ +#ifndef AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ +#define AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ #include #include #include -#include "webrtc/test/call_test.h" +#include "test/call_test.h" namespace webrtc { namespace test { @@ -65,4 +65,4 @@ class AudioEndToEndTest : public test::EndToEndTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ +#endif // AUDIO_TEST_AUDIO_END_TO_END_TEST_H_ diff --git a/audio/test/audio_stats_test.cc b/audio/test/audio_stats_test.cc index 57dfbed758..86bdbf251f 100644 --- a/audio/test/audio_stats_test.cc +++ b/audio/test/audio_stats_test.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/test/audio_end_to_end_test.h" -#include "webrtc/rtc_base/safe_compare.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "audio/test/audio_end_to_end_test.h" +#include "rtc_base/safe_compare.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/audio/test/low_bandwidth_audio_test.cc b/audio/test/low_bandwidth_audio_test.cc index 8bbadfbbe6..b3c674da61 100644 --- a/audio/test/low_bandwidth_audio_test.cc +++ b/audio/test/low_bandwidth_audio_test.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/test/audio_end_to_end_test.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "audio/test/audio_end_to_end_test.h" +#include "rtc_base/flags.h" +#include "system_wrappers/include/sleep.h" +#include "test/testsupport/fileutils.h" DEFINE_int(sample_rate_hz, 16000, "Sample rate (Hz) of the produced audio files."); diff --git a/audio/time_interval.cc b/audio/time_interval.cc index f156af06c8..cc103408a3 100644 --- a/audio/time_interval.cc +++ b/audio/time_interval.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/time_interval.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "audio/time_interval.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/audio/time_interval.h b/audio/time_interval.h index 448184359f..88b2f7dd4f 100644 --- a/audio/time_interval.h +++ b/audio/time_interval.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_TIME_INTERVAL_H_ -#define WEBRTC_AUDIO_TIME_INTERVAL_H_ +#ifndef AUDIO_TIME_INTERVAL_H_ +#define AUDIO_TIME_INTERVAL_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -62,4 +62,4 @@ class TimeInterval { } // namespace webrtc -#endif // WEBRTC_AUDIO_TIME_INTERVAL_H_ +#endif // AUDIO_TIME_INTERVAL_H_ diff --git a/audio/time_interval_unittest.cc b/audio/time_interval_unittest.cc index 592f9fc3d4..7f8b44ecec 100644 --- a/audio/time_interval_unittest.cc +++ b/audio/time_interval_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/time_interval.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/timedelta.h" -#include "webrtc/test/gtest.h" +#include "audio/time_interval.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/timedelta.h" +#include "test/gtest.h" namespace webrtc { diff --git a/audio/utility/audio_frame_operations.cc b/audio/utility/audio_frame_operations.cc index 1299e04028..24ccfb3864 100644 --- a/audio/utility/audio_frame_operations.cc +++ b/audio/utility/audio_frame_operations.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/utility/audio_frame_operations.h" +#include "audio/utility/audio_frame_operations.h" #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { namespace { diff --git a/audio/utility/audio_frame_operations.h b/audio/utility/audio_frame_operations.h index 23c33ec67e..35e4bf29f1 100644 --- a/audio/utility/audio_frame_operations.h +++ b/audio/utility/audio_frame_operations.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ -#define WEBRTC_AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ +#ifndef AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ +#define AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -120,4 +120,4 @@ class AudioFrameOperations { } // namespace webrtc -#endif // WEBRTC_AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ +#endif // AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ diff --git a/audio/utility/audio_frame_operations_unittest.cc b/audio/utility/audio_frame_operations_unittest.cc index deab9bd97b..6d23731a05 100644 --- a/audio/utility/audio_frame_operations_unittest.cc +++ b/audio/utility/audio_frame_operations_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/call/DEPS b/call/DEPS index 54dcebb526..7622e24116 100644 --- a/call/DEPS +++ b/call/DEPS @@ -1,27 +1,27 @@ include_rules = [ - "+webrtc/audio", - "+webrtc/logging/rtc_event_log", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_mixer", - "+webrtc/modules/audio_processing", - "+webrtc/modules/bitrate_controller", - "+webrtc/modules/congestion_controller", - "+webrtc/modules/pacing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/utility", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", - "+webrtc/video", + "+audio", + "+logging/rtc_event_log", + "+modules/audio_coding", + "+modules/audio_device", + "+modules/audio_mixer", + "+modules/audio_processing", + "+modules/bitrate_controller", + "+modules/congestion_controller", + "+modules/pacing", + "+modules/rtp_rtcp", + "+modules/utility", + "+system_wrappers", + "+voice_engine", + "+video", ] specific_include_rules = { "video_receive_stream\.h": [ - "+webrtc/common_video/include", - "+webrtc/media/base", + "+common_video/include", + "+media/base", ], "video_send_stream\.h": [ - "+webrtc/common_video/include", - "+webrtc/media/base", + "+common_video/include", + "+media/base", ], } diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h index 6de62dffa6..1dd59ae711 100644 --- a/call/audio_receive_stream.h +++ b/call/audio_receive_stream.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_AUDIO_RECEIVE_STREAM_H_ -#define WEBRTC_CALL_AUDIO_RECEIVE_STREAM_H_ +#ifndef CALL_AUDIO_RECEIVE_STREAM_H_ +#define CALL_AUDIO_RECEIVE_STREAM_H_ #include #include #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/call/transport.h" -#include "webrtc/api/optional.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/call/rtp_config.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/call/transport.h" +#include "api/optional.h" +#include "api/rtpparameters.h" +#include "api/rtpreceiverinterface.h" +#include "call/rtp_config.h" +#include "common_types.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { class AudioSinkInterface; @@ -155,4 +155,4 @@ class AudioReceiveStream { }; } // namespace webrtc -#endif // WEBRTC_CALL_AUDIO_RECEIVE_STREAM_H_ +#endif // CALL_AUDIO_RECEIVE_STREAM_H_ diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc index 0bc555b339..d0043a2df1 100644 --- a/call/audio_send_stream.cc +++ b/call/audio_send_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/audio_send_stream.h" +#include "call/audio_send_stream.h" #include diff --git a/call/audio_send_stream.h b/call/audio_send_stream.h index ac962c5ada..8160318ed7 100644 --- a/call/audio_send_stream.h +++ b/call/audio_send_stream.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_AUDIO_SEND_STREAM_H_ -#define WEBRTC_CALL_AUDIO_SEND_STREAM_H_ +#ifndef CALL_AUDIO_SEND_STREAM_H_ +#define CALL_AUDIO_SEND_STREAM_H_ #include #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/call/transport.h" -#include "webrtc/api/optional.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/call/rtp_config.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/audio_codecs/audio_format.h" +#include "api/call/transport.h" +#include "api/optional.h" +#include "api/rtpparameters.h" +#include "call/rtp_config.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -157,4 +157,4 @@ class AudioSendStream { }; } // namespace webrtc -#endif // WEBRTC_CALL_AUDIO_SEND_STREAM_H_ +#endif // CALL_AUDIO_SEND_STREAM_H_ diff --git a/call/audio_state.h b/call/audio_state.h index 826b31d12a..7719388c3a 100644 --- a/call/audio_state.h +++ b/call/audio_state.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_AUDIO_STATE_H_ -#define WEBRTC_CALL_AUDIO_STATE_H_ +#ifndef CALL_AUDIO_STATE_H_ +#define CALL_AUDIO_STATE_H_ -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio/audio_mixer.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -52,4 +52,4 @@ class AudioState : public rtc::RefCountInterface { }; } // namespace webrtc -#endif // WEBRTC_CALL_AUDIO_STATE_H_ +#endif // CALL_AUDIO_STATE_H_ diff --git a/call/bitrate_allocator.cc b/call/bitrate_allocator.cc index 1e22c00a97..8570ae378d 100644 --- a/call/bitrate_allocator.cc +++ b/call/bitrate_allocator.cc @@ -9,16 +9,16 @@ * */ -#include "webrtc/call/bitrate_allocator.h" +#include "call/bitrate_allocator.h" #include #include -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/call/bitrate_allocator.h b/call/bitrate_allocator.h index b9bbc93b77..1ac348770d 100644 --- a/call/bitrate_allocator.h +++ b/call/bitrate_allocator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_BITRATE_ALLOCATOR_H_ -#define WEBRTC_CALL_BITRATE_ALLOCATOR_H_ +#ifndef CALL_BITRATE_ALLOCATOR_H_ +#define CALL_BITRATE_ALLOCATOR_H_ #include @@ -17,7 +17,7 @@ #include #include -#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "rtc_base/sequenced_task_checker.h" namespace webrtc { @@ -169,4 +169,4 @@ class BitrateAllocator { uint32_t total_requested_min_bitrate_ RTC_GUARDED_BY(&sequenced_checker_); }; } // namespace webrtc -#endif // WEBRTC_CALL_BITRATE_ALLOCATOR_H_ +#endif // CALL_BITRATE_ALLOCATOR_H_ diff --git a/call/bitrate_allocator_unittest.cc b/call/bitrate_allocator_unittest.cc index ead4cbdf94..03ad78cdfe 100644 --- a/call/bitrate_allocator_unittest.cc +++ b/call/bitrate_allocator_unittest.cc @@ -12,10 +12,10 @@ #include #include -#include "webrtc/call/bitrate_allocator.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "call/bitrate_allocator.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::NiceMock; diff --git a/call/bitrate_estimator_tests.cc b/call/bitrate_estimator_tests.cc index 49f149bf0a..4c397875f9 100644 --- a/call/bitrate_estimator_tests.cc +++ b/call/bitrate_estimator_tests.cc @@ -12,18 +12,18 @@ #include #include -#include "webrtc/call/call.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/direct_transport.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_decoder.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/frame_generator_capturer.h" -#include "webrtc/test/gtest.h" +#include "call/call.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread_annotations.h" +#include "test/call_test.h" +#include "test/direct_transport.h" +#include "test/encoder_settings.h" +#include "test/fake_decoder.h" +#include "test/fake_encoder.h" +#include "test/frame_generator_capturer.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/call/call.cc b/call/call.cc index b7cd059085..102df03817 100644 --- a/call/call.cc +++ b/call/call.cc @@ -16,46 +16,46 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/audio/audio_receive_stream.h" -#include "webrtc/audio/audio_send_stream.h" -#include "webrtc/audio/audio_state.h" -#include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/audio/time_interval.h" -#include "webrtc/call/bitrate_allocator.h" -#include "webrtc/call/call.h" -#include "webrtc/call/flexfec_receive_stream_impl.h" -#include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/call/rtp_transport_controller_send.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/cpu_info.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/send_delay_stats.h" -#include "webrtc/video/stats_counter.h" -#include "webrtc/video/video_receive_stream.h" -#include "webrtc/video/video_send_stream.h" +#include "api/optional.h" +#include "audio/audio_receive_stream.h" +#include "audio/audio_send_stream.h" +#include "audio/audio_state.h" +#include "audio/scoped_voe_interface.h" +#include "audio/time_interval.h" +#include "call/bitrate_allocator.h" +#include "call/call.h" +#include "call/flexfec_receive_stream_impl.h" +#include "call/rtp_stream_receiver_controller.h" +#include "call/rtp_transport_controller_send.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/congestion_controller/include/receive_side_congestion_controller.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/cpu_info.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/rw_lock_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "video/call_stats.h" +#include "video/send_delay_stats.h" +#include "video/stats_counter.h" +#include "video/video_receive_stream.h" +#include "video/video_send_stream.h" namespace webrtc { diff --git a/call/call.h b/call/call.h index 74ea2eb8ad..9901745416 100644 --- a/call/call.h +++ b/call/call.h @@ -7,26 +7,26 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_CALL_H_ -#define WEBRTC_CALL_CALL_H_ +#ifndef CALL_CALL_H_ +#define CALL_CALL_H_ #include #include #include #include -#include "webrtc/api/rtcerror.h" -#include "webrtc/call/audio_receive_stream.h" -#include "webrtc/call/audio_send_stream.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/call/flexfec_receive_stream.h" -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/socket.h" +#include "api/rtcerror.h" +#include "call/audio_receive_stream.h" +#include "call/audio_send_stream.h" +#include "call/audio_state.h" +#include "call/flexfec_receive_stream.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "common_types.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/socket.h" namespace webrtc { @@ -204,4 +204,4 @@ class Call { } // namespace webrtc -#endif // WEBRTC_CALL_CALL_H_ +#endif // CALL_CALL_H_ diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc index 46611a1826..58435f03cc 100644 --- a/call/call_perf_tests.cc +++ b/call/call_perf_tests.cc @@ -13,33 +13,33 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/call/call.h" -#include "webrtc/call/video_config.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/direct_transport.h" -#include "webrtc/test/drifting_clock.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_audio_device.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/frame_generator_capturer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtp_rtcp_observer.h" -#include "webrtc/test/single_threaded_task_queue.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/perf_test.h" -#include "webrtc/video/transport_adapter.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "call/call.h" +#include "call/video_config.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/call_test.h" +#include "test/direct_transport.h" +#include "test/drifting_clock.h" +#include "test/encoder_settings.h" +#include "test/fake_audio_device.h" +#include "test/fake_encoder.h" +#include "test/field_trial.h" +#include "test/frame_generator.h" +#include "test/frame_generator_capturer.h" +#include "test/gtest.h" +#include "test/rtp_rtcp_observer.h" +#include "test/single_threaded_task_queue.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/perf_test.h" +#include "video/transport_adapter.h" +#include "voice_engine/include/voe_base.h" using webrtc::test::DriftingClock; using webrtc::test::FakeAudioDevice; diff --git a/call/call_unittest.cc b/call/call_unittest.cc index e342dfa977..b1ebb823a8 100644 --- a/call/call_unittest.cc +++ b/call/call_unittest.cc @@ -13,22 +13,22 @@ #include #include -#include "webrtc/api/test/mock_audio_mixer.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/call/call.h" -#include "webrtc/call/fake_rtp_transport_controller_send.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_device/include/mock_audio_device.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h" -#include "webrtc/modules/pacing/mock/mock_paced_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" -#include "webrtc/test/mock_transport.h" -#include "webrtc/test/mock_voice_engine.h" +#include "api/test/mock_audio_mixer.h" +#include "call/audio_state.h" +#include "call/call.h" +#include "call/fake_rtp_transport_controller_send.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_device/include/mock_audio_device.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h" +#include "modules/pacing/mock/mock_paced_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "rtc_base/ptr_util.h" +#include "test/fake_encoder.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" +#include "test/mock_transport.h" +#include "test/mock_voice_engine.h" namespace { diff --git a/call/callfactory.cc b/call/callfactory.cc index 7399cfc4eb..82acb6533c 100644 --- a/call/callfactory.cc +++ b/call/callfactory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/callfactory.h" +#include "call/callfactory.h" #include diff --git a/call/callfactory.h b/call/callfactory.h index 98eb68a545..167b82ad54 100644 --- a/call/callfactory.h +++ b/call/callfactory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_CALLFACTORY_H_ -#define WEBRTC_CALL_CALLFACTORY_H_ +#ifndef CALL_CALLFACTORY_H_ +#define CALL_CALLFACTORY_H_ -#include "webrtc/call/callfactoryinterface.h" +#include "call/callfactoryinterface.h" namespace webrtc { @@ -23,4 +23,4 @@ class CallFactory : public CallFactoryInterface { } // namespace webrtc -#endif // WEBRTC_CALL_CALLFACTORY_H_ +#endif // CALL_CALLFACTORY_H_ diff --git a/call/callfactoryinterface.h b/call/callfactoryinterface.h index 6a0329a3d0..a3cf6ebc46 100644 --- a/call/callfactoryinterface.h +++ b/call/callfactoryinterface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_CALLFACTORYINTERFACE_H_ -#define WEBRTC_CALL_CALLFACTORYINTERFACE_H_ +#ifndef CALL_CALLFACTORYINTERFACE_H_ +#define CALL_CALLFACTORYINTERFACE_H_ #include -#include "webrtc/call/call.h" +#include "call/call.h" namespace webrtc { @@ -31,4 +31,4 @@ std::unique_ptr CreateCallFactory(); } // namespace webrtc -#endif // WEBRTC_CALL_CALLFACTORYINTERFACE_H_ +#endif // CALL_CALLFACTORYINTERFACE_H_ diff --git a/call/fake_rtp_transport_controller_send.h b/call/fake_rtp_transport_controller_send.h index 6cff173203..b6174c674d 100644 --- a/call/fake_rtp_transport_controller_send.h +++ b/call/fake_rtp_transport_controller_send.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ -#define WEBRTC_CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#ifndef CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#define CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/modules/pacing/packet_router.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "common_types.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/pacing/packet_router.h" namespace webrtc { @@ -65,4 +65,4 @@ class FakeRtpTransportControllerSend } // namespace webrtc -#endif // WEBRTC_CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#endif // CALL_FAKE_RTP_TRANSPORT_CONTROLLER_SEND_H_ diff --git a/call/flexfec_receive_stream.h b/call/flexfec_receive_stream.h index 400bca4c13..ee83c26934 100644 --- a/call/flexfec_receive_stream.h +++ b/call/flexfec_receive_stream.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ -#define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ +#ifndef CALL_FLEXFEC_RECEIVE_STREAM_H_ +#define CALL_FLEXFEC_RECEIVE_STREAM_H_ #include #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/common_types.h" +#include "api/call/transport.h" +#include "api/rtpparameters.h" +#include "call/rtp_packet_sink_interface.h" +#include "common_types.h" namespace webrtc { @@ -84,4 +84,4 @@ class FlexfecReceiveStream : public RtpPacketSinkInterface { } // namespace webrtc -#endif // WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ +#endif // CALL_FLEXFEC_RECEIVE_STREAM_H_ diff --git a/call/flexfec_receive_stream_impl.cc b/call/flexfec_receive_stream_impl.cc index d6b41ed52f..bb68f6e6e8 100644 --- a/call/flexfec_receive_stream_impl.cc +++ b/call/flexfec_receive_stream_impl.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/flexfec_receive_stream_impl.h" +#include "call/flexfec_receive_stream_impl.h" #include -#include "webrtc/call/rtp_stream_receiver_controller_interface.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "call/rtp_stream_receiver_controller_interface.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/call/flexfec_receive_stream_impl.h b/call/flexfec_receive_stream_impl.h index f60e81049a..6bcbc7c9ca 100644 --- a/call/flexfec_receive_stream_impl.h +++ b/call/flexfec_receive_stream_impl.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ -#define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ +#ifndef CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ +#define CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ #include -#include "webrtc/call/flexfec_receive_stream.h" -#include "webrtc/call/rtp_packet_sink_interface.h" +#include "call/flexfec_receive_stream.h" +#include "call/rtp_packet_sink_interface.h" namespace webrtc { @@ -61,4 +61,4 @@ class FlexfecReceiveStreamImpl : public FlexfecReceiveStream { } // namespace webrtc -#endif // WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ +#endif // CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_ diff --git a/call/flexfec_receive_stream_unittest.cc b/call/flexfec_receive_stream_unittest.cc index c3bf2e0548..21dbeb7609 100644 --- a/call/flexfec_receive_stream_unittest.cc +++ b/call/flexfec_receive_stream_unittest.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/flexfec_receive_stream_impl.h" +#include "call/flexfec_receive_stream_impl.h" #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/utility/include/mock/mock_process_thread.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_transport.h" +#include "api/array_view.h" +#include "call/rtp_stream_receiver_controller.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" +#include "modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/utility/include/mock/mock_process_thread.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_transport.h" namespace webrtc { diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc index 2b85452ac3..da7095cbe6 100644 --- a/call/rampup_tests.cc +++ b/call/rampup_tests.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rampup_tests.h" +#include "call/rampup_tests.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "test/encoder_settings.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" namespace webrtc { namespace { diff --git a/call/rampup_tests.h b/call/rampup_tests.h index 83588221f1..1339f1f2dc 100644 --- a/call/rampup_tests.h +++ b/call/rampup_tests.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RAMPUP_TESTS_H_ -#define WEBRTC_CALL_RAMPUP_TESTS_H_ +#ifndef CALL_RAMPUP_TESTS_H_ +#define CALL_RAMPUP_TESTS_H_ #include #include #include -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/test/call_test.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "rtc_base/event.h" +#include "test/call_test.h" namespace webrtc { @@ -157,4 +157,4 @@ class RampUpDownUpTester : public RampUpTester { std::vector loss_rates_; }; } // namespace webrtc -#endif // WEBRTC_CALL_RAMPUP_TESTS_H_ +#endif // CALL_RAMPUP_TESTS_H_ diff --git a/call/rtcp_demuxer.cc b/call/rtcp_demuxer.cc index 90620c32ba..6533599b16 100644 --- a/call/rtcp_demuxer.cc +++ b/call/rtcp_demuxer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtcp_demuxer.h" +#include "call/rtcp_demuxer.h" -#include "webrtc/call/rtcp_packet_sink_interface.h" -#include "webrtc/call/rtp_rtcp_demuxer_helper.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "call/rtcp_packet_sink_interface.h" +#include "call/rtp_rtcp_demuxer_helper.h" +#include "common_types.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/call/rtcp_demuxer.h b/call/rtcp_demuxer.h index 7b5af9f7f3..87b5816282 100644 --- a/call/rtcp_demuxer.h +++ b/call/rtcp_demuxer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTCP_DEMUXER_H_ -#define WEBRTC_CALL_RTCP_DEMUXER_H_ +#ifndef CALL_RTCP_DEMUXER_H_ +#define CALL_RTCP_DEMUXER_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/call/ssrc_binding_observer.h" -#include "webrtc/rtc_base/basictypes.h" +#include "api/array_view.h" +#include "call/ssrc_binding_observer.h" +#include "rtc_base/basictypes.h" namespace webrtc { @@ -82,4 +82,4 @@ class RtcpDemuxer : public SsrcBindingObserver { } // namespace webrtc -#endif // WEBRTC_CALL_RTCP_DEMUXER_H_ +#endif // CALL_RTCP_DEMUXER_H_ diff --git a/call/rtcp_demuxer_unittest.cc b/call/rtcp_demuxer_unittest.cc index 91adf9978e..9125f0e369 100644 --- a/call/rtcp_demuxer_unittest.cc +++ b/call/rtcp_demuxer_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtcp_demuxer.h" +#include "call/rtcp_demuxer.h" #include #include -#include "webrtc/call/rtcp_packet_sink_interface.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "call/rtcp_packet_sink_interface.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/call/rtcp_packet_sink_interface.h b/call/rtcp_packet_sink_interface.h index 22a404d8e2..8ea3f7d21c 100644 --- a/call/rtcp_packet_sink_interface.h +++ b/call/rtcp_packet_sink_interface.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_ -#define WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_ +#ifndef CALL_RTCP_PACKET_SINK_INTERFACE_H_ +#define CALL_RTCP_PACKET_SINK_INTERFACE_H_ -#include "webrtc/api/array_view.h" +#include "api/array_view.h" namespace webrtc { @@ -26,4 +26,4 @@ class RtcpPacketSinkInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_ +#endif // CALL_RTCP_PACKET_SINK_INTERFACE_H_ diff --git a/call/rtp_config.cc b/call/rtp_config.cc index dc3ea217ce..3621f72890 100644 --- a/call/rtp_config.cc +++ b/call/rtp_config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_config.h" +#include "call/rtp_config.h" #include diff --git a/call/rtp_config.h b/call/rtp_config.h index f33103dfb5..86d32ac104 100644 --- a/call/rtp_config.h +++ b/call/rtp_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_CONFIG_H_ -#define WEBRTC_CALL_RTP_CONFIG_H_ +#ifndef CALL_RTP_CONFIG_H_ +#define CALL_RTP_CONFIG_H_ #include @@ -45,4 +45,4 @@ struct UlpfecConfig { int red_rtx_payload_type; }; } // namespace webrtc -#endif // WEBRTC_CALL_RTP_CONFIG_H_ +#endif // CALL_RTP_CONFIG_H_ diff --git a/call/rtp_demuxer.cc b/call/rtp_demuxer.cc index 1939a0fe6a..0f9173e59d 100644 --- a/call/rtp_demuxer.cc +++ b/call/rtp_demuxer.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_demuxer.h" +#include "call/rtp_demuxer.h" -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/call/rtp_rtcp_demuxer_helper.h" -#include "webrtc/call/ssrc_binding_observer.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "call/rtp_packet_sink_interface.h" +#include "call/rtp_rtcp_demuxer_helper.h" +#include "call/ssrc_binding_observer.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/call/rtp_demuxer.h b/call/rtp_demuxer.h index ddd4a2f43a..971c151648 100644 --- a/call/rtp_demuxer.h +++ b/call/rtp_demuxer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_DEMUXER_H_ -#define WEBRTC_CALL_RTP_DEMUXER_H_ +#ifndef CALL_RTP_DEMUXER_H_ +#define CALL_RTP_DEMUXER_H_ #include #include @@ -201,4 +201,4 @@ class RtpDemuxer { } // namespace webrtc -#endif // WEBRTC_CALL_RTP_DEMUXER_H_ +#endif // CALL_RTP_DEMUXER_H_ diff --git a/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc index 6fe5fc8d42..6202413594 100644 --- a/call/rtp_demuxer_unittest.cc +++ b/call/rtp_demuxer_unittest.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_demuxer.h" +#include "call/rtp_demuxer.h" #include #include #include -#include "webrtc/call/ssrc_binding_observer.h" -#include "webrtc/call/test/mock_rtp_packet_sink_interface.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "call/ssrc_binding_observer.h" +#include "call/test/mock_rtp_packet_sink_interface.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/call/rtp_packet_sink_interface.h b/call/rtp_packet_sink_interface.h index 0b3e64e313..ffbd58c398 100644 --- a/call/rtp_packet_sink_interface.h +++ b/call/rtp_packet_sink_interface.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_PACKET_SINK_INTERFACE_H_ -#define WEBRTC_CALL_RTP_PACKET_SINK_INTERFACE_H_ +#ifndef CALL_RTP_PACKET_SINK_INTERFACE_H_ +#define CALL_RTP_PACKET_SINK_INTERFACE_H_ namespace webrtc { @@ -23,4 +23,4 @@ class RtpPacketSinkInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTP_PACKET_SINK_INTERFACE_H_ +#endif // CALL_RTP_PACKET_SINK_INTERFACE_H_ diff --git a/call/rtp_rtcp_demuxer_helper.cc b/call/rtp_rtcp_demuxer_helper.cc index e8d3cbfadb..d36242b11b 100644 --- a/call/rtp_rtcp_demuxer_helper.cc +++ b/call/rtp_rtcp_demuxer_helper.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_rtcp_demuxer_helper.h" +#include "call/rtp_rtcp_demuxer_helper.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" namespace webrtc { diff --git a/call/rtp_rtcp_demuxer_helper.h b/call/rtp_rtcp_demuxer_helper.h index 0a4767d84a..32408e8a7a 100644 --- a/call/rtp_rtcp_demuxer_helper.h +++ b/call/rtp_rtcp_demuxer_helper.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_ -#define WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_ +#ifndef CALL_RTP_RTCP_DEMUXER_HELPER_H_ +#define CALL_RTP_RTCP_DEMUXER_HELPER_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/basictypes.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "rtc_base/basictypes.h" namespace webrtc { @@ -95,4 +95,4 @@ rtc::Optional ParseRtcpPacketSenderSsrc( } // namespace webrtc -#endif // WEBRTC_CALL_RTP_RTCP_DEMUXER_HELPER_H_ +#endif // CALL_RTP_RTCP_DEMUXER_HELPER_H_ diff --git a/call/rtp_rtcp_demuxer_helper_unittest.cc b/call/rtp_rtcp_demuxer_helper_unittest.cc index 96a1383c59..cb8a092616 100644 --- a/call/rtp_rtcp_demuxer_helper_unittest.cc +++ b/call/rtp_rtcp_demuxer_helper_unittest.cc @@ -10,19 +10,19 @@ #include -#include "webrtc/call/rtp_rtcp_demuxer_helper.h" +#include "call/rtp_rtcp_demuxer_helper.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/call/rtp_stream_receiver_controller.cc b/call/rtp_stream_receiver_controller.cc index 94fa83b60e..44a162237e 100644 --- a/call/rtp_stream_receiver_controller.cc +++ b/call/rtp_stream_receiver_controller.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_stream_receiver_controller.h" +#include "call/rtp_stream_receiver_controller.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/call/rtp_stream_receiver_controller.h b/call/rtp_stream_receiver_controller.h index feec5e453c..c523e3f5b3 100644 --- a/call/rtp_stream_receiver_controller.h +++ b/call/rtp_stream_receiver_controller.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ -#define WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ +#ifndef CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ +#define CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ #include -#include "webrtc/call/rtp_demuxer.h" -#include "webrtc/call/rtp_stream_receiver_controller_interface.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "call/rtp_demuxer.h" +#include "call/rtp_stream_receiver_controller_interface.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -69,4 +69,4 @@ class RtpStreamReceiverController } // namespace webrtc -#endif // WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ +#endif // CALL_RTP_STREAM_RECEIVER_CONTROLLER_H_ diff --git a/call/rtp_stream_receiver_controller_interface.h b/call/rtp_stream_receiver_controller_interface.h index 94b4f10852..a5e5295c31 100644 --- a/call/rtp_stream_receiver_controller_interface.h +++ b/call/rtp_stream_receiver_controller_interface.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ -#define WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ +#ifndef CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ +#define CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ #include -#include "webrtc/call/rtp_packet_sink_interface.h" +#include "call/rtp_packet_sink_interface.h" namespace webrtc { @@ -44,4 +44,4 @@ class RtpStreamReceiverControllerInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ +#endif // CALL_RTP_STREAM_RECEIVER_CONTROLLER_INTERFACE_H_ diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc index ec061d001f..090c261e4e 100644 --- a/call/rtp_transport_controller_send.cc +++ b/call/rtp_transport_controller_send.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtp_transport_controller_send.h" +#include "call/rtp_transport_controller_send.h" namespace webrtc { diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h index 766a2e3839..c50ea117b6 100644 --- a/call/rtp_transport_controller_send.h +++ b/call/rtp_transport_controller_send.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ -#define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#ifndef CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#define CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "common_types.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class Clock; @@ -55,4 +55,4 @@ class RtpTransportControllerSend : public RtpTransportControllerSendInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ +#endif // CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index b58042197e..7b0dbefd14 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ -#define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ +#ifndef CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ +#define CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ namespace webrtc { @@ -70,4 +70,4 @@ class RtpTransportControllerSendInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ +#endif // CALL_RTP_TRANSPORT_CONTROLLER_SEND_INTERFACE_H_ diff --git a/call/rtx_receive_stream.cc b/call/rtx_receive_stream.cc index 6a5432fea6..3013b622f9 100644 --- a/call/rtx_receive_stream.cc +++ b/call/rtx_receive_stream.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/call/rtx_receive_stream.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/logging.h" +#include "call/rtx_receive_stream.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/call/rtx_receive_stream.h b/call/rtx_receive_stream.h index c288a27eda..8ffa4400a9 100644 --- a/call/rtx_receive_stream.h +++ b/call/rtx_receive_stream.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_RTX_RECEIVE_STREAM_H_ -#define WEBRTC_CALL_RTX_RECEIVE_STREAM_H_ +#ifndef CALL_RTX_RECEIVE_STREAM_H_ +#define CALL_RTX_RECEIVE_STREAM_H_ #include -#include "webrtc/call/rtp_packet_sink_interface.h" +#include "call/rtp_packet_sink_interface.h" namespace webrtc { @@ -47,4 +47,4 @@ class RtxReceiveStream : public RtpPacketSinkInterface { } // namespace webrtc -#endif // WEBRTC_CALL_RTX_RECEIVE_STREAM_H_ +#endif // CALL_RTX_RECEIVE_STREAM_H_ diff --git a/call/rtx_receive_stream_unittest.cc b/call/rtx_receive_stream_unittest.cc index 2b2625d736..65ab82b0dd 100644 --- a/call/rtx_receive_stream_unittest.cc +++ b/call/rtx_receive_stream_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/rtx_receive_stream.h" -#include "webrtc/call/test/mock_rtp_packet_sink_interface.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "call/rtx_receive_stream.h" +#include "call/test/mock_rtp_packet_sink_interface.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/call/ssrc_binding_observer.h b/call/ssrc_binding_observer.h index 205a5c9d5f..73a8e8e586 100644 --- a/call/ssrc_binding_observer.h +++ b/call/ssrc_binding_observer.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_SSRC_BINDING_OBSERVER_H_ -#define WEBRTC_CALL_SSRC_BINDING_OBSERVER_H_ +#ifndef CALL_SSRC_BINDING_OBSERVER_H_ +#define CALL_SSRC_BINDING_OBSERVER_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { @@ -39,4 +39,4 @@ class SsrcBindingObserver { } // namespace webrtc -#endif // WEBRTC_CALL_SSRC_BINDING_OBSERVER_H_ +#endif // CALL_SSRC_BINDING_OBSERVER_H_ diff --git a/call/syncable.cc b/call/syncable.cc index c254e4f755..a821881884 100644 --- a/call/syncable.cc +++ b/call/syncable.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/syncable.h" +#include "call/syncable.h" namespace webrtc { diff --git a/call/syncable.h b/call/syncable.h index 2692a8a09c..a97990b2be 100644 --- a/call/syncable.h +++ b/call/syncable.h @@ -11,12 +11,12 @@ // Syncable is used by RtpStreamsSynchronizer in VideoReceiveStream, and // implemented by AudioReceiveStream. -#ifndef WEBRTC_CALL_SYNCABLE_H_ -#define WEBRTC_CALL_SYNCABLE_H_ +#ifndef CALL_SYNCABLE_H_ +#define CALL_SYNCABLE_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -40,4 +40,4 @@ class Syncable { }; } // namespace webrtc -#endif // WEBRTC_CALL_SYNCABLE_H_ +#endif // CALL_SYNCABLE_H_ diff --git a/call/test/mock_rtp_packet_sink_interface.h b/call/test/mock_rtp_packet_sink_interface.h index a13900436a..add399b690 100644 --- a/call/test/mock_rtp_packet_sink_interface.h +++ b/call/test/mock_rtp_packet_sink_interface.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ -#define WEBRTC_CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ +#ifndef CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ +#define CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ -#include "webrtc/call/rtp_packet_sink_interface.h" +#include "call/rtp_packet_sink_interface.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -23,4 +23,4 @@ class MockRtpPacketSink : public RtpPacketSinkInterface { } // namespace webrtc -#endif // WEBRTC_CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ +#endif // CALL_TEST_MOCK_RTP_PACKET_SINK_INTERFACE_H_ diff --git a/call/video_config.cc b/call/video_config.cc index e06d5e8dc1..7cf26406a1 100644 --- a/call/video_config.cc +++ b/call/video_config.cc @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/video_config.h" +#include "call/video_config.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { VideoStream::VideoStream() diff --git a/call/video_config.h b/call/video_config.h index 4a98d01405..5f660b7f6f 100644 --- a/call/video_config.h +++ b/call/video_config.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_VIDEO_CONFIG_H_ -#define WEBRTC_CALL_VIDEO_CONFIG_H_ +#ifndef CALL_VIDEO_CONFIG_H_ +#define CALL_VIDEO_CONFIG_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "common_types.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -154,4 +154,4 @@ class VideoEncoderConfig { } // namespace webrtc -#endif // WEBRTC_CALL_VIDEO_CONFIG_H_ +#endif // CALL_VIDEO_CONFIG_H_ diff --git a/call/video_receive_stream.cc b/call/video_receive_stream.cc index ef6c6084de..76892ea922 100644 --- a/call/video_receive_stream.cc +++ b/call/video_receive_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/video_receive_stream.h" +#include "call/video_receive_stream.h" namespace webrtc { diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h index f199ca1f85..4a8eca0c31 100644 --- a/call/video_receive_stream.h +++ b/call/video_receive_stream.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_ -#define WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_ +#ifndef CALL_VIDEO_RECEIVE_STREAM_H_ +#define CALL_VIDEO_RECEIVE_STREAM_H_ #include #include #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/call/rtp_config.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/rtc_base/platform_file.h" +#include "api/call/transport.h" +#include "api/rtpparameters.h" +#include "call/rtp_config.h" +#include "common_types.h" +#include "common_video/include/frame_callback.h" +#include "media/base/videosinkinterface.h" +#include "rtc_base/platform_file.h" namespace webrtc { @@ -257,4 +257,4 @@ class VideoReceiveStream { } // namespace webrtc -#endif // WEBRTC_CALL_VIDEO_RECEIVE_STREAM_H_ +#endif // CALL_VIDEO_RECEIVE_STREAM_H_ diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc index f6ea13f710..4f8c059ee4 100644 --- a/call/video_send_stream.cc +++ b/call/video_send_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/call/video_send_stream.h" +#include "call/video_send_stream.h" namespace webrtc { diff --git a/call/video_send_stream.h b/call/video_send_stream.h index 6dd13ab756..d4bd981a4d 100644 --- a/call/video_send_stream.h +++ b/call/video_send_stream.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_CALL_VIDEO_SEND_STREAM_H_ -#define WEBRTC_CALL_VIDEO_SEND_STREAM_H_ +#ifndef CALL_VIDEO_SEND_STREAM_H_ +#define CALL_VIDEO_SEND_STREAM_H_ #include #include #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/call/rtp_config.h" -#include "webrtc/call/video_config.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/platform_file.h" +#include "api/call/transport.h" +#include "api/rtpparameters.h" +#include "call/rtp_config.h" +#include "call/video_config.h" +#include "common_types.h" +#include "common_video/include/frame_callback.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/platform_file.h" namespace webrtc { @@ -283,4 +283,4 @@ class VideoSendStream { } // namespace webrtc -#endif // WEBRTC_CALL_VIDEO_SEND_STREAM_H_ +#endif // CALL_VIDEO_SEND_STREAM_H_ diff --git a/common_audio/DEPS b/common_audio/DEPS index 01e7f315a2..47ce4c32b6 100644 --- a/common_audio/DEPS +++ b/common_audio/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+dl/sp/api", # For openmax_dl. - "+webrtc/system_wrappers", + "+system_wrappers", ] diff --git a/common_audio/audio_converter.cc b/common_audio/audio_converter.cc index 9e4bdaa334..f9f998bbaa 100644 --- a/common_audio/audio_converter.cc +++ b/common_audio/audio_converter.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/audio_converter.h" +#include "common_audio/audio_converter.h" #include #include #include #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" using rtc::checked_cast; diff --git a/common_audio/audio_converter.h b/common_audio/audio_converter.h index 8b2388f44a..3f7b9a852c 100644 --- a/common_audio/audio_converter.h +++ b/common_audio/audio_converter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_AUDIO_CONVERTER_H_ -#define WEBRTC_COMMON_AUDIO_AUDIO_CONVERTER_H_ +#ifndef COMMON_AUDIO_AUDIO_CONVERTER_H_ +#define COMMON_AUDIO_AUDIO_CONVERTER_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -64,4 +64,4 @@ class AudioConverter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_AUDIO_CONVERTER_H_ +#endif // COMMON_AUDIO_AUDIO_CONVERTER_H_ diff --git a/common_audio/audio_converter_unittest.cc b/common_audio/audio_converter_unittest.cc index 2c44998a4e..e9937fd8cc 100644 --- a/common_audio/audio_converter_unittest.cc +++ b/common_audio/audio_converter_unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/common_audio/audio_converter.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" +#include "common_audio/audio_converter.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/audio_ring_buffer.cc b/common_audio/audio_ring_buffer.cc index e5631b2966..e7b5d81ac6 100644 --- a/common_audio/audio_ring_buffer.cc +++ b/common_audio/audio_ring_buffer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/audio_ring_buffer.h" +#include "common_audio/audio_ring_buffer.h" -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/ring_buffer.h" +#include "rtc_base/checks.h" // This is a simple multi-channel wrapper over the ring_buffer.h C interface. diff --git a/common_audio/audio_ring_buffer.h b/common_audio/audio_ring_buffer.h index 6bf3a19531..67d24f00d5 100644 --- a/common_audio/audio_ring_buffer.h +++ b/common_audio/audio_ring_buffer.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ -#define WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ +#ifndef COMMON_AUDIO_AUDIO_RING_BUFFER_H_ +#define COMMON_AUDIO_AUDIO_RING_BUFFER_H_ #include @@ -54,4 +54,4 @@ class AudioRingBuffer final { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_AUDIO_RING_BUFFER_H_ +#endif // COMMON_AUDIO_AUDIO_RING_BUFFER_H_ diff --git a/common_audio/audio_ring_buffer_unittest.cc b/common_audio/audio_ring_buffer_unittest.cc index fe868534a2..2fcf80035f 100644 --- a/common_audio/audio_ring_buffer_unittest.cc +++ b/common_audio/audio_ring_buffer_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/common_audio/audio_ring_buffer.h" +#include "common_audio/audio_ring_buffer.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/test/gtest.h" +#include "common_audio/channel_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/audio_util.cc b/common_audio/audio_util.cc index 2ce2eba994..a299f72865 100644 --- a/common_audio/audio_util.cc +++ b/common_audio/audio_util.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/include/audio_util.h" +#include "common_audio/include/audio_util.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { diff --git a/common_audio/audio_util_unittest.cc b/common_audio/audio_util_unittest.cc index d91b648bf0..22dcd91a8f 100644 --- a/common_audio/audio_util_unittest.cc +++ b/common_audio/audio_util_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/include/audio_util.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/common_audio/blocker.cc b/common_audio/blocker.cc index 6969332836..7d09d21ea8 100644 --- a/common_audio/blocker.cc +++ b/common_audio/blocker.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/blocker.h" +#include "common_audio/blocker.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace { diff --git a/common_audio/blocker.h b/common_audio/blocker.h index 38324712fe..9bce896dfe 100644 --- a/common_audio/blocker.h +++ b/common_audio/blocker.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_BLOCKER_H_ -#define WEBRTC_COMMON_AUDIO_BLOCKER_H_ +#ifndef COMMON_AUDIO_BLOCKER_H_ +#define COMMON_AUDIO_BLOCKER_H_ #include -#include "webrtc/common_audio/audio_ring_buffer.h" -#include "webrtc/common_audio/channel_buffer.h" +#include "common_audio/audio_ring_buffer.h" +#include "common_audio/channel_buffer.h" namespace webrtc { @@ -124,4 +124,4 @@ class Blocker { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_BLOCKER_H_ +#endif // COMMON_AUDIO_BLOCKER_H_ diff --git a/common_audio/blocker_unittest.cc b/common_audio/blocker_unittest.cc index 3af9699cbc..296efab15b 100644 --- a/common_audio/blocker_unittest.cc +++ b/common_audio/blocker_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/common_audio/blocker.h" +#include "common_audio/blocker.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace { diff --git a/common_audio/channel_buffer.cc b/common_audio/channel_buffer.cc index e7912bbd4d..df45f6d0f6 100644 --- a/common_audio/channel_buffer.cc +++ b/common_audio/channel_buffer.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/channel_buffer.h" +#include "common_audio/channel_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/channel_buffer.h b/common_audio/channel_buffer.h index 5d4fb88956..024868c46c 100644 --- a/common_audio/channel_buffer.h +++ b/common_audio/channel_buffer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_CHANNEL_BUFFER_H_ -#define WEBRTC_COMMON_AUDIO_CHANNEL_BUFFER_H_ +#ifndef COMMON_AUDIO_CHANNEL_BUFFER_H_ +#define COMMON_AUDIO_CHANNEL_BUFFER_H_ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "common_audio/include/audio_util.h" +#include "rtc_base/checks.h" +#include "rtc_base/gtest_prod_util.h" namespace webrtc { @@ -183,4 +183,4 @@ class IFChannelBuffer { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_CHANNEL_BUFFER_H_ +#endif // COMMON_AUDIO_CHANNEL_BUFFER_H_ diff --git a/common_audio/channel_buffer_unittest.cc b/common_audio/channel_buffer_unittest.cc index f4171bad88..196f87f717 100644 --- a/common_audio/channel_buffer_unittest.cc +++ b/common_audio/channel_buffer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/test/gtest.h" +#include "common_audio/channel_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/fft4g.h b/common_audio/fft4g.h index 6dd792f630..1f0e29dd5c 100644 --- a/common_audio/fft4g.h +++ b/common_audio/fft4g.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_FFT4G_H_ -#define WEBRTC_COMMON_AUDIO_FFT4G_H_ +#ifndef COMMON_AUDIO_FFT4G_H_ +#define COMMON_AUDIO_FFT4G_H_ #if defined(__cplusplus) extern "C" { @@ -22,4 +22,4 @@ void WebRtc_rdft(size_t n, int isgn, float *a, size_t *ip, float *w); } #endif -#endif // WEBRTC_COMMON_AUDIO_FFT4G_H_ +#endif // COMMON_AUDIO_FFT4G_H_ diff --git a/common_audio/fir_filter.cc b/common_audio/fir_filter.cc index f069af3b52..4fc767910e 100644 --- a/common_audio/fir_filter.cc +++ b/common_audio/fir_filter.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/fir_filter.h" +#include "common_audio/fir_filter.h" #include #include -#include "webrtc/common_audio/fir_filter_neon.h" -#include "webrtc/common_audio/fir_filter_sse.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "common_audio/fir_filter_neon.h" +#include "common_audio/fir_filter_sse.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/common_audio/fir_filter.h b/common_audio/fir_filter.h index a5dc6eced1..a386091484 100644 --- a/common_audio/fir_filter.h +++ b/common_audio/fir_filter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_FIR_FILTER_H_ -#define WEBRTC_COMMON_AUDIO_FIR_FILTER_H_ +#ifndef COMMON_AUDIO_FIR_FILTER_H_ +#define COMMON_AUDIO_FIR_FILTER_H_ #include @@ -37,4 +37,4 @@ class FIRFilter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_FIR_FILTER_H_ +#endif // COMMON_AUDIO_FIR_FILTER_H_ diff --git a/common_audio/fir_filter_neon.cc b/common_audio/fir_filter_neon.cc index 26d119503e..f15450e91a 100644 --- a/common_audio/fir_filter_neon.cc +++ b/common_audio/fir_filter_neon.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/fir_filter_neon.h" +#include "common_audio/fir_filter_neon.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/common_audio/fir_filter_neon.h b/common_audio/fir_filter_neon.h index 5576856b72..aac6084629 100644 --- a/common_audio/fir_filter_neon.h +++ b/common_audio/fir_filter_neon.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_FIR_FILTER_NEON_H_ -#define WEBRTC_COMMON_AUDIO_FIR_FILTER_NEON_H_ +#ifndef COMMON_AUDIO_FIR_FILTER_NEON_H_ +#define COMMON_AUDIO_FIR_FILTER_NEON_H_ #include -#include "webrtc/common_audio/fir_filter.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "common_audio/fir_filter.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { @@ -35,4 +35,4 @@ class FIRFilterNEON : public FIRFilter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_FIR_FILTER_NEON_H_ +#endif // COMMON_AUDIO_FIR_FILTER_NEON_H_ diff --git a/common_audio/fir_filter_sse.cc b/common_audio/fir_filter_sse.cc index 3e7c2afe7c..e79323bdd8 100644 --- a/common_audio/fir_filter_sse.cc +++ b/common_audio/fir_filter_sse.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/fir_filter_sse.h" +#include "common_audio/fir_filter_sse.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/common_audio/fir_filter_sse.h b/common_audio/fir_filter_sse.h index 3b1e324fc8..ada407f948 100644 --- a/common_audio/fir_filter_sse.h +++ b/common_audio/fir_filter_sse.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_FIR_FILTER_SSE_H_ -#define WEBRTC_COMMON_AUDIO_FIR_FILTER_SSE_H_ +#ifndef COMMON_AUDIO_FIR_FILTER_SSE_H_ +#define COMMON_AUDIO_FIR_FILTER_SSE_H_ #include -#include "webrtc/common_audio/fir_filter.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "common_audio/fir_filter.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { @@ -35,4 +35,4 @@ class FIRFilterSSE2 : public FIRFilter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_FIR_FILTER_SSE_H_ +#endif // COMMON_AUDIO_FIR_FILTER_SSE_H_ diff --git a/common_audio/fir_filter_unittest.cc b/common_audio/fir_filter_unittest.cc index fdbd3ef8d0..ac5c5c04fb 100644 --- a/common_audio/fir_filter_unittest.cc +++ b/common_audio/fir_filter_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/fir_filter.h" +#include "common_audio/fir_filter.h" #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/common_audio/include/audio_util.h b/common_audio/include/audio_util.h index f1077c6325..24aa177a64 100644 --- a/common_audio/include/audio_util.h +++ b/common_audio/include/audio_util.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ -#define WEBRTC_COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ +#ifndef COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ +#define COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { @@ -185,4 +185,4 @@ void DownmixInterleavedToMono(const int16_t* interleaved, } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ +#endif // COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ diff --git a/common_audio/lapped_transform.cc b/common_audio/lapped_transform.cc index 227b866c3b..517709f462 100644 --- a/common_audio/lapped_transform.cc +++ b/common_audio/lapped_transform.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/lapped_transform.h" +#include "common_audio/lapped_transform.h" #include #include #include -#include "webrtc/common_audio/real_fourier.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/real_fourier.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/lapped_transform.h b/common_audio/lapped_transform.h index fc03a9de39..fe3a8cd8c8 100644 --- a/common_audio/lapped_transform.h +++ b/common_audio/lapped_transform.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ -#define WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ +#ifndef COMMON_AUDIO_LAPPED_TRANSFORM_H_ +#define COMMON_AUDIO_LAPPED_TRANSFORM_H_ #include #include -#include "webrtc/common_audio/blocker.h" -#include "webrtc/common_audio/real_fourier.h" -#include "webrtc/system_wrappers/include/aligned_array.h" +#include "common_audio/blocker.h" +#include "common_audio/real_fourier.h" +#include "system_wrappers/include/aligned_array.h" namespace webrtc { @@ -127,5 +127,5 @@ class LappedTransform { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_ +#endif // COMMON_AUDIO_LAPPED_TRANSFORM_H_ diff --git a/common_audio/lapped_transform_unittest.cc b/common_audio/lapped_transform_unittest.cc index 66d4a5932e..d6a312db51 100644 --- a/common_audio/lapped_transform_unittest.cc +++ b/common_audio/lapped_transform_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/lapped_transform.h" +#include "common_audio/lapped_transform.h" #include #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" using std::complex; diff --git a/common_audio/mocks/mock_smoothing_filter.h b/common_audio/mocks/mock_smoothing_filter.h index 82cea55159..dec6ea5f47 100644 --- a/common_audio/mocks/mock_smoothing_filter.h +++ b/common_audio/mocks/mock_smoothing_filter.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ -#define WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ +#ifndef COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ +#define COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ -#include "webrtc/common_audio/smoothing_filter.h" -#include "webrtc/test/gmock.h" +#include "common_audio/smoothing_filter.h" +#include "test/gmock.h" namespace webrtc { @@ -25,4 +25,4 @@ class MockSmoothingFilter : public SmoothingFilter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ +#endif // COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_ diff --git a/common_audio/real_fourier.cc b/common_audio/real_fourier.cc index ed1ad111d5..f759778a35 100644 --- a/common_audio/real_fourier.cc +++ b/common_audio/real_fourier.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/real_fourier.h" +#include "common_audio/real_fourier.h" -#include "webrtc/common_audio/real_fourier_ooura.h" -#include "webrtc/common_audio/real_fourier_openmax.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/real_fourier_ooura.h" +#include "common_audio/real_fourier_openmax.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/real_fourier.h b/common_audio/real_fourier.h index 1b851e919e..4c69c3c768 100644 --- a/common_audio/real_fourier.h +++ b/common_audio/real_fourier.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_REAL_FOURIER_H_ -#define WEBRTC_COMMON_AUDIO_REAL_FOURIER_H_ +#ifndef COMMON_AUDIO_REAL_FOURIER_H_ +#define COMMON_AUDIO_REAL_FOURIER_H_ #include #include -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "system_wrappers/include/aligned_malloc.h" // Uniform interface class for the real DFT and its inverse, for power-of-2 // input lengths. Also contains helper functions for buffer allocation, taking @@ -71,5 +71,5 @@ class RealFourier { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_REAL_FOURIER_H_ +#endif // COMMON_AUDIO_REAL_FOURIER_H_ diff --git a/common_audio/real_fourier_ooura.cc b/common_audio/real_fourier_ooura.cc index 26a8a7d362..5d75717bc7 100644 --- a/common_audio/real_fourier_ooura.cc +++ b/common_audio/real_fourier_ooura.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/real_fourier_ooura.h" +#include "common_audio/real_fourier_ooura.h" #include #include -#include "webrtc/common_audio/fft4g.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/fft4g.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/real_fourier_ooura.h b/common_audio/real_fourier_ooura.h index 99d09d78fe..f885a34f58 100644 --- a/common_audio/real_fourier_ooura.h +++ b/common_audio/real_fourier_ooura.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_REAL_FOURIER_OOURA_H_ -#define WEBRTC_COMMON_AUDIO_REAL_FOURIER_OOURA_H_ +#ifndef COMMON_AUDIO_REAL_FOURIER_OOURA_H_ +#define COMMON_AUDIO_REAL_FOURIER_OOURA_H_ #include #include -#include "webrtc/common_audio/real_fourier.h" +#include "common_audio/real_fourier.h" namespace webrtc { @@ -41,5 +41,5 @@ class RealFourierOoura : public RealFourier { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_REAL_FOURIER_OOURA_H_ +#endif // COMMON_AUDIO_REAL_FOURIER_OOURA_H_ diff --git a/common_audio/real_fourier_openmax.cc b/common_audio/real_fourier_openmax.cc index 4d971da573..6c5c9cee92 100644 --- a/common_audio/real_fourier_openmax.cc +++ b/common_audio/real_fourier_openmax.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/real_fourier_openmax.h" +#include "common_audio/real_fourier_openmax.h" #include #include "dl/sp/api/omxSP.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/real_fourier_openmax.h b/common_audio/real_fourier_openmax.h index 63ce5ba0bc..7b4299aa3c 100644 --- a/common_audio/real_fourier_openmax.h +++ b/common_audio/real_fourier_openmax.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ -#define WEBRTC_COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ +#ifndef COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ +#define COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ #include -#include "webrtc/common_audio/real_fourier.h" +#include "common_audio/real_fourier.h" namespace webrtc { @@ -40,5 +40,5 @@ class RealFourierOpenmax : public RealFourier { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ +#endif // COMMON_AUDIO_REAL_FOURIER_OPENMAX_H_ diff --git a/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc index d1281c7a96..97849b965b 100644 --- a/common_audio/real_fourier_unittest.cc +++ b/common_audio/real_fourier_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/real_fourier.h" +#include "common_audio/real_fourier.h" #include -#include "webrtc/common_audio/real_fourier_ooura.h" -#include "webrtc/common_audio/real_fourier_openmax.h" -#include "webrtc/test/gtest.h" +#include "common_audio/real_fourier_ooura.h" +#include "common_audio/real_fourier_openmax.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/resampler/include/push_resampler.h b/common_audio/resampler/include/push_resampler.h index 31e08e3640..44c6c4d3af 100644 --- a/common_audio/resampler/include/push_resampler.h +++ b/common_audio/resampler/include/push_resampler.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ -#define WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ +#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ +#define COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -50,4 +50,4 @@ class PushResampler { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ +#endif // COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_ diff --git a/common_audio/resampler/include/resampler.h b/common_audio/resampler/include/resampler.h index 259349b670..068e270988 100644 --- a/common_audio/resampler/include/resampler.h +++ b/common_audio/resampler/include/resampler.h @@ -13,12 +13,12 @@ * A wrapper for resampling a numerous amount of sampling combinations. */ -#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ -#define WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ +#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ +#define COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -89,4 +89,4 @@ class Resampler { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ +#endif // COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ diff --git a/common_audio/resampler/push_resampler.cc b/common_audio/resampler/push_resampler.cc index 38cdf2b172..3930624b2a 100644 --- a/common_audio/resampler/push_resampler.cc +++ b/common_audio/resampler/push_resampler.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/resampler/include/push_resampler.h" +#include "common_audio/resampler/include/push_resampler.h" #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/resampler/include/resampler.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/common_audio/resampler/push_resampler_unittest.cc b/common_audio/resampler/push_resampler_unittest.cc index eb08f704ab..6a0c60a734 100644 --- a/common_audio/resampler/push_resampler_unittest.cc +++ b/common_audio/resampler/push_resampler_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/rtc_base/checks.h" // RTC_DCHECK_IS_ON -#include "webrtc/test/gtest.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "rtc_base/checks.h" // RTC_DCHECK_IS_ON +#include "test/gtest.h" // Quality testing of PushResampler is handled through output_mixer_unittest.cc. diff --git a/common_audio/resampler/push_sinc_resampler.cc b/common_audio/resampler/push_sinc_resampler.cc index 3b603dbb58..14ab330cdf 100644 --- a/common_audio/resampler/push_sinc_resampler.cc +++ b/common_audio/resampler/push_sinc_resampler.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" +#include "common_audio/resampler/push_sinc_resampler.h" #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/include/audio_util.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h index 7af85c8c4c..d6afa4dbf7 100644 --- a/common_audio/resampler/push_sinc_resampler.h +++ b/common_audio/resampler/push_sinc_resampler.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ -#define WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ +#ifndef COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ +#define COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ #include -#include "webrtc/common_audio/resampler/sinc_resampler.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_audio/resampler/sinc_resampler.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -74,4 +74,4 @@ class PushSincResampler : public SincResamplerCallback { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ +#endif // COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc index cb156cce44..954e54a81f 100644 --- a/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "common_audio/resampler/sinusoidal_linear_chirp_source.h" +#include "rtc_base/timeutils.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/common_audio/resampler/resampler.cc b/common_audio/resampler/resampler.cc index 8efb16cb31..47666c8afa 100644 --- a/common_audio/resampler/resampler.cc +++ b/common_audio/resampler/resampler.cc @@ -16,8 +16,8 @@ #include #include -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/resampler/include/resampler.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/common_audio/resampler/resampler_unittest.cc b/common_audio/resampler/resampler_unittest.cc index 4f50363288..4a53901a56 100644 --- a/common_audio/resampler/resampler_unittest.cc +++ b/common_audio/resampler/resampler_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/test/gtest.h" +#include "common_audio/resampler/include/resampler.h" +#include "test/gtest.h" // TODO(andrew): this is a work-in-progress. Many more tests are needed. diff --git a/common_audio/resampler/sinc_resampler.cc b/common_audio/resampler/sinc_resampler.cc index acf7d0fae9..90f03a0b3a 100644 --- a/common_audio/resampler/sinc_resampler.cc +++ b/common_audio/resampler/sinc_resampler.cc @@ -85,16 +85,16 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include "webrtc/common_audio/resampler/sinc_resampler.h" +#include "common_audio/resampler/sinc_resampler.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "typedefs.h" namespace webrtc { diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index fa92163f86..f6fcdf81e9 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -11,15 +11,15 @@ // Modified from the Chromium original here: // src/media/base/sinc_resampler.h -#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ -#define WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ +#ifndef COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ +#define COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/gtest_prod_util.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/gtest_prod_util.h" +#include "system_wrappers/include/aligned_malloc.h" +#include "typedefs.h" namespace webrtc { @@ -168,4 +168,4 @@ class SincResampler { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ +#endif // COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ diff --git a/common_audio/resampler/sinc_resampler_neon.cc b/common_audio/resampler/sinc_resampler_neon.cc index e909a6c5de..9d77f0d12c 100644 --- a/common_audio/resampler/sinc_resampler_neon.cc +++ b/common_audio/resampler/sinc_resampler_neon.cc @@ -11,7 +11,7 @@ // Modified from the Chromium original: // src/media/base/sinc_resampler.cc -#include "webrtc/common_audio/resampler/sinc_resampler.h" +#include "common_audio/resampler/sinc_resampler.h" #include diff --git a/common_audio/resampler/sinc_resampler_sse.cc b/common_audio/resampler/sinc_resampler_sse.cc index 9e3953fede..711110858f 100644 --- a/common_audio/resampler/sinc_resampler_sse.cc +++ b/common_audio/resampler/sinc_resampler_sse.cc @@ -11,7 +11,7 @@ // Modified from the Chromium original: // src/media/base/simd/sinc_resampler_sse.cc -#include "webrtc/common_audio/resampler/sinc_resampler.h" +#include "common_audio/resampler/sinc_resampler.h" #include diff --git a/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc index 8a3d1ec893..da3985a370 100644 --- a/common_audio/resampler/sinc_resampler_unittest.cc +++ b/common_audio/resampler/sinc_resampler_unittest.cc @@ -19,13 +19,13 @@ #include #include -#include "webrtc/common_audio/resampler/sinc_resampler.h" -#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include "webrtc/rtc_base/stringize_macros.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_audio/resampler/sinc_resampler.h" +#include "common_audio/resampler/sinusoidal_linear_chirp_source.h" +#include "rtc_base/stringize_macros.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; diff --git a/common_audio/resampler/sinusoidal_linear_chirp_source.cc b/common_audio/resampler/sinusoidal_linear_chirp_source.cc index 5d215688ba..134044e778 100644 --- a/common_audio/resampler/sinusoidal_linear_chirp_source.cc +++ b/common_audio/resampler/sinusoidal_linear_chirp_source.cc @@ -11,7 +11,7 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" +#include "common_audio/resampler/sinusoidal_linear_chirp_source.h" #include diff --git a/common_audio/resampler/sinusoidal_linear_chirp_source.h b/common_audio/resampler/sinusoidal_linear_chirp_source.h index 80ccd8072a..7fcbaa0821 100644 --- a/common_audio/resampler/sinusoidal_linear_chirp_source.h +++ b/common_audio/resampler/sinusoidal_linear_chirp_source.h @@ -11,11 +11,11 @@ // Modified from the Chromium original here: // src/media/base/sinc_resampler_unittest.cc -#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ -#define WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ +#ifndef COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ +#define COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ -#include "webrtc/common_audio/resampler/sinc_resampler.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_audio/resampler/sinc_resampler.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -52,4 +52,4 @@ class SinusoidalLinearChirpSource : public SincResamplerCallback { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ +#endif // COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ diff --git a/common_audio/ring_buffer.c b/common_audio/ring_buffer.c index 5a91205118..a20ada51bf 100644 --- a/common_audio/ring_buffer.c +++ b/common_audio/ring_buffer.c @@ -11,7 +11,7 @@ // A ring buffer to hold arbitrary data. Provides no thread safety. Unless // otherwise specified, functions return 0 on success and -1 on error. -#include "webrtc/common_audio/ring_buffer.h" +#include "common_audio/ring_buffer.h" #include // size_t #include diff --git a/common_audio/ring_buffer.h b/common_audio/ring_buffer.h index 46759b6697..aa2ac27375 100644 --- a/common_audio/ring_buffer.h +++ b/common_audio/ring_buffer.h @@ -11,8 +11,8 @@ // A ring buffer to hold arbitrary data. Provides no thread safety. Unless // otherwise specified, functions return 0 on success and -1 on error. -#ifndef WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ -#define WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ +#ifndef COMMON_AUDIO_RING_BUFFER_H_ +#define COMMON_AUDIO_RING_BUFFER_H_ #ifdef __cplusplus extern "C" { @@ -73,4 +73,4 @@ size_t WebRtc_available_write(const RingBuffer* handle); } #endif -#endif // WEBRTC_COMMON_AUDIO_RING_BUFFER_H_ +#endif // COMMON_AUDIO_RING_BUFFER_H_ diff --git a/common_audio/ring_buffer_unittest.cc b/common_audio/ring_buffer_unittest.cc index 20fc014279..4bb1497b17 100644 --- a/common_audio/ring_buffer_unittest.cc +++ b/common_audio/ring_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/ring_buffer.h" +#include "common_audio/ring_buffer.h" #include #include @@ -16,7 +16,7 @@ #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/signal_processing/auto_corr_to_refl_coef.c b/common_audio/signal_processing/auto_corr_to_refl_coef.c index f99dd62b82..a3ec24f5da 100644 --- a/common_audio/signal_processing/auto_corr_to_refl_coef.c +++ b/common_audio/signal_processing/auto_corr_to_refl_coef.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_AutoCorrToReflCoef(const int32_t *R, int use_order, int16_t *K) { diff --git a/common_audio/signal_processing/auto_correlation.c b/common_audio/signal_processing/auto_correlation.c index 8b99e82648..1455820e8f 100644 --- a/common_audio/signal_processing/auto_correlation.c +++ b/common_audio/signal_processing/auto_correlation.c @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" size_t WebRtcSpl_AutoCorrelation(const int16_t* in_vector, size_t in_vector_length, diff --git a/common_audio/signal_processing/complex_bit_reverse.c b/common_audio/signal_processing/complex_bit_reverse.c index c8bd2dc457..1c82cff50f 100644 --- a/common_audio/signal_processing/complex_bit_reverse.c +++ b/common_audio/signal_processing/complex_bit_reverse.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" /* Tables for data buffer indexes that are bit reversed and thus need to be * swapped. Note that, index_7[{0, 2, 4, ...}] are for the left side of the swap diff --git a/common_audio/signal_processing/complex_bit_reverse_arm.S b/common_audio/signal_processing/complex_bit_reverse_arm.S index 93de99f51b..c70349aaff 100644 --- a/common_audio/signal_processing/complex_bit_reverse_arm.S +++ b/common_audio/signal_processing/complex_bit_reverse_arm.S @@ -12,7 +12,7 @@ @ for ARMv5 platforms. @ Reference C code is in file complex_bit_reverse.c. Bit-exact. -#include "webrtc/system_wrappers/include/asm_defines.h" +#include "system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_ComplexBitReverse .align 2 diff --git a/common_audio/signal_processing/complex_bit_reverse_mips.c b/common_audio/signal_processing/complex_bit_reverse_mips.c index 583fe4f610..9007b19cf6 100644 --- a/common_audio/signal_processing/complex_bit_reverse_mips.c +++ b/common_audio/signal_processing/complex_bit_reverse_mips.c @@ -9,7 +9,7 @@ */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" static int16_t coefTable_7[] = { 4, 256, 8, 128, 12, 384, 16, 64, diff --git a/common_audio/signal_processing/complex_fft.c b/common_audio/signal_processing/complex_fft.c index 97ebacc498..d4666f3598 100644 --- a/common_audio/signal_processing/complex_fft.c +++ b/common_audio/signal_processing/complex_fft.c @@ -15,8 +15,8 @@ * */ -#include "webrtc/common_audio/signal_processing/complex_fft_tables.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/complex_fft_tables.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #define CFFTSFT 14 #define CFFTRND 1 diff --git a/common_audio/signal_processing/complex_fft_mips.c b/common_audio/signal_processing/complex_fft_mips.c index 34c4f232a0..27071f8b39 100644 --- a/common_audio/signal_processing/complex_fft_mips.c +++ b/common_audio/signal_processing/complex_fft_mips.c @@ -9,8 +9,8 @@ */ -#include "webrtc/common_audio/signal_processing/complex_fft_tables.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/complex_fft_tables.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #define CFFTSFT 14 #define CFFTRND 1 diff --git a/common_audio/signal_processing/complex_fft_tables.h b/common_audio/signal_processing/complex_fft_tables.h index ca7b7fe39b..7f531e9f62 100644 --- a/common_audio/signal_processing/complex_fft_tables.h +++ b/common_audio/signal_processing/complex_fft_tables.h @@ -9,10 +9,10 @@ */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" static const int16_t kSinTable1024[] = { 0, 201, 402, 603, 804, 1005, 1206, 1406, @@ -145,4 +145,4 @@ static const int16_t kSinTable1024[] = { -1607, -1406, -1206, -1005, -804, -603, -402, -201 }; -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ diff --git a/common_audio/signal_processing/copy_set_operations.c b/common_audio/signal_processing/copy_set_operations.c index 9d7cf47e3b..ae709d40f0 100644 --- a/common_audio/signal_processing/copy_set_operations.c +++ b/common_audio/signal_processing/copy_set_operations.c @@ -23,7 +23,7 @@ */ #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_MemSetW16(int16_t *ptr, int16_t set_value, size_t length) diff --git a/common_audio/signal_processing/cross_correlation.c b/common_audio/signal_processing/cross_correlation.c index d7c9f2b9af..c6267c92c2 100644 --- a/common_audio/signal_processing/cross_correlation.c +++ b/common_audio/signal_processing/cross_correlation.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" /* C version of WebRtcSpl_CrossCorrelation() for generic platforms. */ void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation, diff --git a/common_audio/signal_processing/cross_correlation_mips.c b/common_audio/signal_processing/cross_correlation_mips.c index b2364026c6..c395101900 100644 --- a/common_audio/signal_processing/cross_correlation_mips.c +++ b/common_audio/signal_processing/cross_correlation_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_CrossCorrelation_mips(int32_t* cross_correlation, const int16_t* seq1, diff --git a/common_audio/signal_processing/cross_correlation_neon.c b/common_audio/signal_processing/cross_correlation_neon.c index 918b6715cd..fdd03f1976 100644 --- a/common_audio/signal_processing/cross_correlation_neon.c +++ b/common_audio/signal_processing/cross_correlation_neon.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #include diff --git a/common_audio/signal_processing/division_operations.c b/common_audio/signal_processing/division_operations.c index 2d420525ba..c6195e7999 100644 --- a/common_audio/signal_processing/division_operations.c +++ b/common_audio/signal_processing/division_operations.c @@ -21,8 +21,8 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/sanitizer.h" uint32_t WebRtcSpl_DivU32U16(uint32_t num, uint16_t den) { diff --git a/common_audio/signal_processing/dot_product_with_scale.cc b/common_audio/signal_processing/dot_product_with_scale.cc index 7cd6e91ba3..a35879a76f 100644 --- a/common_audio/signal_processing/dot_product_with_scale.cc +++ b/common_audio/signal_processing/dot_product_with_scale.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/dot_product_with_scale.h" +#include "common_audio/signal_processing/dot_product_with_scale.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/safe_conversions.h" int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1, const int16_t* vector2, diff --git a/common_audio/signal_processing/dot_product_with_scale.h b/common_audio/signal_processing/dot_product_with_scale.h index 288fe5e738..4dc9526dd8 100644 --- a/common_audio/signal_processing/dot_product_with_scale.h +++ b/common_audio/signal_processing/dot_product_with_scale.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #ifdef __cplusplus extern "C" { @@ -38,4 +38,4 @@ int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1, #ifdef __cplusplus } #endif // __cplusplus -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ diff --git a/common_audio/signal_processing/downsample_fast.c b/common_audio/signal_processing/downsample_fast.c index 90de156914..9a2ea053da 100644 --- a/common_audio/signal_processing/downsample_fast.c +++ b/common_audio/signal_processing/downsample_fast.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "rtc_base/checks.h" +#include "rtc_base/sanitizer.h" // TODO(Bjornv): Change the function parameter order to WebRTC code style. // C version of WebRtcSpl_DownsampleFast() for generic platforms. diff --git a/common_audio/signal_processing/downsample_fast_mips.c b/common_audio/signal_processing/downsample_fast_mips.c index ac39401abb..0f3f3a069f 100644 --- a/common_audio/signal_processing/downsample_fast_mips.c +++ b/common_audio/signal_processing/downsample_fast_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // Version of WebRtcSpl_DownsampleFast() for MIPS platforms. int WebRtcSpl_DownsampleFast_mips(const int16_t* data_in, diff --git a/common_audio/signal_processing/downsample_fast_neon.c b/common_audio/signal_processing/downsample_fast_neon.c index 58732dab1c..36fc0c8aee 100644 --- a/common_audio/signal_processing/downsample_fast_neon.c +++ b/common_audio/signal_processing/downsample_fast_neon.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #include diff --git a/common_audio/signal_processing/energy.c b/common_audio/signal_processing/energy.c index e83f1a698f..5cce6b8777 100644 --- a/common_audio/signal_processing/energy.c +++ b/common_audio/signal_processing/energy.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" int32_t WebRtcSpl_Energy(int16_t* vector, size_t vector_length, diff --git a/common_audio/signal_processing/filter_ar.c b/common_audio/signal_processing/filter_ar.c index d389ee47e5..621fef5e40 100644 --- a/common_audio/signal_processing/filter_ar.c +++ b/common_audio/signal_processing/filter_ar.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" size_t WebRtcSpl_FilterAR(const int16_t* a, size_t a_length, diff --git a/common_audio/signal_processing/filter_ar_fast_q12.c b/common_audio/signal_processing/filter_ar_fast_q12.c index 71be360441..0767651a74 100644 --- a/common_audio/signal_processing/filter_ar_fast_q12.c +++ b/common_audio/signal_processing/filter_ar_fast_q12.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // TODO(bjornv): Change the return type to report errors. diff --git a/common_audio/signal_processing/filter_ar_fast_q12_armv7.S b/common_audio/signal_processing/filter_ar_fast_q12_armv7.S index f16362738a..c6397c2055 100644 --- a/common_audio/signal_processing/filter_ar_fast_q12_armv7.S +++ b/common_audio/signal_processing/filter_ar_fast_q12_armv7.S @@ -35,7 +35,7 @@ @ r11: Scratch @ r12: &coefficients[j] -#include "webrtc/system_wrappers/include/asm_defines.h" +#include "system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_FilterARFastQ12 .align 2 diff --git a/common_audio/signal_processing/filter_ar_fast_q12_mips.c b/common_audio/signal_processing/filter_ar_fast_q12_mips.c index d6ee4010a0..b9ad30f006 100644 --- a/common_audio/signal_processing/filter_ar_fast_q12_mips.c +++ b/common_audio/signal_processing/filter_ar_fast_q12_mips.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_FilterARFastQ12(const int16_t* data_in, int16_t* data_out, diff --git a/common_audio/signal_processing/filter_ma_fast_q12.c b/common_audio/signal_processing/filter_ma_fast_q12.c index ded1ad6015..9596ef1922 100644 --- a/common_audio/signal_processing/filter_ma_fast_q12.c +++ b/common_audio/signal_processing/filter_ma_fast_q12.c @@ -15,9 +15,9 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "rtc_base/sanitizer.h" void WebRtcSpl_FilterMAFastQ12(const int16_t* in_ptr, int16_t* out_ptr, diff --git a/common_audio/signal_processing/get_hanning_window.c b/common_audio/signal_processing/get_hanning_window.c index d83ac21682..8f29da8d9b 100644 --- a/common_audio/signal_processing/get_hanning_window.c +++ b/common_audio/signal_processing/get_hanning_window.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // Hanning table with 256 entries static const int16_t kHanningTable[] = { diff --git a/common_audio/signal_processing/get_scaling_square.c b/common_audio/signal_processing/get_scaling_square.c index 82e3c8b09c..4eb126941e 100644 --- a/common_audio/signal_processing/get_scaling_square.c +++ b/common_audio/signal_processing/get_scaling_square.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" int16_t WebRtcSpl_GetScalingSquare(int16_t* in_vector, size_t in_vector_length, diff --git a/common_audio/signal_processing/ilbc_specific_functions.c b/common_audio/signal_processing/ilbc_specific_functions.c index 301a922d79..b75b705902 100644 --- a/common_audio/signal_processing/ilbc_specific_functions.c +++ b/common_audio/signal_processing/ilbc_specific_functions.c @@ -19,7 +19,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_ReverseOrderMultArrayElements(int16_t *out, const int16_t *in, const int16_t *win, diff --git a/common_audio/signal_processing/include/real_fft.h b/common_audio/signal_processing/include/real_fft.h index ed0db767aa..4233c69fc5 100644 --- a/common_audio/signal_processing/include/real_fft.h +++ b/common_audio/signal_processing/include/real_fft.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // For ComplexFFT(), the maximum fft order is 10; // for OpenMax FFT in ARM, it is 12; @@ -94,4 +94,4 @@ int WebRtcSpl_RealInverseFFT(struct RealFFT* self, } #endif -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h index f4fe8e86a4..74d1c2d2ef 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -15,12 +15,12 @@ * For specific function calls, see bottom of file. */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ #include -#include "webrtc/common_audio/signal_processing/dot_product_with_scale.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/dot_product_with_scale.h" +#include "typedefs.h" // Macros specific for the fixed point implementation #define WEBRTC_SPL_WORD16_MAX 32767 @@ -102,7 +102,7 @@ extern "C" { memcpy(v1, v2, (length) * sizeof(int16_t)) // inline functions: -#include "webrtc/common_audio/signal_processing/include/spl_inl.h" +#include "common_audio/signal_processing/include/spl_inl.h" // Initialize SPL. Currently it contains only function pointer initialization. // If the underlying platform is known to be ARM-Neon (WEBRTC_HAS_NEON defined), @@ -906,7 +906,7 @@ void WebRtcSpl_SynthesisQMF(const int16_t* low_band, #ifdef __cplusplus } #endif // __cplusplus -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ // // WebRtcSpl_AddSatW16(...) diff --git a/common_audio/signal_processing/include/spl_inl.h b/common_audio/signal_processing/include/spl_inl.h index c5aec272de..ba3a11376b 100644 --- a/common_audio/signal_processing/include/spl_inl.h +++ b/common_audio/signal_processing/include/spl_inl.h @@ -12,10 +12,10 @@ // This header file includes the inline functions in // the fix point signal processing library. -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ -#include "webrtc/rtc_base/compile_assert_c.h" +#include "rtc_base/compile_assert_c.h" extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64]; @@ -64,11 +64,11 @@ static __inline int WebRtcSpl_CountLeadingZeros64(uint64_t n) { } #ifdef WEBRTC_ARCH_ARM_V7 -#include "webrtc/common_audio/signal_processing/include/spl_inl_armv7.h" +#include "common_audio/signal_processing/include/spl_inl_armv7.h" #else #if defined(MIPS32_LE) -#include "webrtc/common_audio/signal_processing/include/spl_inl_mips.h" +#include "common_audio/signal_processing/include/spl_inl_mips.h" #endif #if !defined(MIPS_DSP_R1_LE) @@ -151,4 +151,4 @@ static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) { #endif // WEBRTC_ARCH_ARM_V7 -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ diff --git a/common_audio/signal_processing/include/spl_inl_armv7.h b/common_audio/signal_processing/include/spl_inl_armv7.h index 634be48263..97179f92f2 100644 --- a/common_audio/signal_processing/include/spl_inl_armv7.h +++ b/common_audio/signal_processing/include/spl_inl_armv7.h @@ -13,8 +13,8 @@ * the fix point signal processing library. */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ /* TODO(kma): Replace some assembly code with GCC intrinsics * (e.g. __builtin_clz). @@ -131,4 +131,4 @@ static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) { return (int16_t)out; } -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_ diff --git a/common_audio/signal_processing/include/spl_inl_mips.h b/common_audio/signal_processing/include/spl_inl_mips.h index 90fa07a1fe..5819d0f86b 100644 --- a/common_audio/signal_processing/include/spl_inl_mips.h +++ b/common_audio/signal_processing/include/spl_inl_mips.h @@ -12,8 +12,8 @@ // This header file includes the inline functions in // the fix point signal processing library. -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ static __inline int32_t WEBRTC_SPL_MUL_16_16(int32_t a, int32_t b) { @@ -210,4 +210,4 @@ static __inline int32_t WebRtc_MulAccumW16(int16_t a, return (c1); } -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_ diff --git a/common_audio/signal_processing/levinson_durbin.c b/common_audio/signal_processing/levinson_durbin.c index 3e16b23f8b..2c5cbaeeaa 100644 --- a/common_audio/signal_processing/levinson_durbin.c +++ b/common_audio/signal_processing/levinson_durbin.c @@ -15,8 +15,8 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/sanitizer.h" #define SPL_LEVINSON_MAXORDER 20 diff --git a/common_audio/signal_processing/lpc_to_refl_coef.c b/common_audio/signal_processing/lpc_to_refl_coef.c index edcebd4e63..7a5e25191b 100644 --- a/common_audio/signal_processing/lpc_to_refl_coef.c +++ b/common_audio/signal_processing/lpc_to_refl_coef.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #define SPL_LPC_TO_REFL_COEF_MAX_AR_MODEL_ORDER 50 diff --git a/common_audio/signal_processing/min_max_operations.c b/common_audio/signal_processing/min_max_operations.c index 75975bb09b..d249a02d40 100644 --- a/common_audio/signal_processing/min_max_operations.c +++ b/common_audio/signal_processing/min_max_operations.c @@ -26,8 +26,8 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // TODO(bjorn/kma): Consolidate function pairs (e.g. combine // WebRtcSpl_MaxAbsValueW16C and WebRtcSpl_MaxAbsIndexW16 into a single one.) diff --git a/common_audio/signal_processing/min_max_operations_mips.c b/common_audio/signal_processing/min_max_operations_mips.c index 96e20af2ef..8a7fc65c42 100644 --- a/common_audio/signal_processing/min_max_operations_mips.c +++ b/common_audio/signal_processing/min_max_operations_mips.c @@ -16,8 +16,8 @@ * */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // Maximum absolute value of word16 vector. int16_t WebRtcSpl_MaxAbsValueW16_mips(const int16_t* vector, size_t length) { diff --git a/common_audio/signal_processing/min_max_operations_neon.c b/common_audio/signal_processing/min_max_operations_neon.c index e26d0abfea..53217df7be 100644 --- a/common_audio/signal_processing/min_max_operations_neon.c +++ b/common_audio/signal_processing/min_max_operations_neon.c @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // Maximum absolute value of word16 vector. C version for generic platforms. int16_t WebRtcSpl_MaxAbsValueW16Neon(const int16_t* vector, size_t length) { diff --git a/common_audio/signal_processing/randomization_functions.c b/common_audio/signal_processing/randomization_functions.c index 73f24093c2..a445c572c7 100644 --- a/common_audio/signal_processing/randomization_functions.c +++ b/common_audio/signal_processing/randomization_functions.c @@ -19,7 +19,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" static const uint32_t kMaxSeedUsed = 0x80000000; diff --git a/common_audio/signal_processing/real_fft.c b/common_audio/signal_processing/real_fft.c index 92daae4d38..780e517a15 100644 --- a/common_audio/signal_processing/real_fft.c +++ b/common_audio/signal_processing/real_fft.c @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/real_fft.h" +#include "common_audio/signal_processing/include/real_fft.h" #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" struct RealFFT { int order; diff --git a/common_audio/signal_processing/real_fft_unittest.cc b/common_audio/signal_processing/real_fft_unittest.cc index fcf11d73c8..888f5ed8ee 100644 --- a/common_audio/signal_processing/real_fft_unittest.cc +++ b/common_audio/signal_processing/real_fft_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/real_fft.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/common_audio/signal_processing/refl_coef_to_lpc.c b/common_audio/signal_processing/refl_coef_to_lpc.c index 06a29b6632..b0858b2b0e 100644 --- a/common_audio/signal_processing/refl_coef_to_lpc.c +++ b/common_audio/signal_processing/refl_coef_to_lpc.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_ReflCoefToLpc(const int16_t *k, int use_order, int16_t *a) { diff --git a/common_audio/signal_processing/resample.c b/common_audio/signal_processing/resample.c index 45fe52aa98..d4b2736476 100644 --- a/common_audio/signal_processing/resample.c +++ b/common_audio/signal_processing/resample.c @@ -15,8 +15,8 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/signal_processing/resample_by_2_internal.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/resample_by_2_internal.h" // Declaration of internally used functions static void WebRtcSpl_32khzTo22khzIntToShort(const int32_t *In, int16_t *Out, diff --git a/common_audio/signal_processing/resample_48khz.c b/common_audio/signal_processing/resample_48khz.c index 2220cc3331..8518e7b1ce 100644 --- a/common_audio/signal_processing/resample_48khz.c +++ b/common_audio/signal_processing/resample_48khz.c @@ -16,8 +16,8 @@ */ #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/signal_processing/resample_by_2_internal.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/resample_by_2_internal.h" //////////////////////////// ///// 48 kHz -> 16 kHz ///// diff --git a/common_audio/signal_processing/resample_by_2.c b/common_audio/signal_processing/resample_by_2.c index dcba82e35f..12f574712a 100644 --- a/common_audio/signal_processing/resample_by_2.c +++ b/common_audio/signal_processing/resample_by_2.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #ifdef WEBRTC_ARCH_ARM_V7 diff --git a/common_audio/signal_processing/resample_by_2_internal.c b/common_audio/signal_processing/resample_by_2_internal.c index 72bc0f92b1..99592b20b5 100644 --- a/common_audio/signal_processing/resample_by_2_internal.c +++ b/common_audio/signal_processing/resample_by_2_internal.c @@ -14,8 +14,8 @@ * */ -#include "webrtc/common_audio/signal_processing/resample_by_2_internal.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "common_audio/signal_processing/resample_by_2_internal.h" +#include "rtc_base/sanitizer.h" // allpass filter coefficients. static const int16_t kResampleAllpass[2][3] = { diff --git a/common_audio/signal_processing/resample_by_2_internal.h b/common_audio/signal_processing/resample_by_2_internal.h index d0954e5944..827c11c424 100644 --- a/common_audio/signal_processing/resample_by_2_internal.h +++ b/common_audio/signal_processing/resample_by_2_internal.h @@ -14,10 +14,10 @@ * */ -#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ -#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ +#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ +#define COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /******************************************************************* * resample_by_2_fast.c @@ -44,4 +44,4 @@ void WebRtcSpl_LPBy2ShortToInt(const int16_t* in, int32_t len, void WebRtcSpl_LPBy2IntToInt(const int32_t* in, int32_t len, int32_t* out, int32_t* state); -#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ +#endif // COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ diff --git a/common_audio/signal_processing/resample_by_2_mips.c b/common_audio/signal_processing/resample_by_2_mips.c index 7885bead34..f41bab7519 100644 --- a/common_audio/signal_processing/resample_by_2_mips.c +++ b/common_audio/signal_processing/resample_by_2_mips.c @@ -17,7 +17,7 @@ #if defined(MIPS32_LE) -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" #if !defined(MIPS_DSP_R2_LE) // allpass filter coefficients. diff --git a/common_audio/signal_processing/resample_fractional.c b/common_audio/signal_processing/resample_fractional.c index 6409fbac47..9ffe0aca60 100644 --- a/common_audio/signal_processing/resample_fractional.c +++ b/common_audio/signal_processing/resample_fractional.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // interpolation coefficients static const int16_t kCoefficients48To32[2][8] = { diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 52c4390c44..b9efe01fe7 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/test/gtest.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "test/gtest.h" static const size_t kVector16Size = 9; static const int16_t vector16[kVector16Size] = {1, -15511, 4323, 1963, diff --git a/common_audio/signal_processing/spl_init.c b/common_audio/signal_processing/spl_init.c index c9c4e659cf..0f41bc1321 100644 --- a/common_audio/signal_processing/spl_init.c +++ b/common_audio/signal_processing/spl_init.c @@ -14,8 +14,8 @@ * Some code came from common/rtcd.c in the WebM project. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "system_wrappers/include/cpu_features_wrapper.h" /* Declare function pointers. */ MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16; diff --git a/common_audio/signal_processing/spl_inl.c b/common_audio/signal_processing/spl_inl.c index efa6a65f0e..d09e308ed3 100644 --- a/common_audio/signal_processing/spl_inl.c +++ b/common_audio/signal_processing/spl_inl.c @@ -10,7 +10,7 @@ #include -#include "webrtc/common_audio/signal_processing/include/spl_inl.h" +#include "common_audio/signal_processing/include/spl_inl.h" // Table used by WebRtcSpl_CountLeadingZeros32_NotBuiltin. For each uint32_t n // that's a sequence of 0 bits followed by a sequence of 1 bits, the entry at diff --git a/common_audio/signal_processing/spl_sqrt.c b/common_audio/signal_processing/spl_sqrt.c index f79ac9fa63..cf9448ac97 100644 --- a/common_audio/signal_processing/spl_sqrt.c +++ b/common_audio/signal_processing/spl_sqrt.c @@ -15,8 +15,8 @@ * */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" int32_t WebRtcSpl_SqrtLocal(int32_t in); diff --git a/common_audio/signal_processing/spl_sqrt_floor.c b/common_audio/signal_processing/spl_sqrt_floor.c index 370307a08f..714138696b 100644 --- a/common_audio/signal_processing/spl_sqrt_floor.c +++ b/common_audio/signal_processing/spl_sqrt_floor.c @@ -28,7 +28,7 @@ // Minor modifications in code style for WebRTC, 2012. -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" /* * Algorithm: diff --git a/common_audio/signal_processing/spl_sqrt_floor_arm.S b/common_audio/signal_processing/spl_sqrt_floor_arm.S index 72cd2d9a0a..29e6d4d455 100644 --- a/common_audio/signal_processing/spl_sqrt_floor_arm.S +++ b/common_audio/signal_processing/spl_sqrt_floor_arm.S @@ -32,7 +32,7 @@ @ Output: r0 = INT (SQRT (r0)), precision is 16 bits @ Registers touched: r1, r2 -#include "webrtc/system_wrappers/include/asm_defines.h" +#include "system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_SqrtFloor .align 2 diff --git a/common_audio/signal_processing/spl_sqrt_floor_mips.c b/common_audio/signal_processing/spl_sqrt_floor_mips.c index 8716459b1d..7128fbd381 100644 --- a/common_audio/signal_processing/spl_sqrt_floor_mips.c +++ b/common_audio/signal_processing/spl_sqrt_floor_mips.c @@ -29,7 +29,7 @@ // Minor modifications in code style for WebRTC, 2012. // Code optimizations for MIPS, 2013. -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" /* * Algorithm: diff --git a/common_audio/signal_processing/splitting_filter.c b/common_audio/signal_processing/splitting_filter.c index 4a179a813e..399433f0fb 100644 --- a/common_audio/signal_processing/splitting_filter.c +++ b/common_audio/signal_processing/splitting_filter.c @@ -13,8 +13,8 @@ * */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" // Maximum number of samples in a low/high-band frame. enum diff --git a/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c b/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c index ff78b5228f..a77fd4063f 100644 --- a/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c +++ b/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c @@ -15,7 +15,7 @@ * */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_SqrtOfOneMinusXSquared(int16_t *xQ15, size_t vector_length, int16_t *yQ15) diff --git a/common_audio/signal_processing/vector_scaling_operations.c b/common_audio/signal_processing/vector_scaling_operations.c index e1f391d10a..7307dc78ff 100644 --- a/common_audio/signal_processing/vector_scaling_operations.c +++ b/common_audio/signal_processing/vector_scaling_operations.c @@ -20,7 +20,7 @@ * WebRtcSpl_ScaleAndAddVectorsWithRoundC() */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" void WebRtcSpl_VectorBitShiftW16(int16_t *res, size_t length, const int16_t *in, int16_t right_shifts) diff --git a/common_audio/signal_processing/vector_scaling_operations_mips.c b/common_audio/signal_processing/vector_scaling_operations_mips.c index dd73eeaebb..ba2d26d422 100644 --- a/common_audio/signal_processing/vector_scaling_operations_mips.c +++ b/common_audio/signal_processing/vector_scaling_operations_mips.c @@ -14,7 +14,7 @@ * WebRtcSpl_ScaleAndAddVectorsWithRound_mips() */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" int WebRtcSpl_ScaleAndAddVectorsWithRound_mips(const int16_t* in_vector1, int16_t in_vector1_scale, diff --git a/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc index d95662ca18..41085a4760 100644 --- a/common_audio/smoothing_filter.cc +++ b/common_audio/smoothing_filter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/smoothing_filter.h" +#include "common_audio/smoothing_filter.h" #include -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/common_audio/smoothing_filter.h b/common_audio/smoothing_filter.h index 15ea3d1e55..b8ab4e5919 100644 --- a/common_audio/smoothing_filter.h +++ b/common_audio/smoothing_filter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_ -#define WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_ +#ifndef COMMON_AUDIO_SMOOTHING_FILTER_H_ +#define COMMON_AUDIO_SMOOTHING_FILTER_H_ -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/optional.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -69,4 +69,4 @@ class SmoothingFilterImpl final : public SmoothingFilter { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_ +#endif // COMMON_AUDIO_SMOOTHING_FILTER_H_ diff --git a/common_audio/smoothing_filter_unittest.cc b/common_audio/smoothing_filter_unittest.cc index 6e0bde85cb..9d93d6d4a5 100644 --- a/common_audio/smoothing_filter_unittest.cc +++ b/common_audio/smoothing_filter_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/common_audio/smoothing_filter.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/gtest.h" +#include "common_audio/smoothing_filter.h" +#include "rtc_base/fakeclock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/sparse_fir_filter.cc b/common_audio/sparse_fir_filter.cc index 299028f1ff..ed2d79bbe1 100644 --- a/common_audio/sparse_fir_filter.cc +++ b/common_audio/sparse_fir_filter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/sparse_fir_filter.h" +#include "common_audio/sparse_fir_filter.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/sparse_fir_filter.h b/common_audio/sparse_fir_filter.h index 6bc5528b5d..22bcdff788 100644 --- a/common_audio/sparse_fir_filter.h +++ b/common_audio/sparse_fir_filter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_SPARSE_FIR_FILTER_H_ -#define WEBRTC_COMMON_AUDIO_SPARSE_FIR_FILTER_H_ +#ifndef COMMON_AUDIO_SPARSE_FIR_FILTER_H_ +#define COMMON_AUDIO_SPARSE_FIR_FILTER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -50,4 +50,4 @@ class SparseFIRFilter final { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_SPARSE_FIR_FILTER_H_ +#endif // COMMON_AUDIO_SPARSE_FIR_FILTER_H_ diff --git a/common_audio/sparse_fir_filter_unittest.cc b/common_audio/sparse_fir_filter_unittest.cc index a000596c34..485788e5a4 100644 --- a/common_audio/sparse_fir_filter_unittest.cc +++ b/common_audio/sparse_fir_filter_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/common_audio/sparse_fir_filter.h" +#include "common_audio/sparse_fir_filter.h" -#include "webrtc/common_audio/fir_filter.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "common_audio/fir_filter.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/common_audio/vad/include/vad.h b/common_audio/vad/include/vad.h index ed649f5c48..4b0dbd8107 100644 --- a/common_audio/vad/include/vad.h +++ b/common_audio/vad/include/vad.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_INCLUDE_VAD_H_ -#define WEBRTC_COMMON_AUDIO_VAD_INCLUDE_VAD_H_ +#ifndef COMMON_AUDIO_VAD_INCLUDE_VAD_H_ +#define COMMON_AUDIO_VAD_INCLUDE_VAD_H_ #include -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { @@ -48,4 +48,4 @@ std::unique_ptr CreateVad(Vad::Aggressiveness aggressiveness); } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_VAD_INCLUDE_VAD_H_ +#endif // COMMON_AUDIO_VAD_INCLUDE_VAD_H_ diff --git a/common_audio/vad/include/webrtc_vad.h b/common_audio/vad/include/webrtc_vad.h index 7c11b12964..a84130cac5 100644 --- a/common_audio/vad/include/webrtc_vad.h +++ b/common_audio/vad/include/webrtc_vad.h @@ -13,12 +13,12 @@ * This header file includes the VAD API calls. Specific function calls are given below. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ // NOLINT -#define WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ +#ifndef COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ // NOLINT +#define COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" typedef struct WebRtcVadInst VadInst; @@ -83,4 +83,4 @@ int WebRtcVad_ValidRateAndFrameLength(int rate, size_t frame_length); } #endif -#endif // WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ // NOLINT +#endif // COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ // NOLINT diff --git a/common_audio/vad/mock/mock_vad.h b/common_audio/vad/mock/mock_vad.h index 09109e6f8a..afe80ef5e1 100644 --- a/common_audio/vad/mock/mock_vad.h +++ b/common_audio/vad/mock/mock_vad.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ -#define WEBRTC_COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ +#ifndef COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ +#define COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ -#include "webrtc/common_audio/vad/include/vad.h" -#include "webrtc/test/gmock.h" +#include "common_audio/vad/include/vad.h" +#include "test/gmock.h" namespace webrtc { @@ -30,4 +30,4 @@ class MockVad : public Vad { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ +#endif // COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_ diff --git a/common_audio/vad/vad.cc b/common_audio/vad/vad.cc index 5f3443e6f5..1cb332a61d 100644 --- a/common_audio/vad/vad.cc +++ b/common_audio/vad/vad.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/include/vad.h" +#include "common_audio/vad/include/vad.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/vad/vad_core.c b/common_audio/vad/vad_core.c index be517ef1c5..d12cc3c159 100644 --- a/common_audio/vad/vad_core.c +++ b/common_audio/vad/vad_core.c @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_core.h" +#include "common_audio/vad/vad_core.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/vad/vad_filterbank.h" -#include "webrtc/common_audio/vad/vad_gmm.h" -#include "webrtc/common_audio/vad/vad_sp.h" -#include "webrtc/typedefs.h" +#include "rtc_base/sanitizer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/vad/vad_filterbank.h" +#include "common_audio/vad/vad_gmm.h" +#include "common_audio/vad/vad_sp.h" +#include "typedefs.h" // Spectrum Weighting static const int16_t kSpectrumWeight[kNumChannels] = { 6, 8, 10, 12, 14, 16 }; diff --git a/common_audio/vad/vad_core.h b/common_audio/vad/vad_core.h index 47e2d8843e..72895aa5e2 100644 --- a/common_audio/vad/vad_core.h +++ b/common_audio/vad/vad_core.h @@ -13,11 +13,11 @@ * This header file includes the descriptions of the core VAD calls. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_VAD_CORE_H_ -#define WEBRTC_COMMON_AUDIO_VAD_VAD_CORE_H_ +#ifndef COMMON_AUDIO_VAD_VAD_CORE_H_ +#define COMMON_AUDIO_VAD_VAD_CORE_H_ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "typedefs.h" enum { kNumChannels = 6 }; // Number of frequency bands (named channels). enum { kNumGaussians = 2 }; // Number of Gaussians per channel in the GMM. @@ -109,4 +109,4 @@ int WebRtcVad_CalcVad16khz(VadInstT* inst, const int16_t* speech_frame, int WebRtcVad_CalcVad8khz(VadInstT* inst, const int16_t* speech_frame, size_t frame_length); -#endif // WEBRTC_COMMON_AUDIO_VAD_VAD_CORE_H_ +#endif // COMMON_AUDIO_VAD_VAD_CORE_H_ diff --git a/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc index d922010092..3cfff5645d 100644 --- a/common_audio/vad/vad_core_unittest.cc +++ b/common_audio/vad/vad_core_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/common_audio/vad/vad_unittest.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_unittest.h" +#include "test/gtest.h" +#include "typedefs.h" extern "C" { -#include "webrtc/common_audio/vad/vad_core.h" +#include "common_audio/vad/vad_core.h" } namespace webrtc { diff --git a/common_audio/vad/vad_filterbank.c b/common_audio/vad/vad_filterbank.c index 6aee7b7b4c..2b8970c332 100644 --- a/common_audio/vad/vad_filterbank.c +++ b/common_audio/vad/vad_filterbank.c @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_filterbank.h" +#include "common_audio/vad/vad_filterbank.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "typedefs.h" // Constants used in LogOfEnergy(). static const int16_t kLogConst = 24660; // 160*log10(2) in Q9. diff --git a/common_audio/vad/vad_filterbank.h b/common_audio/vad/vad_filterbank.h index 42bf3fc331..3235945fbd 100644 --- a/common_audio/vad/vad_filterbank.h +++ b/common_audio/vad/vad_filterbank.h @@ -12,11 +12,11 @@ * This file includes feature calculating functionality used in vad_core.c. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ -#define WEBRTC_COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ +#ifndef COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ +#define COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_core.h" +#include "typedefs.h" // Takes |data_length| samples of |data_in| and calculates the logarithm of the // energy of each of the |kNumChannels| = 6 frequency bands used by the VAD: @@ -41,4 +41,4 @@ int16_t WebRtcVad_CalculateFeatures(VadInstT* self, const int16_t* data_in, size_t data_length, int16_t* features); -#endif // WEBRTC_COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ +#endif // COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ diff --git a/common_audio/vad/vad_filterbank_unittest.cc b/common_audio/vad/vad_filterbank_unittest.cc index d15fc1b487..ad2be5e613 100644 --- a/common_audio/vad/vad_filterbank_unittest.cc +++ b/common_audio/vad/vad_filterbank_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/common_audio/vad/vad_unittest.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_unittest.h" +#include "test/gtest.h" +#include "typedefs.h" extern "C" { -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/common_audio/vad/vad_filterbank.h" +#include "common_audio/vad/vad_core.h" +#include "common_audio/vad/vad_filterbank.h" } namespace webrtc { diff --git a/common_audio/vad/vad_gmm.c b/common_audio/vad/vad_gmm.c index 4a014401d9..642d3d91d0 100644 --- a/common_audio/vad/vad_gmm.c +++ b/common_audio/vad/vad_gmm.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_gmm.h" +#include "common_audio/vad/vad_gmm.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "typedefs.h" static const int32_t kCompVar = 22005; static const int16_t kLog2Exp = 5909; // log2(exp(1)) in Q12. diff --git a/common_audio/vad/vad_gmm.h b/common_audio/vad/vad_gmm.h index 992a156050..0a7f9b23c9 100644 --- a/common_audio/vad/vad_gmm.h +++ b/common_audio/vad/vad_gmm.h @@ -10,10 +10,10 @@ // Gaussian probability calculations internally used in vad_core.c. -#ifndef WEBRTC_COMMON_AUDIO_VAD_VAD_GMM_H_ -#define WEBRTC_COMMON_AUDIO_VAD_VAD_GMM_H_ +#ifndef COMMON_AUDIO_VAD_VAD_GMM_H_ +#define COMMON_AUDIO_VAD_VAD_GMM_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // Calculates the probability for |input|, given that |input| comes from a // normal distribution with mean and standard deviation (|mean|, |std|). @@ -36,4 +36,4 @@ int32_t WebRtcVad_GaussianProbability(int16_t input, int16_t std, int16_t* delta); -#endif // WEBRTC_COMMON_AUDIO_VAD_VAD_GMM_H_ +#endif // COMMON_AUDIO_VAD_VAD_GMM_H_ diff --git a/common_audio/vad/vad_gmm_unittest.cc b/common_audio/vad/vad_gmm_unittest.cc index 7d95111846..005c79e019 100644 --- a/common_audio/vad/vad_gmm_unittest.cc +++ b/common_audio/vad/vad_gmm_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_unittest.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_unittest.h" +#include "test/gtest.h" +#include "typedefs.h" extern "C" { -#include "webrtc/common_audio/vad/vad_gmm.h" +#include "common_audio/vad/vad_gmm.h" } namespace webrtc { diff --git a/common_audio/vad/vad_sp.c b/common_audio/vad/vad_sp.c index 4191c03e0f..28cd40ab2a 100644 --- a/common_audio/vad/vad_sp.c +++ b/common_audio/vad/vad_sp.c @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_sp.h" +#include "common_audio/vad/vad_sp.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/vad/vad_core.h" +#include "typedefs.h" // Allpass filter coefficients, upper and lower, in Q13. // Upper: 0.64, Lower: 0.17. diff --git a/common_audio/vad/vad_sp.h b/common_audio/vad/vad_sp.h index 4d2b02a1ef..611de7b507 100644 --- a/common_audio/vad/vad_sp.h +++ b/common_audio/vad/vad_sp.h @@ -11,11 +11,11 @@ // This file includes specific signal processing tools used in vad_core.c. -#ifndef WEBRTC_COMMON_AUDIO_VAD_VAD_SP_H_ -#define WEBRTC_COMMON_AUDIO_VAD_VAD_SP_H_ +#ifndef COMMON_AUDIO_VAD_VAD_SP_H_ +#define COMMON_AUDIO_VAD_VAD_SP_H_ -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_core.h" +#include "typedefs.h" // Downsamples the signal by a factor 2, eg. 32->16 or 16->8. // @@ -53,4 +53,4 @@ int16_t WebRtcVad_FindMinimum(VadInstT* handle, int16_t feature_value, int channel); -#endif // WEBRTC_COMMON_AUDIO_VAD_VAD_SP_H_ +#endif // COMMON_AUDIO_VAD_VAD_SP_H_ diff --git a/common_audio/vad/vad_sp_unittest.cc b/common_audio/vad/vad_sp_unittest.cc index e8413086d3..3a0d1aceb2 100644 --- a/common_audio/vad/vad_sp_unittest.cc +++ b/common_audio/vad/vad_sp_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/common_audio/vad/vad_unittest.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/vad/vad_unittest.h" +#include "test/gtest.h" +#include "typedefs.h" extern "C" { -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/common_audio/vad/vad_sp.h" +#include "common_audio/vad/vad_core.h" +#include "common_audio/vad/vad_sp.h" } namespace webrtc { diff --git a/common_audio/vad/vad_unittest.cc b/common_audio/vad/vad_unittest.cc index 69d6a7b345..282f3cd2bd 100644 --- a/common_audio/vad/vad_unittest.cc +++ b/common_audio/vad/vad_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/vad_unittest.h" +#include "common_audio/vad/vad_unittest.h" #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" +#include "typedefs.h" VadTest::VadTest() {} diff --git a/common_audio/vad/vad_unittest.h b/common_audio/vad/vad_unittest.h index 7edf585571..8de663341e 100644 --- a/common_audio/vad/vad_unittest.h +++ b/common_audio/vad/vad_unittest.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_VAD_VAD_UNITTEST_H_ -#define WEBRTC_COMMON_AUDIO_VAD_VAD_UNITTEST_H_ +#ifndef COMMON_AUDIO_VAD_VAD_UNITTEST_H_ +#define COMMON_AUDIO_VAD_VAD_UNITTEST_H_ #include // size_t -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -46,4 +46,4 @@ class VadTest : public ::testing::Test { bool ValidRatesAndFrameLengths(int rate, size_t frame_length); }; -#endif // WEBRTC_COMMON_AUDIO_VAD_VAD_UNITTEST_H_ +#endif // COMMON_AUDIO_VAD_VAD_UNITTEST_H_ diff --git a/common_audio/vad/webrtc_vad.c b/common_audio/vad/webrtc_vad.c index 80c8f3c88d..1b269631c9 100644 --- a/common_audio/vad/webrtc_vad.c +++ b/common_audio/vad/webrtc_vad.c @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/vad/include/webrtc_vad.h" +#include "common_audio/vad/include/webrtc_vad.h" #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/vad/vad_core.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/vad/vad_core.h" +#include "typedefs.h" static const int kInitCheck = 42; static const int kValidRates[] = { 8000, 16000, 32000, 48000 }; diff --git a/common_audio/wav_file.cc b/common_audio/wav_file.cc index 3b1b9eef6c..48dff3bd3e 100644 --- a/common_audio/wav_file.cc +++ b/common_audio/wav_file.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/wav_file.h" +#include "common_audio/wav_file.h" #include #include #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/wav_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/wav_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/common_audio/wav_file.h b/common_audio/wav_file.h index 1ec6c65449..f7afe9239c 100644 --- a/common_audio/wav_file.h +++ b/common_audio/wav_file.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_WAV_FILE_H_ -#define WEBRTC_COMMON_AUDIO_WAV_FILE_H_ +#ifndef COMMON_AUDIO_WAV_FILE_H_ +#define COMMON_AUDIO_WAV_FILE_H_ #ifdef __cplusplus @@ -17,7 +17,7 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -115,4 +115,4 @@ size_t rtc_WavNumSamples(const rtc_WavWriter* wf); } // extern "C" #endif -#endif // WEBRTC_COMMON_AUDIO_WAV_FILE_H_ +#endif // COMMON_AUDIO_WAV_FILE_H_ diff --git a/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc index 0868fa6099..7113b47c75 100644 --- a/common_audio/wav_file_unittest.cc +++ b/common_audio/wav_file_unittest.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/common_audio/wav_header.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/wav_file.h" +#include "common_audio/wav_header.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/common_audio/wav_header.cc b/common_audio/wav_header.cc index 0423c089c5..a57e917249 100644 --- a/common_audio/wav_header.cc +++ b/common_audio/wav_header.cc @@ -12,15 +12,15 @@ // https://ccrma.stanford.edu/courses/422/projects/WaveFormat/ and // http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html -#include "webrtc/common_audio/wav_header.h" +#include "common_audio/wav_header.h" #include #include #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/include/audio_util.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/common_audio/wav_header.h b/common_audio/wav_header.h index 6844306941..2295fbe6ad 100644 --- a/common_audio/wav_header.h +++ b/common_audio/wav_header.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_WAV_HEADER_H_ -#define WEBRTC_COMMON_AUDIO_WAV_HEADER_H_ +#ifndef COMMON_AUDIO_WAV_HEADER_H_ +#define COMMON_AUDIO_WAV_HEADER_H_ #include #include @@ -61,4 +61,4 @@ bool ReadWavHeader(ReadableWav* readable, } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_WAV_HEADER_H_ +#endif // COMMON_AUDIO_WAV_HEADER_H_ diff --git a/common_audio/wav_header_unittest.cc b/common_audio/wav_header_unittest.cc index 17ebf8288a..c6f605f729 100644 --- a/common_audio/wav_header_unittest.cc +++ b/common_audio/wav_header_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/common_audio/wav_header.h" -#include "webrtc/test/gtest.h" +#include "common_audio/wav_header.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_audio/window_generator.cc b/common_audio/window_generator.cc index ea5198a360..823d2b7387 100644 --- a/common_audio/window_generator.cc +++ b/common_audio/window_generator.cc @@ -10,12 +10,12 @@ #define _USE_MATH_DEFINES -#include "webrtc/common_audio/window_generator.h" +#include "common_audio/window_generator.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" using std::complex; diff --git a/common_audio/window_generator.h b/common_audio/window_generator.h index 3bbf21a8d0..5fc738eaf0 100644 --- a/common_audio/window_generator.h +++ b/common_audio/window_generator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_AUDIO_WINDOW_GENERATOR_H_ -#define WEBRTC_COMMON_AUDIO_WINDOW_GENERATOR_H_ +#ifndef COMMON_AUDIO_WINDOW_GENERATOR_H_ +#define COMMON_AUDIO_WINDOW_GENERATOR_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -29,5 +29,5 @@ class WindowGenerator { } // namespace webrtc -#endif // WEBRTC_COMMON_AUDIO_WINDOW_GENERATOR_H_ +#endif // COMMON_AUDIO_WINDOW_GENERATOR_H_ diff --git a/common_audio/window_generator_unittest.cc b/common_audio/window_generator_unittest.cc index d0d2903a68..b2089d471a 100644 --- a/common_audio/window_generator_unittest.cc +++ b/common_audio/window_generator_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/window_generator.h" +#include "common_audio/window_generator.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_types.cc b/common_types.cc index 7a27fcb91a..be8be16d45 100644 --- a/common_types.cc +++ b/common_types.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_types.h" +#include "common_types.h" #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/stringutils.h" namespace webrtc { diff --git a/common_types.h b/common_types.h index 9ad5165882..db6f0ccf1f 100644 --- a/common_types.h +++ b/common_types.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_TYPES_H_ -#define WEBRTC_COMMON_TYPES_H_ +#ifndef COMMON_TYPES_H_ +#define COMMON_TYPES_H_ #include #include @@ -17,14 +17,14 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_content_type.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/video/video_timing.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "api/video/video_content_type.h" +#include "api/video/video_rotation.h" +#include "api/video/video_timing.h" +#include "rtc_base/checks.h" +#include "rtc_base/deprecation.h" +#include "typedefs.h" #if defined(_MSC_VER) // Disable "new behavior: elements of array will be default initialized" @@ -972,4 +972,4 @@ struct RtpKeepAliveConfig final { } // namespace webrtc -#endif // WEBRTC_COMMON_TYPES_H_ +#endif // COMMON_TYPES_H_ diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index f0e262f23b..2f58dca131 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -78,7 +78,7 @@ rtc_static_library("common_video") { } if (rtc_include_tests) { - common_video_resources = [ "../../resources/foreman_cif.yuv" ] + common_video_resources = [ "../resources/foreman_cif.yuv" ] if (is_ios) { bundle_data("common_video_unittests_bundle_data") { diff --git a/common_video/DEPS b/common_video/DEPS index 0044419e62..53a8271768 100644 --- a/common_video/DEPS +++ b/common_video/DEPS @@ -1,6 +1,6 @@ include_rules = [ - "+webrtc/media/base", - "+webrtc/system_wrappers", + "+media/base", + "+system_wrappers", # TODO(magjed): This is temporary, remove once external clients are updated. - "+webrtc/sdk/objc", + "+sdk/objc", ] diff --git a/common_video/bitrate_adjuster.cc b/common_video/bitrate_adjuster.cc index 7f58ec973c..56f0a3c758 100644 --- a/common_video/bitrate_adjuster.cc +++ b/common_video/bitrate_adjuster.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/bitrate_adjuster.h" +#include "common_video/include/bitrate_adjuster.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc index b6152ac844..b75f184cf2 100644 --- a/common_video/bitrate_adjuster_unittest.cc +++ b/common_video/bitrate_adjuster_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/bitrate_adjuster.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "common_video/include/bitrate_adjuster.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc index 4661687cff..3bf81a06c2 100644 --- a/common_video/h264/h264_bitstream_parser.cc +++ b/common_video/h264/h264_bitstream_parser.cc @@ -7,16 +7,16 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/h264_bitstream_parser.h" +#include "common_video/h264/h264_bitstream_parser.h" #include #include -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/checks.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/h264/h264_common.h" +#include "rtc_base/logging.h" namespace { const int kMaxAbsQpDeltaValue = 51; diff --git a/common_video/h264/h264_bitstream_parser.h b/common_video/h264/h264_bitstream_parser.h index 145700f509..4ef6b40b44 100644 --- a/common_video/h264/h264_bitstream_parser.h +++ b/common_video/h264/h264_bitstream_parser.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ -#define WEBRTC_COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ +#ifndef COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ +#define COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_video/h264/pps_parser.h" -#include "webrtc/common_video/h264/sps_parser.h" +#include "api/optional.h" +#include "common_video/h264/pps_parser.h" +#include "common_video/h264/sps_parser.h" namespace rtc { class BitBufferWriter; @@ -62,4 +62,4 @@ class H264BitstreamParser { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ +#endif // COMMON_VIDEO_H264_H264_BITSTREAM_PARSER_H_ diff --git a/common_video/h264/h264_bitstream_parser_unittest.cc b/common_video/h264/h264_bitstream_parser_unittest.cc index e2b5f4c65d..3bfbdb2704 100644 --- a/common_video/h264/h264_bitstream_parser_unittest.cc +++ b/common_video/h264/h264_bitstream_parser_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/h264_bitstream_parser.h" +#include "common_video/h264/h264_bitstream_parser.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/h264/h264_common.cc b/common_video/h264/h264_common.cc index b9e7d6757e..60ed94d403 100644 --- a/common_video/h264/h264_common.cc +++ b/common_video/h264/h264_common.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/h264_common.h" +#include "common_video/h264/h264_common.h" namespace webrtc { namespace H264 { diff --git a/common_video/h264/h264_common.h b/common_video/h264/h264_common.h index fc3448497b..a58a9f55a5 100644 --- a/common_video/h264/h264_common.h +++ b/common_video/h264/h264_common.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_H264_H264_COMMON_H_ -#define WEBRTC_COMMON_VIDEO_H264_H264_COMMON_H_ +#ifndef COMMON_VIDEO_H264_H264_COMMON_H_ +#define COMMON_VIDEO_H264_H264_COMMON_H_ #include #include -#include "webrtc/rtc_base/buffer.h" +#include "rtc_base/buffer.h" namespace webrtc { @@ -85,4 +85,4 @@ void WriteRbsp(const uint8_t* bytes, size_t length, rtc::Buffer* destination); } // namespace H264 } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_H264_H264_COMMON_H_ +#endif // COMMON_VIDEO_H264_H264_COMMON_H_ diff --git a/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc index 0df0289bdd..03be307f03 100644 --- a/common_video/h264/pps_parser.cc +++ b/common_video/h264/pps_parser.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/pps_parser.h" +#include "common_video/h264/pps_parser.h" #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/h264/h264_common.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/logging.h" #define RETURN_EMPTY_ON_FAIL(x) \ if (!(x)) { \ diff --git a/common_video/h264/pps_parser.h b/common_video/h264/pps_parser.h index b981d22a3b..571af9773a 100644 --- a/common_video/h264/pps_parser.h +++ b/common_video/h264/pps_parser.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ -#define WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ +#ifndef COMMON_VIDEO_H264_PPS_PARSER_H_ +#define COMMON_VIDEO_H264_PPS_PARSER_H_ -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace rtc { class BitBuffer; @@ -59,4 +59,4 @@ class PpsParser { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ +#endif // COMMON_VIDEO_H264_PPS_PARSER_H_ diff --git a/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc index 886808aa8e..14a425f6c4 100644 --- a/common_video/h264/pps_parser_unittest.cc +++ b/common_video/h264/pps_parser_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/pps_parser.h" +#include "common_video/h264/pps_parser.h" #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/test/gtest.h" +#include "common_video/h264/h264_common.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/h264/profile_level_id.h b/common_video/h264/profile_level_id.h index a13fa4b754..07b49e57c7 100644 --- a/common_video/h264/profile_level_id.h +++ b/common_video/h264/profile_level_id.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ -#define WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ +#ifndef COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ +#define COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ -#include "webrtc/media/base/h264_profile_level_id.h" +#include "media/base/h264_profile_level_id.h" // TODO(zhihuang): Delete this file once dependent applications switch to // including "webrtc/media/base/h264_profile_level_id.h" directly. -#endif // WEBRTC_COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ +#endif // COMMON_VIDEO_H264_PROFILE_LEVEL_ID_H_ diff --git a/common_video/h264/profile_level_id_unittest.cc b/common_video/h264/profile_level_id_unittest.cc index 38a84d576e..d7b7cfb351 100644 --- a/common_video/h264/profile_level_id_unittest.cc +++ b/common_video/h264/profile_level_id_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/profile_level_id.h" +#include "common_video/h264/profile_level_id.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace H264 { diff --git a/common_video/h264/sps_parser.cc b/common_video/h264/sps_parser.cc index fbf7ee7794..e2a759c3de 100644 --- a/common_video/h264/sps_parser.cc +++ b/common_video/h264/sps_parser.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/sps_parser.h" +#include "common_video/h264/sps_parser.h" #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/h264/h264_common.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/logging.h" typedef rtc::Optional OptionalSps; diff --git a/common_video/h264/sps_parser.h b/common_video/h264/sps_parser.h index 77ad25d83f..0ccc481356 100644 --- a/common_video/h264/sps_parser.h +++ b/common_video/h264/sps_parser.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_ -#define WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_ +#ifndef COMMON_VIDEO_H264_SPS_PARSER_H_ +#define COMMON_VIDEO_H264_SPS_PARSER_H_ -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace rtc { class BitBuffer; @@ -50,4 +50,4 @@ class SpsParser { }; } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_ +#endif // COMMON_VIDEO_H264_SPS_PARSER_H_ diff --git a/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc index 5a0df9a1b0..e982449c88 100644 --- a/common_video/h264/sps_parser_unittest.cc +++ b/common_video/h264/sps_parser_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/h264/sps_parser.h" +#include "common_video/h264/sps_parser.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/test/gtest.h" +#include "common_video/h264/h264_common.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc index 1d1b76e8fc..0c31428a3d 100644 --- a/common_video/h264/sps_vui_rewriter.cc +++ b/common_video/h264/sps_vui_rewriter.cc @@ -9,19 +9,19 @@ * */ -#include "webrtc/common_video/h264/sps_vui_rewriter.h" +#include "common_video/h264/sps_vui_rewriter.h" #include #include #include -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/common_video/h264/sps_parser.h" +#include "common_video/h264/h264_common.h" +#include "common_video/h264/sps_parser.h" namespace webrtc { diff --git a/common_video/h264/sps_vui_rewriter.h b/common_video/h264/sps_vui_rewriter.h index 7875117722..f639c0d893 100644 --- a/common_video/h264/sps_vui_rewriter.h +++ b/common_video/h264/sps_vui_rewriter.h @@ -9,12 +9,12 @@ * */ -#ifndef WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ -#define WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ +#ifndef COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ +#define COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ -#include "webrtc/api/optional.h" -#include "webrtc/common_video/h264/sps_parser.h" -#include "webrtc/rtc_base/buffer.h" +#include "api/optional.h" +#include "common_video/h264/sps_parser.h" +#include "rtc_base/buffer.h" namespace rtc { class BitBuffer; @@ -51,4 +51,4 @@ class SpsVuiRewriter : private SpsParser { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ +#endif // COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ diff --git a/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc index 4f36e58f1d..963bb388ad 100644 --- a/common_video/h264/sps_vui_rewriter_unittest.cc +++ b/common_video/h264/sps_vui_rewriter_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/common_video/h264/sps_vui_rewriter.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/gtest.h" +#include "common_video/h264/h264_common.h" +#include "common_video/h264/sps_vui_rewriter.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/buffer.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/i420_buffer_pool.cc b/common_video/i420_buffer_pool.cc index 8dab614914..48d6512971 100644 --- a/common_video/i420_buffer_pool.cc +++ b/common_video/i420_buffer_pool.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/i420_buffer_pool.h" +#include "common_video/include/i420_buffer_pool.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_video/i420_buffer_pool_unittest.cc b/common_video/i420_buffer_pool_unittest.cc index 77aa0861d3..03845dfa5a 100644 --- a/common_video/i420_buffer_pool_unittest.cc +++ b/common_video/i420_buffer_pool_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/test/gtest.h" +#include "common_video/include/i420_buffer_pool.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/i420_video_frame_unittest.cc b/common_video/i420_video_frame_unittest.cc index 025c54b6ff..7004d9dab1 100644 --- a/common_video/i420_video_frame_unittest.cc +++ b/common_video/i420_video_frame_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/fake_texture_frame.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "rtc_base/bind.h" +#include "rtc_base/timeutils.h" +#include "test/fake_texture_frame.h" +#include "test/frame_utils.h" +#include "test/gtest.h" namespace webrtc { diff --git a/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h index d04486ca0e..fd83555469 100644 --- a/common_video/include/bitrate_adjuster.h +++ b/common_video/include/bitrate_adjuster.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ +#ifndef COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ +#define COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/rate_statistics.h" namespace webrtc { @@ -87,4 +87,4 @@ class BitrateAdjuster { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ +#endif // COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ diff --git a/common_video/include/frame_callback.h b/common_video/include/frame_callback.h index 0a2a905008..06a581d2cb 100644 --- a/common_video/include/frame_callback.h +++ b/common_video/include/frame_callback.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ +#ifndef COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ +#define COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ #include #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -57,4 +57,4 @@ class EncodedFrameObserver { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ +#endif // COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ diff --git a/common_video/include/i420_buffer_pool.h b/common_video/include/i420_buffer_pool.h index 85206ee904..f43a948331 100644 --- a/common_video/include/i420_buffer_pool.h +++ b/common_video/include/i420_buffer_pool.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ +#ifndef COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ +#define COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/rtc_base/race_checker.h" +#include "api/video/i420_buffer.h" +#include "rtc_base/race_checker.h" namespace webrtc { @@ -61,4 +61,4 @@ class I420BufferPool { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ +#endif // COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ diff --git a/common_video/include/incoming_video_stream.h b/common_video/include/incoming_video_stream.h index 927336a8e8..7ae27a96a8 100644 --- a/common_video/include/incoming_video_stream.h +++ b/common_video/include/incoming_video_stream.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ +#ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ +#define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ -#include "webrtc/common_video/video_render_frames.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/task_queue.h" +#include "common_video/video_render_frames.h" +#include "media/base/videosinkinterface.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/task_queue.h" namespace webrtc { @@ -41,4 +41,4 @@ class IncomingVideoStream : public rtc::VideoSinkInterface { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ +#endif // COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ diff --git a/common_video/include/video_bitrate_allocator.h b/common_video/include/video_bitrate_allocator.h index b85879db4b..3bc304dc9c 100644 --- a/common_video/include/video_bitrate_allocator.h +++ b/common_video/include/video_bitrate_allocator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ +#ifndef COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ +#define COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -36,4 +36,4 @@ class VideoBitrateAllocationObserver { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ +#endif // COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ diff --git a/common_video/include/video_frame.h b/common_video/include/video_frame.h index 99e0b8f2a0..f2a5da9fe1 100644 --- a/common_video/include/video_frame.h +++ b/common_video/include/video_frame.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ +#ifndef COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ +#define COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ // TODO(nisse): This header file should eventually be deleted. The // EncodedImage class stays in this file until we have figured out how // to refactor and clean up related interfaces, at which point it // should be moved to somewhere under api/. -#include "webrtc/common_types.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "typedefs.h" namespace webrtc { @@ -80,4 +80,4 @@ class EncodedImage { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ +#endif // COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_ diff --git a/common_video/include/video_frame_buffer.h b/common_video/include/video_frame_buffer.h index cdeb7cd98c..bc9d4f94a4 100644 --- a/common_video/include/video_frame_buffer.h +++ b/common_video/include/video_frame_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ -#define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ +#ifndef COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ +#define COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ #include -#include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/video/video_frame_buffer.h" +#include "rtc_base/callback.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -92,4 +92,4 @@ rtc::scoped_refptr WrapYuvBuffer( } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ +#endif // COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ diff --git a/common_video/incoming_video_stream.cc b/common_video/incoming_video_stream.cc index b1c3191dcc..8e715407ea 100644 --- a/common_video/incoming_video_stream.cc +++ b/common_video/incoming_video_stream.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/incoming_video_stream.h" +#include "common_video/include/incoming_video_stream.h" #include -#include "webrtc/common_video/video_render_frames.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "common_video/video_render_frames.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { namespace { diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h index 13e58d2ae4..64b75803ee 100644 --- a/common_video/libyuv/include/webrtc_libyuv.h +++ b/common_video/libyuv/include/webrtc_libyuv.h @@ -12,15 +12,15 @@ * WebRTC's wrapper to libyuv. */ -#ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ -#define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ +#ifndef COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ +#define COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_types.h" // VideoTypes. -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "common_types.h" // VideoTypes. +#include "typedefs.h" namespace webrtc { @@ -149,4 +149,4 @@ class NV12ToI420Scaler { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ +#endif // COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ diff --git a/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc index 60e45baf81..4e3a1ac885 100644 --- a/common_video/libyuv/libyuv_unittest.cc +++ b/common_video/libyuv/libyuv_unittest.cc @@ -13,13 +13,13 @@ #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "test/frame_utils.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc index 0cb3b04969..4cb8686780 100644 --- a/common_video/libyuv/webrtc_libyuv.cc +++ b/common_video/libyuv/webrtc_libyuv.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // TODO(nisse): Only needed for the deprecated ConvertToI420. -#include "webrtc/api/video/i420_buffer.h" +#include "api/video/i420_buffer.h" // NOTE(ajm): Path provided by gn. #include "libyuv.h" // NOLINT diff --git a/common_video/video_frame.cc b/common_video/video_frame.cc index 8678700e9a..efe553648c 100644 --- a/common_video/video_frame.cc +++ b/common_video/video_frame.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/video_frame.h" +#include "common_video/include/video_frame.h" #include #include // swap -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/common_video/video_frame_buffer.cc b/common_video/video_frame_buffer.cc index f26e627786..19649cf68f 100644 --- a/common_video/video_frame_buffer.cc +++ b/common_video/video_frame_buffer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/include/video_frame_buffer.h" +#include "common_video/include/video_frame_buffer.h" #include @@ -16,8 +16,8 @@ #include "libyuv/convert.h" #include "libyuv/planar_functions.h" #include "libyuv/scale.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "rtc_base/checks.h" +#include "rtc_base/keep_ref_until_done.h" namespace webrtc { diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc index e91c67838d..b6af1b3f17 100644 --- a/common_video/video_render_frames.cc +++ b/common_video/video_render_frames.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/video_render_frames.h" +#include "common_video/video_render_frames.h" #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" namespace webrtc { namespace { diff --git a/common_video/video_render_frames.h b/common_video/video_render_frames.h index fe4d4f0b07..af254f2c63 100644 --- a/common_video/video_render_frames.h +++ b/common_video/video_render_frames.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ -#define WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ +#ifndef COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ +#define COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_frame.h" +#include "api/optional.h" +#include "api/video/video_frame.h" namespace webrtc { @@ -49,4 +49,4 @@ class VideoRenderFrames { } // namespace webrtc -#endif // WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ +#endif // COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 3d49bc3b99..1b03c8fe08 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -153,7 +153,7 @@ if (is_android) { ] data = [ - "../../resources/reference_video_640x360_30fps.y4m", + "../resources/reference_video_640x360_30fps.y4m", ] # TODO(sakal): Fix build hooks crbug.com/webrtc/8148 diff --git a/examples/DEPS b/examples/DEPS index 6c26780e3c..4ade6af105 100644 --- a/examples/DEPS +++ b/examples/DEPS @@ -1,9 +1,9 @@ include_rules = [ "+WebRTC", - "+webrtc/api", - "+webrtc/media", - "+webrtc/modules/audio_device", - "+webrtc/modules/video_capture", - "+webrtc/p2p", - "+webrtc/pc", + "+api", + "+media", + "+modules/audio_device", + "+modules/video_capture", + "+p2p", + "+pc", ] diff --git a/examples/androidtests/gradle_project_test.py b/examples/androidtests/gradle_project_test.py index 1f04960244..0f11752e55 100644 --- a/examples/androidtests/gradle_project_test.py +++ b/examples/androidtests/gradle_project_test.py @@ -62,7 +62,7 @@ def main(): try: _RunCommand([GENERATE_GRADLE_SCRIPT, '--output-directory', output_dir, - '--target', '//webrtc/examples:AppRTCMobile', + '--target', '//examples:AppRTCMobile', '--project-dir', project_dir, '--use-gradle-process-resources', '--split-projects', '--canary']) _RunCommand([GRADLEW_BIN, 'assembleDebug'], project_dir) diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm index b6b4822411..2ec3088a8f 100644 --- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm +++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm @@ -13,7 +13,7 @@ #import #import -#include "webrtc/rtc_base/ssladapter.h" +#include "rtc_base/ssladapter.h" #import "WebRTC/RTCMediaConstraints.h" #import "WebRTC/RTCPeerConnectionFactory.h" diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc index 8a1b9a276e..90feed8f0a 100644 --- a/examples/peerconnection/client/conductor.cc +++ b/examples/peerconnection/client/conductor.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/conductor.h" +#include "examples/peerconnection/client/conductor.h" #include #include #include -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/media/engine/webrtcvideocapturerfactory.h" -#include "webrtc/modules/video_capture/video_capture_factory.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/json.h" -#include "webrtc/rtc_base/logging.h" +#include "api/test/fakeconstraints.h" +#include "examples/peerconnection/client/defaults.h" +#include "media/engine/webrtcvideocapturerfactory.h" +#include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/checks.h" +#include "rtc_base/json.h" +#include "rtc_base/logging.h" // Names used for a IceCandidate JSON object. const char kCandidateSdpMidName[] = "sdpMid"; diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h index 0041a9b2b7..ebd2b6baed 100644 --- a/examples/peerconnection/client/conductor.h +++ b/examples/peerconnection/client/conductor.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ #include #include @@ -17,10 +17,10 @@ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/examples/peerconnection/client/main_wnd.h" -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "examples/peerconnection/client/main_wnd.h" +#include "examples/peerconnection/client/peer_connection_client.h" namespace webrtc { class VideoCaptureModule; @@ -133,4 +133,4 @@ class Conductor std::string server_; }; -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ diff --git a/examples/peerconnection/client/defaults.cc b/examples/peerconnection/client/defaults.cc index ed8cdb1e1c..51732ad484 100644 --- a/examples/peerconnection/client/defaults.cc +++ b/examples/peerconnection/client/defaults.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/defaults.h" +#include "examples/peerconnection/client/defaults.h" #include #include @@ -19,7 +19,7 @@ #include #endif -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" const char kAudioLabel[] = "audio_label"; const char kVideoLabel[] = "video_label"; diff --git a/examples/peerconnection/client/defaults.h b/examples/peerconnection/client/defaults.h index f4527c0a29..c46011e3ea 100644 --- a/examples/peerconnection/client/defaults.h +++ b/examples/peerconnection/client/defaults.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ #include @@ -26,4 +26,4 @@ std::string GetPeerConnectionString(); std::string GetDefaultServerName(); std::string GetPeerName(); -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ diff --git a/examples/peerconnection/client/flagdefs.h b/examples/peerconnection/client/flagdefs.h index f3dda765e5..cc66c6f34a 100644 --- a/examples/peerconnection/client/flagdefs.h +++ b/examples/peerconnection/client/flagdefs.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ -#include "webrtc/rtc_base/flags.h" +#include "rtc_base/flags.h" extern const uint16_t kDefaultServerPort; // From defaults.[h|cc] @@ -29,4 +29,4 @@ DEFINE_bool(autocall, false, "Call the first available other client on " "the server without user intervention. Note: this flag should only be set " "to true on one of the two clients."); -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ diff --git a/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc index d57bc982f4..c074d7c238 100644 --- a/examples/peerconnection/client/linux/main.cc +++ b/examples/peerconnection/client/linux/main.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/examples/peerconnection/client/conductor.h" -#include "webrtc/examples/peerconnection/client/flagdefs.h" -#include "webrtc/examples/peerconnection/client/linux/main_wnd.h" -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" +#include "examples/peerconnection/client/conductor.h" +#include "examples/peerconnection/client/flagdefs.h" +#include "examples/peerconnection/client/linux/main_wnd.h" +#include "examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" class CustomSocketServer : public rtc::PhysicalSocketServer { public: diff --git a/examples/peerconnection/client/linux/main_wnd.cc b/examples/peerconnection/client/linux/main_wnd.cc index d9f32bc52e..d092ba13fb 100644 --- a/examples/peerconnection/client/linux/main_wnd.cc +++ b/examples/peerconnection/client/linux/main_wnd.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/linux/main_wnd.h" +#include "examples/peerconnection/client/linux/main_wnd.h" #include #include #include #include "libyuv/convert_from.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/video/i420_buffer.h" +#include "examples/peerconnection/client/defaults.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" using rtc::sprintfn; diff --git a/examples/peerconnection/client/linux/main_wnd.h b/examples/peerconnection/client/linux/main_wnd.h index 68ed8bf99c..fdeee4ba7b 100644 --- a/examples/peerconnection/client/linux/main_wnd.h +++ b/examples/peerconnection/client/linux/main_wnd.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ #include #include -#include "webrtc/examples/peerconnection/client/main_wnd.h" -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" +#include "examples/peerconnection/client/main_wnd.h" +#include "examples/peerconnection/client/peer_connection_client.h" // Forward declarations. typedef struct _GtkWidget GtkWidget; @@ -123,4 +123,4 @@ class GtkMainWnd : public MainWindow { int draw_buffer_size_; }; -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ diff --git a/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc index bd69be9531..bcf86f185e 100644 --- a/examples/peerconnection/client/main.cc +++ b/examples/peerconnection/client/main.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/conductor.h" -#include "webrtc/examples/peerconnection/client/flagdefs.h" -#include "webrtc/examples/peerconnection/client/main_wnd.h" -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/win32socketinit.h" -#include "webrtc/rtc_base/win32socketserver.h" +#include "examples/peerconnection/client/conductor.h" +#include "examples/peerconnection/client/flagdefs.h" +#include "examples/peerconnection/client/main_wnd.h" +#include "examples/peerconnection/client/peer_connection_client.h" +#include "rtc_base/checks.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/win32socketinit.h" +#include "rtc_base/win32socketserver.h" int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance, wchar_t* cmd_line, int cmd_show) { diff --git a/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc index da21c5f953..a33391d5ed 100644 --- a/examples/peerconnection/client/main_wnd.cc +++ b/examples/peerconnection/client/main_wnd.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/main_wnd.h" +#include "examples/peerconnection/client/main_wnd.h" #include #include "libyuv/convert_argb.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/video/i420_buffer.h" +#include "examples/peerconnection/client/defaults.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" ATOM MainWnd::wnd_class_ = 0; const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; diff --git a/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h index 18f56a708d..f3ed2f576c 100644 --- a/examples/peerconnection/client/main_wnd.h +++ b/examples/peerconnection/client/main_wnd.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ #include #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/win32.h" +#include "api/mediastreaminterface.h" +#include "api/video/video_frame.h" +#include "examples/peerconnection/client/peer_connection_client.h" +#include "media/base/mediachannel.h" +#include "media/base/videocommon.h" +#include "rtc_base/win32.h" class MainWndCallback { public: @@ -198,4 +198,4 @@ class MainWnd : public MainWindow { }; #endif // WIN32 -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_ diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc index 24ae5e515b..30e156d111 100644 --- a/examples/peerconnection/client/peer_connection_client.cc +++ b/examples/peerconnection/client/peer_connection_client.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/client/peer_connection_client.h" +#include "examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/stringutils.h" +#include "examples/peerconnection/client/defaults.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/stringutils.h" #ifdef WIN32 -#include "webrtc/rtc_base/win32socketserver.h" +#include "rtc_base/win32socketserver.h" #endif using rtc::sprintfn; diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h index a4bdf66058..f5f87ec381 100644 --- a/examples/peerconnection/client/peer_connection_client.h +++ b/examples/peerconnection/client/peer_connection_client.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ #include #include #include -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/signalthread.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/signalthread.h" +#include "rtc_base/sigslot.h" typedef std::map Peers; @@ -119,4 +119,4 @@ class PeerConnectionClient : public sigslot::has_slots<>, int my_id_; }; -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ diff --git a/examples/peerconnection/server/data_socket.cc b/examples/peerconnection/server/data_socket.cc index 60e40a68e6..7a924316aa 100644 --- a/examples/peerconnection/server/data_socket.cc +++ b/examples/peerconnection/server/data_socket.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/server/data_socket.h" +#include "examples/peerconnection/server/data_socket.h" #include #include @@ -18,7 +18,7 @@ #include #endif -#include "webrtc/examples/peerconnection/server/utils.h" +#include "examples/peerconnection/server/utils.h" static const char kHeaderTerminator[] = "\r\n\r\n"; static const int kHeaderTerminatorLength = sizeof(kHeaderTerminator) - 1; diff --git a/examples/peerconnection/server/data_socket.h b/examples/peerconnection/server/data_socket.h index 6350dcf26d..6bafa830a9 100644 --- a/examples/peerconnection/server/data_socket.h +++ b/examples/peerconnection/server/data_socket.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ +#ifndef EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ +#define EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ #ifdef WIN32 #include @@ -149,4 +149,4 @@ class ListeningSocket : public SocketBase { DataSocket* Accept() const; }; -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ +#endif // EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ diff --git a/examples/peerconnection/server/main.cc b/examples/peerconnection/server/main.cc index bd52e673b6..d26a1da4d7 100644 --- a/examples/peerconnection/server/main.cc +++ b/examples/peerconnection/server/main.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/examples/peerconnection/server/data_socket.h" -#include "webrtc/examples/peerconnection/server/peer_channel.h" -#include "webrtc/examples/peerconnection/server/utils.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "examples/peerconnection/server/data_socket.h" +#include "examples/peerconnection/server/peer_channel.h" +#include "examples/peerconnection/server/utils.h" +#include "rtc_tools/simple_command_line_parser.h" static const size_t kMaxConnections = (FD_SETSIZE - 2); diff --git a/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc index 5a0585b799..69a0e104f3 100644 --- a/examples/peerconnection/server/peer_channel.cc +++ b/examples/peerconnection/server/peer_channel.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/server/peer_channel.h" +#include "examples/peerconnection/server/peer_channel.h" #include #include @@ -16,10 +16,10 @@ #include -#include "webrtc/examples/peerconnection/server/data_socket.h" -#include "webrtc/examples/peerconnection/server/utils.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "examples/peerconnection/server/data_socket.h" +#include "examples/peerconnection/server/utils.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" using rtc::sprintfn; diff --git a/examples/peerconnection/server/peer_channel.h b/examples/peerconnection/server/peer_channel.h index 3d51db299c..a9343d9aeb 100644 --- a/examples/peerconnection/server/peer_channel.h +++ b/examples/peerconnection/server/peer_channel.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ +#ifndef EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ +#define EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ #include @@ -116,4 +116,4 @@ class PeerChannel { Members members_; }; -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ +#endif // EXAMPLES_PEERCONNECTION_SERVER_PEER_CHANNEL_H_ diff --git a/examples/peerconnection/server/utils.cc b/examples/peerconnection/server/utils.cc index 85f5f9e225..1bcbe6bd91 100644 --- a/examples/peerconnection/server/utils.cc +++ b/examples/peerconnection/server/utils.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/peerconnection/server/utils.h" +#include "examples/peerconnection/server/utils.h" #include -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" using rtc::ToString; diff --git a/examples/peerconnection/server/utils.h b/examples/peerconnection/server/utils.h index fd875f5de8..3df429afde 100644 --- a/examples/peerconnection/server/utils.h +++ b/examples/peerconnection/server/utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ -#define WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ +#ifndef EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ +#define EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ #include #include @@ -21,4 +21,4 @@ std::string int2str(int i); std::string size_t2str(size_t i); -#endif // WEBRTC_EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ +#endif // EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc index 02f5438c03..e3b18f1a92 100644 --- a/examples/relayserver/relayserver_main.cc +++ b/examples/relayserver/relayserver_main.cc @@ -11,8 +11,8 @@ #include // NOLINT #include -#include "webrtc/p2p/base/relayserver.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/relayserver.h" +#include "rtc_base/thread.h" int main(int argc, char **argv) { if (argc != 3) { diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc index 8c3b424f82..51937d87d4 100644 --- a/examples/stunprober/main.cc +++ b/examples/stunprober/main.cc @@ -16,18 +16,18 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/stunprober/stunprober.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/stunprober/stunprober.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/network.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" using stunprober::StunProber; using stunprober::AsyncCallback; diff --git a/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc index b084606e69..8129e1226d 100644 --- a/examples/stunserver/stunserver_main.cc +++ b/examples/stunserver/stunserver_main.cc @@ -14,8 +14,8 @@ #include -#include "webrtc/p2p/base/stunserver.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/stunserver.h" +#include "rtc_base/thread.h" using cricket::StunServer; diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc index c232ce9ad7..5433f951c1 100644 --- a/examples/turnserver/turnserver_main.cc +++ b/examples/turnserver/turnserver_main.cc @@ -10,12 +10,12 @@ #include // NOLINT -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/turnserver.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/optionsfile.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/turnserver.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/optionsfile.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread.h" static const char kSoftware[] = "libjingle TurnServer"; diff --git a/examples/unityplugin/DEPS b/examples/unityplugin/DEPS index ede414b7e2..608c6ade4b 100644 --- a/examples/unityplugin/DEPS +++ b/examples/unityplugin/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+webrtc/sdk", + "+sdk", ] diff --git a/examples/unityplugin/classreferenceholder.cc b/examples/unityplugin/classreferenceholder.cc index b009ce4734..0ad96c594d 100644 --- a/examples/unityplugin/classreferenceholder.cc +++ b/examples/unityplugin/classreferenceholder.cc @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/unityplugin/classreferenceholder.h" +#include "examples/unityplugin/classreferenceholder.h" #include -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace unity_plugin { diff --git a/examples/unityplugin/classreferenceholder.h b/examples/unityplugin/classreferenceholder.h index 7d9a71bbb4..31d6efc979 100644 --- a/examples/unityplugin/classreferenceholder.h +++ b/examples/unityplugin/classreferenceholder.h @@ -13,8 +13,8 @@ // specific java class into JNI c++ side, so that our c++ code can // call those java functions. -#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ -#define WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ +#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ +#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ #include #include @@ -34,4 +34,4 @@ jclass FindClass(JNIEnv* jni, const char* name); } // namespace unity_plugin -#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ +#endif // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ diff --git a/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc index 558dcfbf92..ebb5bfa364 100644 --- a/examples/unityplugin/jni_onload.cc +++ b/examples/unityplugin/jni_onload.cc @@ -12,10 +12,10 @@ #undef JNIEXPORT #define JNIEXPORT __attribute__((visibility("default"))) -#include "webrtc/examples/unityplugin/classreferenceholder.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "examples/unityplugin/classreferenceholder.h" +#include "rtc_base/ssladapter.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc index 3f3f3fbc58..fe59d53a6f 100644 --- a/examples/unityplugin/simple_peer_connection.cc +++ b/examples/unityplugin/simple_peer_connection.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/unityplugin/simple_peer_connection.h" +#include "examples/unityplugin/simple_peer_connection.h" #include -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/media/engine/webrtcvideocapturerfactory.h" -#include "webrtc/modules/video_capture/video_capture_factory.h" +#include "api/test/fakeconstraints.h" +#include "api/videosourceproxy.h" +#include "media/engine/webrtcvideocapturerfactory.h" +#include "modules/video_capture/video_capture_factory.h" #if defined(WEBRTC_ANDROID) -#include "webrtc/examples/unityplugin/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/androidvideotracksource.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "examples/unityplugin/classreferenceholder.h" +#include "sdk/android/src/jni/androidvideotracksource.h" +#include "sdk/android/src/jni/jni_helpers.h" #endif // Names used for media stream labels. diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h index 15961d8d9d..0c7a2615d7 100644 --- a/examples/unityplugin/simple_peer_connection.h +++ b/examples/unityplugin/simple_peer_connection.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ -#define WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ +#ifndef EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ +#define EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ #include #include #include #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/examples/unityplugin/unity_plugin_apis.h" -#include "webrtc/examples/unityplugin/video_observer.h" +#include "api/datachannelinterface.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "examples/unityplugin/unity_plugin_apis.h" +#include "examples/unityplugin/video_observer.h" class SimplePeerConnection : public webrtc::PeerConnectionObserver, public webrtc::CreateSessionDescriptionObserver, @@ -133,4 +133,4 @@ class SimplePeerConnection : public webrtc::PeerConnectionObserver, SimplePeerConnection& operator=(const SimplePeerConnection&) = delete; }; -#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ +#endif // EXAMPLES_UNITYPLUGIN_SIMPLE_PEER_CONNECTION_H_ diff --git a/examples/unityplugin/unity_plugin_apis.cc b/examples/unityplugin/unity_plugin_apis.cc index 08b334786b..ae98a833f5 100644 --- a/examples/unityplugin/unity_plugin_apis.cc +++ b/examples/unityplugin/unity_plugin_apis.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/unityplugin/unity_plugin_apis.h" +#include "examples/unityplugin/unity_plugin_apis.h" #include #include -#include "webrtc/examples/unityplugin/simple_peer_connection.h" +#include "examples/unityplugin/simple_peer_connection.h" namespace { static int g_peer_connection_id = 1; diff --git a/examples/unityplugin/unity_plugin_apis.h b/examples/unityplugin/unity_plugin_apis.h index 529c7d2cc0..814b9675fb 100644 --- a/examples/unityplugin/unity_plugin_apis.h +++ b/examples/unityplugin/unity_plugin_apis.h @@ -10,8 +10,8 @@ // This file provides an example of unity native plugin APIs. -#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ -#define WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ +#ifndef EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ +#define EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ #include @@ -102,4 +102,4 @@ WEBRTC_PLUGIN_API bool RegisterOnIceCandiateReadytoSend( ICECANDIDATEREADYTOSEND_CALLBACK callback); } -#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ +#endif // EXAMPLES_UNITYPLUGIN_UNITY_PLUGIN_APIS_H_ diff --git a/examples/unityplugin/video_observer.cc b/examples/unityplugin/video_observer.cc index 4f3bd567c2..821acd66aa 100644 --- a/examples/unityplugin/video_observer.cc +++ b/examples/unityplugin/video_observer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/examples/unityplugin/video_observer.h" +#include "examples/unityplugin/video_observer.h" void VideoObserver::SetVideoCallback(I420FRAMEREADY_CALLBACK callback) { std::lock_guard lock(mutex); diff --git a/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h index 9c3c7c65cc..f2b06b3d49 100644 --- a/examples/unityplugin/video_observer.h +++ b/examples/unityplugin/video_observer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ -#define WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ +#ifndef EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ +#define EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/examples/unityplugin/unity_plugin_apis.h" -#include "webrtc/media/base/videosinkinterface.h" +#include "api/mediastreaminterface.h" +#include "examples/unityplugin/unity_plugin_apis.h" +#include "media/base/videosinkinterface.h" class VideoObserver : public rtc::VideoSinkInterface { public: @@ -32,4 +32,4 @@ class VideoObserver : public rtc::VideoSinkInterface { std::mutex mutex; }; -#endif // WEBRTC_EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ +#endif // EXAMPLES_UNITYPLUGIN_VIDEO_OBSERVER_H_ diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 18d6084f11..edba8a8218 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -74,7 +74,7 @@ if (rtc_enable_protobuf) { sources = [ "rtc_event_log/rtc_event_log.proto", ] - proto_out_dir = "webrtc/logging/rtc_event_log" + proto_out_dir = "logging/rtc_event_log" } rtc_static_library("rtc_event_log_parser") { diff --git a/logging/rtc_event_log/DEPS b/logging/rtc_event_log/DEPS index f0ae6d1767..ec93428e80 100644 --- a/logging/rtc_event_log/DEPS +++ b/logging/rtc_event_log/DEPS @@ -1,7 +1,7 @@ include_rules = [ - "+webrtc/call", - "+webrtc/modules/audio_coding/audio_network_adaptor", - "+webrtc/modules/remote_bitrate_estimator/include", - "+webrtc/modules/rtp_rtcp", - "+webrtc/system_wrappers", + "+call", + "+modules/audio_coding/audio_network_adaptor", + "+modules/remote_bitrate_estimator/include", + "+modules/rtp_rtcp", + "+system_wrappers", ] diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h index cb31d8f779..25cb52e964 100644 --- a/logging/rtc_event_log/mock/mock_rtc_event_log.h +++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ +#ifndef LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ +#define LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/test/gmock.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "test/gmock.h" namespace webrtc { @@ -80,4 +80,4 @@ class MockRtcEventLog : public RtcEventLog { } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ +#endif // LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ diff --git a/logging/rtc_event_log/rtc_event_log.cc b/logging/rtc_event_log/rtc_event_log.cc index 7c295aa0e3..edc62d9d68 100644 --- a/logging/rtc_event_log/rtc_event_log.cc +++ b/logging/rtc_event_log/rtc_event_log.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log.h" #include #include @@ -18,33 +18,33 @@ #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/event.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/logging.h" +#include "rtc_base/protobuf_utils.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/file_wrapper.h" +#include "typedefs.h" #ifdef ENABLE_RTC_EVENT_LOG // *.pb.h files are generated at build-time by the protobuf compiler. @@ -52,7 +52,7 @@ RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" #else -#include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h index 40d8989635..de7e405981 100644 --- a/logging/rtc_event_log/rtc_event_log.h +++ b/logging/rtc_event_log/rtc_event_log.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ #include #include #include // TODO(eladalon): Get rid of this later in the CL-stack. -#include "webrtc/api/rtpparameters.h" -#include "webrtc/common_types.h" +#include "api/rtpparameters.h" +#include "common_types.h" // TODO(eladalon): Get rid of this later in the CL-stack. -#include "webrtc/logging/rtc_event_log/rtc_stream_config.h" -#include "webrtc/rtc_base/platform_file.h" +#include "logging/rtc_event_log/rtc_stream_config.h" +#include "rtc_base/platform_file.h" namespace webrtc { @@ -203,4 +203,4 @@ class RtcEventLogNullImpl : public RtcEventLog { } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ diff --git a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc index 06b250dbbd..dc4c496ecd 100644 --- a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc +++ b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc @@ -15,13 +15,13 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/rtp_file_writer.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "test/rtp_file_writer.h" namespace { diff --git a/logging/rtc_event_log/rtc_event_log2stats.cc b/logging/rtc_event_log/rtc_event_log2stats.cc index 36fa1e34fb..4a4ee3fcb0 100644 --- a/logging/rtc_event_log/rtc_event_log2stats.cc +++ b/logging/rtc_event_log/rtc_event_log2stats.cc @@ -19,18 +19,18 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/logging.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/logging.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" #else -#include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" #endif RTC_POP_IGNORING_WUNDEF() diff --git a/logging/rtc_event_log/rtc_event_log2text.cc b/logging/rtc_event_log/rtc_event_log2text.cc index 0f9d674ece..8fc0e05d3d 100644 --- a/logging/rtc_event_log/rtc_event_log2text.cc +++ b/logging/rtc_event_log/rtc_event_log2text.cc @@ -16,27 +16,27 @@ #include #include // pair -#include "webrtc/call/video_config.h" -#include "webrtc/common_types.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" +#include "call/video_config.h" +#include "common_types.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" namespace { diff --git a/logging/rtc_event_log/rtc_event_log_factory.cc b/logging/rtc_event_log/rtc_event_log_factory.cc index 4a826fb935..80435d9d6f 100644 --- a/logging/rtc_event_log/rtc_event_log_factory.cc +++ b/logging/rtc_event_log/rtc_event_log_factory.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory.h" +#include "logging/rtc_event_log/rtc_event_log_factory.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_factory.h b/logging/rtc_event_log/rtc_event_log_factory.h index 53a18c656b..0a38c66afb 100644 --- a/logging/rtc_event_log/rtc_event_log_factory.h +++ b/logging/rtc_event_log/rtc_event_log_factory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ #include -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" namespace webrtc { @@ -27,4 +27,4 @@ class RtcEventLogFactory : public RtcEventLogFactoryInterface { std::unique_ptr CreateRtcEventLogFactory(); } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ diff --git a/logging/rtc_event_log/rtc_event_log_factory_interface.h b/logging/rtc_event_log/rtc_event_log_factory_interface.h index e3b7a67f1e..ca5cbffec1 100644 --- a/logging/rtc_event_log/rtc_event_log_factory_interface.h +++ b/logging/rtc_event_log/rtc_event_log_factory_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log.h" namespace webrtc { @@ -31,4 +31,4 @@ std::unique_ptr CreateRtcEventLogFactory(); } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index a7237ee851..87e35eb9eb 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" #include #include @@ -19,13 +19,13 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h index 1c2390b5bc..85d2e3af1c 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.h +++ b/logging/rtc_event_log/rtc_event_log_parser.h @@ -7,27 +7,27 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ #include #include #include // pair #include -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/ignore_wundef.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/ignore_wundef.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" #else -#include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" #endif RTC_POP_IGNORING_WUNDEF() @@ -209,4 +209,4 @@ class ParsedRtcEventLog { } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc index e908ccd5fb..3878b582ae 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -14,29 +14,29 @@ #include #include -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "logging/rtc_event_log/rtc_event_log_unittest_helper.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/random.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" // Files generated at build-time by the protobuf compiler. #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" #else -#include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" #endif namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index 9d98855d4a..972411a836 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h" +#include "logging/rtc_event_log/rtc_event_log_unittest_helper.h" #include #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" // Files generated at build-time by the protobuf compiler. #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" #else -#include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" #endif namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.h b/logging/rtc_event_log/rtc_event_log_unittest_helper.h index 04aa6bf7f9..29031ed5f9 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.h +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" namespace webrtc { @@ -86,4 +86,4 @@ class RtcEventLogTestHelper { } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ diff --git a/logging/rtc_event_log/rtc_stream_config.cc b/logging/rtc_event_log/rtc_stream_config.cc index c6e5cb9cca..d54f6e08e2 100644 --- a/logging/rtc_event_log/rtc_stream_config.cc +++ b/logging/rtc_event_log/rtc_stream_config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/logging/rtc_event_log/rtc_stream_config.h" +#include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { namespace rtclog { diff --git a/logging/rtc_event_log/rtc_stream_config.h b/logging/rtc_event_log/rtc_stream_config.h index 4a09873f37..9204d8a557 100644 --- a/logging/rtc_event_log/rtc_stream_config.h +++ b/logging/rtc_event_log/rtc_stream_config.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ -#define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ +#ifndef LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ +#define LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ #include #include -#include "webrtc/api/rtpparameters.h" -#include "webrtc/common_types.h" +#include "api/rtpparameters.h" +#include "common_types.h" namespace webrtc { namespace rtclog { @@ -50,4 +50,4 @@ struct StreamConfig { } // namespace rtclog } // namespace webrtc -#endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ +#endif // LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ diff --git a/media/BUILD.gn b/media/BUILD.gn index 26d6625907..a11f56f819 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -410,13 +410,13 @@ if (rtc_include_tests) { } rtc_media_unittests_resources = [ - "../../resources/media/captured-320x240-2s-48.frames", - "../../resources/media/faces.1280x720_P420.yuv", - "../../resources/media/faces_I420.jpg", - "../../resources/media/faces_I422.jpg", - "../../resources/media/faces_I444.jpg", - "../../resources/media/faces_I411.jpg", - "../../resources/media/faces_I400.jpg", + "../resources/media/captured-320x240-2s-48.frames", + "../resources/media/faces.1280x720_P420.yuv", + "../resources/media/faces_I420.jpg", + "../resources/media/faces_I422.jpg", + "../resources/media/faces_I444.jpg", + "../resources/media/faces_I411.jpg", + "../resources/media/faces_I400.jpg", ] if (is_ios) { diff --git a/media/DEPS b/media/DEPS index 3d3dce4740..4dd449c003 100644 --- a/media/DEPS +++ b/media/DEPS @@ -1,20 +1,20 @@ include_rules = [ - "+webrtc/api", - "+webrtc/call", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_mixer", - "+webrtc/modules/audio_processing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/video_capture", - "+webrtc/modules/video_coding", - "+webrtc/p2p", - "+webrtc/pc", - "+webrtc/sound", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", + "+api", + "+call", + "+common_video", + "+logging/rtc_event_log", + "+modules/audio_coding", + "+modules/audio_device", + "+modules/audio_mixer", + "+modules/audio_processing", + "+modules/rtp_rtcp", + "+modules/video_capture", + "+modules/video_coding", + "+p2p", + "+pc", + "+sound", + "+system_wrappers", + "+voice_engine", "+usrsctplib", ] diff --git a/media/base/adaptedvideotracksource.cc b/media/base/adaptedvideotracksource.cc index 9513be8230..4b413619a6 100644 --- a/media/base/adaptedvideotracksource.cc +++ b/media/base/adaptedvideotracksource.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/adaptedvideotracksource.h" +#include "media/base/adaptedvideotracksource.h" -#include "webrtc/api/video/i420_buffer.h" +#include "api/video/i420_buffer.h" namespace rtc { diff --git a/media/base/adaptedvideotracksource.h b/media/base/adaptedvideotracksource.h index 7189996ecb..82b323789d 100644 --- a/media/base/adaptedvideotracksource.h +++ b/media/base/adaptedvideotracksource.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ -#define WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#ifndef MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" -#include "webrtc/media/base/videoadapter.h" -#include "webrtc/media/base/videobroadcaster.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" +#include "media/base/videoadapter.h" +#include "media/base/videobroadcaster.h" namespace rtc { @@ -81,4 +81,4 @@ class AdaptedVideoTrackSource } // namespace rtc -#endif // WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#endif // MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ diff --git a/media/base/audiosource.h b/media/base/audiosource.h index 97743bc266..199b614850 100644 --- a/media/base/audiosource.h +++ b/media/base/audiosource.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_AUDIOSOURCE_H_ -#define WEBRTC_MEDIA_BASE_AUDIOSOURCE_H_ +#ifndef MEDIA_BASE_AUDIOSOURCE_H_ +#define MEDIA_BASE_AUDIOSOURCE_H_ #include @@ -46,4 +46,4 @@ class AudioSource { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_AUDIOSOURCE_H_ +#endif // MEDIA_BASE_AUDIOSOURCE_H_ diff --git a/media/base/codec.cc b/media/base/codec.cc index a94940227b..b5a68efb6b 100644 --- a/media/base/codec.cc +++ b/media/base/codec.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/codec.h" +#include "media/base/codec.h" #include #include -#include "webrtc/media/base/h264_profile_level_id.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "media/base/h264_profile_level_id.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" namespace cricket { diff --git a/media/base/codec.h b/media/base/codec.h index 5e49785e9d..1b29a88280 100644 --- a/media/base/codec.h +++ b/media/base/codec.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_CODEC_H_ -#define WEBRTC_MEDIA_BASE_CODEC_H_ +#ifndef MEDIA_BASE_CODEC_H_ +#define MEDIA_BASE_CODEC_H_ #include #include #include #include -#include "webrtc/api/rtpparameters.h" -#include "webrtc/common_types.h" -#include "webrtc/media/base/mediaconstants.h" +#include "api/rtpparameters.h" +#include "common_types.h" +#include "media/base/mediaconstants.h" namespace cricket { @@ -254,4 +254,4 @@ const VideoCodec* FindMatchingCodec( } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_CODEC_H_ +#endif // MEDIA_BASE_CODEC_H_ diff --git a/media/base/codec_unittest.cc b/media/base/codec_unittest.cc index 26966bbcba..115808b472 100644 --- a/media/base/codec_unittest.cc +++ b/media/base/codec_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/codec.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/codec.h" +#include "rtc_base/gunit.h" using cricket::AudioCodec; using cricket::Codec; diff --git a/media/base/cryptoparams.h b/media/base/cryptoparams.h index 84c883d668..56bdfaa7e4 100644 --- a/media/base/cryptoparams.h +++ b/media/base/cryptoparams.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_ -#define WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_ +#ifndef MEDIA_BASE_CRYPTOPARAMS_H_ +#define MEDIA_BASE_CRYPTOPARAMS_H_ #include @@ -36,4 +36,4 @@ struct CryptoParams { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_CRYPTOPARAMS_H_ +#endif // MEDIA_BASE_CRYPTOPARAMS_H_ diff --git a/media/base/device.h b/media/base/device.h index 7eb630f7da..ae9567df19 100644 --- a/media/base/device.h +++ b/media/base/device.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_DEVICE_H_ -#define WEBRTC_MEDIA_BASE_DEVICE_H_ +#ifndef MEDIA_BASE_DEVICE_H_ +#define MEDIA_BASE_DEVICE_H_ -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" namespace cricket { @@ -31,4 +31,4 @@ struct Device { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_DEVICE_H_ +#endif // MEDIA_BASE_DEVICE_H_ diff --git a/media/base/fakemediaengine.h b/media/base/fakemediaengine.h index 921623cb03..29a129f781 100644 --- a/media/base/fakemediaengine.h +++ b/media/base/fakemediaengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_ -#define WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_ +#ifndef MEDIA_BASE_FAKEMEDIAENGINE_H_ +#define MEDIA_BASE_FAKEMEDIAENGINE_H_ #include #include @@ -18,19 +18,19 @@ #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/media/base/audiosource.h" -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/engine/webrtcvideoengine.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/call/audio_sink.h" +#include "media/base/audiosource.h" +#include "media/base/mediaengine.h" +#include "media/base/rtputils.h" +#include "media/base/streamparams.h" +#include "media/engine/webrtcvideoengine.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "p2p/base/sessiondescription.h" +#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/stringutils.h" using webrtc::RtpExtension; @@ -978,4 +978,4 @@ class FakeDataEngine : public DataEngineInterface { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_ +#endif // MEDIA_BASE_FAKEMEDIAENGINE_H_ diff --git a/media/base/fakenetworkinterface.h b/media/base/fakenetworkinterface.h index a6a40ed1e8..7f5dea01ab 100644 --- a/media/base/fakenetworkinterface.h +++ b/media/base/fakenetworkinterface.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_FAKENETWORKINTERFACE_H_ -#define WEBRTC_MEDIA_BASE_FAKENETWORKINTERFACE_H_ +#ifndef MEDIA_BASE_FAKENETWORKINTERFACE_H_ +#define MEDIA_BASE_FAKENETWORKINTERFACE_H_ #include #include -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/thread.h" +#include "media/base/mediachannel.h" +#include "media/base/rtputils.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/dscp.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/thread.h" namespace cricket { @@ -224,4 +224,4 @@ class FakeNetworkInterface : public MediaChannel::NetworkInterface, } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_FAKENETWORKINTERFACE_H_ +#endif // MEDIA_BASE_FAKENETWORKINTERFACE_H_ diff --git a/media/base/fakertp.cc b/media/base/fakertp.cc index 1c67d87544..be1631b73f 100644 --- a/media/base/fakertp.cc +++ b/media/base/fakertp.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/media/base/fakertp.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakertp.h" +#include "rtc_base/gunit.h" void CompareHeaderExtensions(const char* packet1, size_t packet1_size, const char* packet2, size_t packet2_size, diff --git a/media/base/fakertp.h b/media/base/fakertp.h index 88419a55e8..735da0172c 100644 --- a/media/base/fakertp.h +++ b/media/base/fakertp.h @@ -10,8 +10,8 @@ // Fake RTP and RTCP packets to use in unit tests. -#ifndef WEBRTC_MEDIA_BASE_FAKERTP_H_ -#define WEBRTC_MEDIA_BASE_FAKERTP_H_ +#ifndef MEDIA_BASE_FAKERTP_H_ +#define MEDIA_BASE_FAKERTP_H_ #include @@ -135,4 +135,4 @@ void CompareHeaderExtensions(const char* packet1, size_t packet1_size, const char* packet2, size_t packet2_size, const std::vector encrypted_headers, bool expect_equal); -#endif // WEBRTC_MEDIA_BASE_FAKERTP_H_ +#endif // MEDIA_BASE_FAKERTP_H_ diff --git a/media/base/fakevideocapturer.h b/media/base/fakevideocapturer.h index f5148df642..536fe16356 100644 --- a/media/base/fakevideocapturer.h +++ b/media/base/fakevideocapturer.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_FAKEVIDEOCAPTURER_H_ -#define WEBRTC_MEDIA_BASE_FAKEVIDEOCAPTURER_H_ +#ifndef MEDIA_BASE_FAKEVIDEOCAPTURER_H_ +#define MEDIA_BASE_FAKEVIDEOCAPTURER_H_ #include #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "media/base/videocapturer.h" +#include "media/base/videocommon.h" +#include "rtc_base/timeutils.h" namespace cricket { @@ -149,4 +149,4 @@ class FakeVideoCapturer : public cricket::VideoCapturer { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_FAKEVIDEOCAPTURER_H_ +#endif // MEDIA_BASE_FAKEVIDEOCAPTURER_H_ diff --git a/media/base/fakevideorenderer.h b/media/base/fakevideorenderer.h index a6753d2743..630063057b 100644 --- a/media/base/fakevideorenderer.h +++ b/media/base/fakevideorenderer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ -#define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ +#ifndef MEDIA_BASE_FAKEVIDEORENDERER_H_ +#define MEDIA_BASE_FAKEVIDEORENDERER_H_ -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" +#include "api/video/video_frame.h" +#include "media/base/videosinkinterface.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" namespace cricket { @@ -139,4 +139,4 @@ class FakeVideoRenderer : public rtc::VideoSinkInterface { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ +#endif // MEDIA_BASE_FAKEVIDEORENDERER_H_ diff --git a/media/base/h264_profile_level_id.cc b/media/base/h264_profile_level_id.cc index 3f43a30008..824c03b298 100644 --- a/media/base/h264_profile_level_id.cc +++ b/media/base/h264_profile_level_id.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/h264_profile_level_id.h" +#include "media/base/h264_profile_level_id.h" #include #include #include -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" namespace webrtc { namespace H264 { diff --git a/media/base/h264_profile_level_id.h b/media/base/h264_profile_level_id.h index acbb84e194..944acfccc2 100644 --- a/media/base/h264_profile_level_id.h +++ b/media/base/h264_profile_level_id.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ -#define WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ +#ifndef MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ +#define MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" +#include "api/optional.h" +#include "common_types.h" namespace webrtc { namespace H264 { @@ -99,4 +99,4 @@ void GenerateProfileLevelIdForAnswer( } // namespace H264 } // namespace webrtc -#endif // WEBRTC_MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ +#endif // MEDIA_BASE_H264_PROFILE_LEVEL_ID_H_ diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 7e7b815821..631e695e88 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -8,35 +8,35 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ -#define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ +#ifndef MEDIA_BASE_MEDIACHANNEL_H_ +#define MEDIA_BASE_MEDIACHANNEL_H_ #include #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/video/video_timing.h" -#include "webrtc/call/video_config.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/window.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/optional.h" +#include "api/rtpparameters.h" +#include "api/rtpreceiverinterface.h" +#include "api/video/video_timing.h" +#include "call/video_config.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.h" +#include "media/base/streamparams.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/dscp.h" +#include "rtc_base/logging.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socket.h" +#include "rtc_base/window.h" // TODO(juberti): re-evaluate this include -#include "webrtc/pc/audiomonitor.h" +#include "pc/audiomonitor.h" namespace rtc { class RateLimiter; @@ -1254,4 +1254,4 @@ class DataMediaChannel : public MediaChannel { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ +#endif // MEDIA_BASE_MEDIACHANNEL_H_ diff --git a/media/base/mediaconstants.cc b/media/base/mediaconstants.cc index 759c1834a5..06c172c07c 100644 --- a/media/base/mediaconstants.cc +++ b/media/base/mediaconstants.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/mediaconstants.h" +#include "media/base/mediaconstants.h" #include diff --git a/media/base/mediaconstants.h b/media/base/mediaconstants.h index 44d8c7ee01..106fad0cf4 100644 --- a/media/base/mediaconstants.h +++ b/media/base/mediaconstants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_ -#define WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_ +#ifndef MEDIA_BASE_MEDIACONSTANTS_H_ +#define MEDIA_BASE_MEDIACONSTANTS_H_ #include @@ -134,4 +134,4 @@ extern const char kH264ProfileLevelConstrainedBaseline[]; extern const int kDefaultVideoMaxFramerate; } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_ +#endif // MEDIA_BASE_MEDIACONSTANTS_H_ diff --git a/media/base/mediaengine.cc b/media/base/mediaengine.cc index fda7fac1a9..474ebf338a 100644 --- a/media/base/mediaengine.cc +++ b/media/base/mediaengine.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/mediaengine.h" +#include "media/base/mediaengine.h" #if !defined(DISABLE_MEDIA_ENGINE_FACTORY) #if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO) -#include "webrtc/media/engine/webrtcmediaengine.h" +#include "media/engine/webrtcmediaengine.h" #endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO namespace cricket { diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h index 52a55f93bb..2d4da01034 100644 --- a/media/base/mediaengine.h +++ b/media/base/mediaengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ -#define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ +#ifndef MEDIA_BASE_MEDIAENGINE_H_ +#define MEDIA_BASE_MEDIAENGINE_H_ #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include @@ -18,14 +18,14 @@ #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/fileutils.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/rtpparameters.h" +#include "call/audio_state.h" +#include "media/base/codec.h" +#include "media/base/mediachannel.h" +#include "media/base/videocommon.h" +#include "rtc_base/fileutils.h" #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) #define DISABLE_MEDIA_ENGINE_FACTORY @@ -183,4 +183,4 @@ webrtc::RtpParameters CreateRtpParametersWithOneEncoding(); } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ +#endif // MEDIA_BASE_MEDIAENGINE_H_ diff --git a/media/base/rtpdataengine.cc b/media/base/rtpdataengine.cc index d7aa32f80e..47977e8d72 100644 --- a/media/base/rtpdataengine.cc +++ b/media/base/rtpdataengine.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/rtpdataengine.h" +#include "media/base/rtpdataengine.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ratelimiter.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/rtc_base/stringutils.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.h" +#include "media/base/rtputils.h" +#include "media/base/streamparams.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/ratelimiter.h" +#include "rtc_base/sanitizer.h" +#include "rtc_base/stringutils.h" namespace cricket { diff --git a/media/base/rtpdataengine.h b/media/base/rtpdataengine.h index ca434940dc..7dd182e599 100644 --- a/media/base/rtpdataengine.h +++ b/media/base/rtpdataengine.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_ -#define WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_ +#ifndef MEDIA_BASE_RTPDATAENGINE_H_ +#define MEDIA_BASE_RTPDATAENGINE_H_ #include #include #include -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/mediaengine.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaconstants.h" +#include "media/base/mediaengine.h" namespace cricket { @@ -108,4 +108,4 @@ class RtpDataMediaChannel : public DataMediaChannel { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_ +#endif // MEDIA_BASE_RTPDATAENGINE_H_ diff --git a/media/base/rtpdataengine_unittest.cc b/media/base/rtpdataengine_unittest.cc index a06040ae0a..a05c3de264 100644 --- a/media/base/rtpdataengine_unittest.cc +++ b/media/base/rtpdataengine_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/media/base/fakenetworkinterface.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/rtpdataengine.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "media/base/fakenetworkinterface.h" +#include "media/base/mediaconstants.h" +#include "media/base/rtpdataengine.h" +#include "media/base/rtputils.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" class FakeDataReceiver : public sigslot::has_slots<> { public: diff --git a/media/base/rtputils.cc b/media/base/rtputils.cc index ea1c91971e..5147003715 100644 --- a/media/base/rtputils.cc +++ b/media/base/rtputils.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/rtputils.h" +#include "media/base/rtputils.h" // PacketTimeUpdateParams is defined in asyncpacketsocket.h. // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams. -#include "webrtc/media/base/turnutils.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagedigest.h" +#include "media/base/turnutils.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/messagedigest.h" namespace cricket { diff --git a/media/base/rtputils.h b/media/base/rtputils.h index a823cf7eef..0b7205cf8f 100644 --- a/media/base/rtputils.h +++ b/media/base/rtputils.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_RTPUTILS_H_ -#define WEBRTC_MEDIA_BASE_RTPUTILS_H_ +#ifndef MEDIA_BASE_RTPUTILS_H_ +#define MEDIA_BASE_RTPUTILS_H_ -#include "webrtc/rtc_base/byteorder.h" +#include "rtc_base/byteorder.h" namespace rtc { struct PacketTimeUpdateParams; @@ -87,4 +87,4 @@ bool ApplyPacketOptions(uint8_t* data, } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_RTPUTILS_H_ +#endif // MEDIA_BASE_RTPUTILS_H_ diff --git a/media/base/rtputils_unittest.cc b/media/base/rtputils_unittest.cc index 2a998eab6e..ada1b50533 100644 --- a/media/base/rtputils_unittest.cc +++ b/media/base/rtputils_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/base/fakertp.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/rtputils.h" +#include "media/base/fakertp.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/gunit.h" namespace cricket { diff --git a/media/base/streamparams.cc b/media/base/streamparams.cc index 2bbf04563b..fd61a87ffd 100644 --- a/media/base/streamparams.cc +++ b/media/base/streamparams.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/streamparams.h" +#include "media/base/streamparams.h" #include #include diff --git a/media/base/streamparams.h b/media/base/streamparams.h index 1fc8134017..1b2ebfa871 100644 --- a/media/base/streamparams.h +++ b/media/base/streamparams.h @@ -23,8 +23,8 @@ // ssrc_groups = {{SIM,{10,20,30}, {FEC,{10,11}, {FEC, {20,21}, {FEC {30,31}}} // Please see RFC 5576. -#ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ -#define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ +#ifndef MEDIA_BASE_STREAMPARAMS_H_ +#define MEDIA_BASE_STREAMPARAMS_H_ #include @@ -33,7 +33,7 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace cricket { @@ -329,4 +329,4 @@ bool IsSimulcastStream(const StreamParams& sp); } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ +#endif // MEDIA_BASE_STREAMPARAMS_H_ diff --git a/media/base/streamparams_unittest.cc b/media/base/streamparams_unittest.cc index 9dc034c829..6e934ae7d6 100644 --- a/media/base/streamparams_unittest.cc +++ b/media/base/streamparams_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/streamparams.h" +#include "media/base/testutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/gunit.h" static const uint32_t kSsrcs1[] = {1}; static const uint32_t kSsrcs2[] = {1, 2}; diff --git a/media/base/test/mock_mediachannel.h b/media/base/test/mock_mediachannel.h index 2d49d4770c..fdfbf3440e 100644 --- a/media/base/test/mock_mediachannel.h +++ b/media/base/test/mock_mediachannel.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ -#define WEBRTC_MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ +#ifndef MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ +#define MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/test/gmock.h" +#include "media/base/fakemediaengine.h" +#include "test/gmock.h" namespace webrtc { @@ -32,4 +32,4 @@ class MockVoiceMediaChannel : public cricket::FakeVoiceMediaChannel { } // namespace webrtc -#endif // WEBRTC_MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ +#endif // MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ diff --git a/media/base/testutils.cc b/media/base/testutils.cc index ac40df8743..3e70312e6d 100644 --- a/media/base/testutils.cc +++ b/media/base/testutils.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/testutils.h" +#include "media/base/testutils.h" #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/testutils.h" +#include "api/video/video_frame.h" +#include "media/base/videocapturer.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/testutils.h" namespace cricket { diff --git a/media/base/testutils.h b/media/base/testutils.h index a7cb216bc6..8ee77c1852 100644 --- a/media/base/testutils.h +++ b/media/base/testutils.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_TESTUTILS_H_ -#define WEBRTC_MEDIA_BASE_TESTUTILS_H_ +#ifndef MEDIA_BASE_TESTUTILS_H_ +#define MEDIA_BASE_TESTUTILS_H_ #include #include -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/window.h" +#include "media/base/mediachannel.h" +#include "media/base/videocapturer.h" +#include "media/base/videocommon.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/window.h" namespace rtc { class ByteBufferReader; @@ -148,4 +148,4 @@ cricket::StreamParams CreatePrimaryWithFecFrStreamParams( } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_TESTUTILS_H_ +#endif // MEDIA_BASE_TESTUTILS_H_ diff --git a/media/base/turnutils.cc b/media/base/turnutils.cc index f1daec48dd..cf258042e8 100644 --- a/media/base/turnutils.cc +++ b/media/base/turnutils.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/turnutils.h" +#include "media/base/turnutils.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" +#include "p2p/base/stun.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/media/base/turnutils.h b/media/base/turnutils.h index 09daffe24c..13ed26b7a5 100644 --- a/media/base/turnutils.h +++ b/media/base/turnutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_TURNUTILS_H_ -#define WEBRTC_MEDIA_BASE_TURNUTILS_H_ +#ifndef MEDIA_BASE_TURNUTILS_H_ +#define MEDIA_BASE_TURNUTILS_H_ #include #include @@ -27,4 +27,4 @@ bool UnwrapTurnPacket(const uint8_t* packet, } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_TURNUTILS_H_ +#endif // MEDIA_BASE_TURNUTILS_H_ diff --git a/media/base/turnutils_unittest.cc b/media/base/turnutils_unittest.cc index 72b1f7b0e0..ca1282760b 100644 --- a/media/base/turnutils_unittest.cc +++ b/media/base/turnutils_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/turnutils.h" +#include "media/base/turnutils.h" #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" namespace cricket { diff --git a/media/base/videoadapter.cc b/media/base/videoadapter.cc index 45868b67d9..1cf834415d 100644 --- a/media/base/videoadapter.cc +++ b/media/base/videoadapter.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videoadapter.h" +#include "media/base/videoadapter.h" #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/optional.h" +#include "media/base/mediaconstants.h" +#include "media/base/videocommon.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace { struct Fraction { diff --git a/media/base/videoadapter.h b/media/base/videoadapter.h index aa786af0bc..5b3d13841b 100644 --- a/media/base/videoadapter.h +++ b/media/base/videoadapter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ -#define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ +#ifndef MEDIA_BASE_VIDEOADAPTER_H_ +#define MEDIA_BASE_VIDEOADAPTER_H_ -#include "webrtc/api/optional.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "api/optional.h" +#include "media/base/videocommon.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace cricket { @@ -95,4 +95,4 @@ class VideoAdapter { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ +#endif // MEDIA_BASE_VIDEOADAPTER_H_ diff --git a/media/base/videoadapter_unittest.cc b/media/base/videoadapter_unittest.cc index d3a66c189d..b05d1e3607 100644 --- a/media/base/videoadapter_unittest.cc +++ b/media/base/videoadapter_unittest.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/base/videoadapter.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" +#include "media/base/fakevideocapturer.h" +#include "media/base/mediachannel.h" +#include "media/base/testutils.h" +#include "media/base/videoadapter.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" namespace cricket { namespace { diff --git a/media/base/videobroadcaster.cc b/media/base/videobroadcaster.cc index 8bd65c4fa4..83ed8444e5 100644 --- a/media/base/videobroadcaster.cc +++ b/media/base/videobroadcaster.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videobroadcaster.h" +#include "media/base/videobroadcaster.h" #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/video/i420_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/media/base/videobroadcaster.h b/media/base/videobroadcaster.h index 32fefdd3b3..4236e96958 100644 --- a/media/base/videobroadcaster.h +++ b/media/base/videobroadcaster.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ -#define WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ +#ifndef MEDIA_BASE_VIDEOBROADCASTER_H_ +#define MEDIA_BASE_VIDEOBROADCASTER_H_ #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourcebase.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/video/video_frame.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourcebase.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" namespace rtc { @@ -65,4 +65,4 @@ class VideoBroadcaster : public VideoSourceBase, } // namespace rtc -#endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ +#endif // MEDIA_BASE_VIDEOBROADCASTER_H_ diff --git a/media/base/videobroadcaster_unittest.cc b/media/base/videobroadcaster_unittest.cc index 5e934e7e70..ee39b617c2 100644 --- a/media/base/videobroadcaster_unittest.cc +++ b/media/base/videobroadcaster_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videobroadcaster.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/videobroadcaster.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "media/base/fakevideorenderer.h" +#include "rtc_base/gunit.h" using rtc::VideoBroadcaster; using rtc::VideoSinkWants; diff --git a/media/base/videocapturer.cc b/media/base/videocapturer.cc index b65eeec536..592f3e20e3 100644 --- a/media/base/videocapturer.cc +++ b/media/base/videocapturer.cc @@ -10,13 +10,13 @@ // Implementation file of class VideoCapturer. -#include "webrtc/media/base/videocapturer.h" +#include "media/base/videocapturer.h" #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/rtc_base/logging.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/media/base/videocapturer.h b/media/base/videocapturer.h index 10c5df9e3e..684f8730bd 100644 --- a/media/base/videocapturer.h +++ b/media/base/videocapturer.h @@ -10,8 +10,8 @@ // Declaration of abstract class VideoCapturer -#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ -#define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ +#ifndef MEDIA_BASE_VIDEOCAPTURER_H_ +#define MEDIA_BASE_VIDEOCAPTURER_H_ #include @@ -20,15 +20,15 @@ #include #include -#include "webrtc/media/base/videoadapter.h" -#include "webrtc/media/base/videobroadcaster.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/timestampaligner.h" +#include "media/base/videoadapter.h" +#include "media/base/videobroadcaster.h" +#include "media/base/videocommon.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timestampaligner.h" namespace webrtc { class VideoFrame; @@ -286,4 +286,4 @@ class VideoCapturer : public sigslot::has_slots<>, } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ +#endif // MEDIA_BASE_VIDEOCAPTURER_H_ diff --git a/media/base/videocapturer_unittest.cc b/media/base/videocapturer_unittest.cc index 402682e511..7450694d21 100644 --- a/media/base/videocapturer_unittest.cc +++ b/media/base/videocapturer_unittest.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "media/base/fakevideocapturer.h" +#include "media/base/fakevideorenderer.h" +#include "media/base/testutils.h" +#include "media/base/videocapturer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" using cricket::FakeVideoCapturer; diff --git a/media/base/videocapturerfactory.h b/media/base/videocapturerfactory.h index b6f886b6cf..219e95bb0d 100644 --- a/media/base/videocapturerfactory.h +++ b/media/base/videocapturerfactory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ -#define WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ +#ifndef MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ +#define MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ #include -#include "webrtc/media/base/device.h" +#include "media/base/device.h" namespace cricket { @@ -29,4 +29,4 @@ class VideoDeviceCapturerFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ +#endif // MEDIA_BASE_VIDEOCAPTURERFACTORY_H_ diff --git a/media/base/videocommon.cc b/media/base/videocommon.cc index 4bc0267ed1..e5168b55ca 100644 --- a/media/base/videocommon.cc +++ b/media/base/videocommon.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videocommon.h" +#include "media/base/videocommon.h" #include // For INT_MAX #include #include -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" namespace cricket { diff --git a/media/base/videocommon.h b/media/base/videocommon.h index 10ad383cf1..df977977e2 100644 --- a/media/base/videocommon.h +++ b/media/base/videocommon.h @@ -10,14 +10,14 @@ // Common definition for video, including fourcc and VideoFormat. -#ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT -#define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ +#ifndef MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT +#define MEDIA_BASE_VIDEOCOMMON_H_ #include #include -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/timeutils.h" namespace cricket { @@ -226,4 +226,4 @@ struct VideoFormat : VideoFormatPod { } // namespace cricket -#endif // WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT +#endif // MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT diff --git a/media/base/videocommon_unittest.cc b/media/base/videocommon_unittest.cc index 8430b800e4..0e29375b2a 100644 --- a/media/base/videocommon_unittest.cc +++ b/media/base/videocommon_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/videocommon.h" +#include "rtc_base/gunit.h" namespace cricket { diff --git a/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h index 64fda56849..a3ea5d82db 100644 --- a/media/base/videoengine_unittest.h +++ b/media/base/videoengine_unittest.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ // NOLINT -#define WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ +#ifndef MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ // NOLINT +#define MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ #include #include #include -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakenetworkinterface.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/timeutils.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakenetworkinterface.h" +#include "media/base/fakevideocapturer.h" +#include "media/base/fakevideorenderer.h" +#include "media/base/mediachannel.h" +#include "media/base/streamparams.h" +#include "media/engine/fakewebrtccall.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/timeutils.h" #define EXPECT_FRAME_WAIT(c, w, h, t) \ EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \ @@ -943,4 +943,4 @@ class VideoMediaChannelTest : public testing::Test, cricket::FakeVideoRenderer renderer2_; }; -#endif // WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT +#endif // MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT diff --git a/media/base/videosinkinterface.h b/media/base/videosinkinterface.h index f8b20b0947..bbcd529cc8 100644 --- a/media/base/videosinkinterface.h +++ b/media/base/videosinkinterface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOSINKINTERFACE_H_ -#define WEBRTC_MEDIA_BASE_VIDEOSINKINTERFACE_H_ +#ifndef MEDIA_BASE_VIDEOSINKINTERFACE_H_ +#define MEDIA_BASE_VIDEOSINKINTERFACE_H_ // TODO(nisse): Consider moving this interface (and possibly // VideoSourceInterface too) from media/base to common_video, to @@ -26,4 +26,4 @@ class VideoSinkInterface { } // namespace rtc -#endif // WEBRTC_MEDIA_BASE_VIDEOSINKINTERFACE_H_ +#endif // MEDIA_BASE_VIDEOSINKINTERFACE_H_ diff --git a/media/base/videosourcebase.cc b/media/base/videosourcebase.cc index 222adc457f..299795fca6 100644 --- a/media/base/videosourcebase.cc +++ b/media/base/videosourcebase.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videosourcebase.h" +#include "media/base/videosourcebase.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/media/base/videosourcebase.h b/media/base/videosourcebase.h index c83abb5772..f19d8fb587 100644 --- a/media/base/videosourcebase.h +++ b/media/base/videosourcebase.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_ -#define WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_ +#ifndef MEDIA_BASE_VIDEOSOURCEBASE_H_ +#define MEDIA_BASE_VIDEOSOURCEBASE_H_ #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/video/video_frame.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/thread_checker.h" namespace rtc { @@ -45,4 +45,4 @@ class VideoSourceBase : public VideoSourceInterface { } // namespace rtc -#endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_ +#endif // MEDIA_BASE_VIDEOSOURCEBASE_H_ diff --git a/media/base/videosourceinterface.cc b/media/base/videosourceinterface.cc index 2c69da3cca..42ea04ea62 100644 --- a/media/base/videosourceinterface.cc +++ b/media/base/videosourceinterface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/base/videosourceinterface.h" +#include "media/base/videosourceinterface.h" namespace rtc { VideoSinkWants::VideoSinkWants() = default; diff --git a/media/base/videosourceinterface.h b/media/base/videosourceinterface.h index 551a6ea12b..b68011d045 100644 --- a/media/base/videosourceinterface.h +++ b/media/base/videosourceinterface.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ -#define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ +#ifndef MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ +#define MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ -#include "webrtc/api/optional.h" -#include "webrtc/media/base/videosinkinterface.h" +#include "api/optional.h" +#include "media/base/videosinkinterface.h" namespace rtc { @@ -54,4 +54,4 @@ class VideoSourceInterface { }; } // namespace rtc -#endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ +#endif // MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ diff --git a/media/engine/adm_helpers.cc b/media/engine/adm_helpers.cc index 7902889477..bb2ecc3d00 100644 --- a/media/engine/adm_helpers.cc +++ b/media/engine/adm_helpers.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/adm_helpers.h" +#include "media/engine/adm_helpers.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/logging.h" namespace webrtc { namespace adm_helpers { diff --git a/media/engine/adm_helpers.h b/media/engine/adm_helpers.h index 1a3eb45960..209ff074c6 100644 --- a/media/engine/adm_helpers.h +++ b/media/engine/adm_helpers.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_ -#define WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_ +#ifndef MEDIA_ENGINE_ADM_HELPERS_H_ +#define MEDIA_ENGINE_ADM_HELPERS_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -25,4 +25,4 @@ void SetPlayoutDevice(AudioDeviceModule* adm); } // namespace adm_helpers } // namespace webrtc -#endif // WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_ +#endif // MEDIA_ENGINE_ADM_HELPERS_H_ diff --git a/media/engine/apm_helpers.cc b/media/engine/apm_helpers.cc index 784b47c457..d6c45a6c26 100644 --- a/media/engine/apm_helpers.cc +++ b/media/engine/apm_helpers.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/apm_helpers.h" +#include "media/engine/apm_helpers.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/logging.h" +#include "voice_engine/transmit_mixer.h" namespace webrtc { namespace apm_helpers { diff --git a/media/engine/apm_helpers.h b/media/engine/apm_helpers.h index eff7133c44..50f2e2b81f 100644 --- a/media/engine/apm_helpers.h +++ b/media/engine/apm_helpers.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_ -#define WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_ +#ifndef MEDIA_ENGINE_APM_HELPERS_H_ +#define MEDIA_ENGINE_APM_HELPERS_H_ namespace webrtc { @@ -46,4 +46,4 @@ void SetTypingDetectionStatus(AudioProcessing* apm, bool enable); } // namespace apm_helpers } // namespace webrtc -#endif // WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_ +#endif // MEDIA_ENGINE_APM_HELPERS_H_ diff --git a/media/engine/apm_helpers_unittest.cc b/media/engine/apm_helpers_unittest.cc index a86990301c..315cdc8553 100644 --- a/media/engine/apm_helpers_unittest.cc +++ b/media/engine/apm_helpers_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/apm_helpers.h" +#include "media/engine/apm_helpers.h" -#include "webrtc/media/engine/webrtcvoe.h" -#include "webrtc/modules/audio_device/include/mock_audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "media/engine/webrtcvoe.h" +#include "modules/audio_device/include/mock_audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" +#include "voice_engine/transmit_mixer.h" namespace webrtc { namespace { diff --git a/media/engine/constants.h b/media/engine/constants.h index 19d06a198c..cd4c0a2c74 100644 --- a/media/engine/constants.h +++ b/media/engine/constants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ -#define WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ +#ifndef MEDIA_ENGINE_CONSTANTS_H_ +#define MEDIA_ENGINE_CONSTANTS_H_ namespace cricket { @@ -22,4 +22,4 @@ extern const int kMinVideoBitrateKbps; } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ +#endif // MEDIA_ENGINE_CONSTANTS_H_ diff --git a/media/engine/fakewebrtccall.cc b/media/engine/fakewebrtccall.cc index 8081819654..8556cc7db0 100644 --- a/media/engine/fakewebrtccall.cc +++ b/media/engine/fakewebrtccall.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/fakewebrtccall.h" +#include "media/engine/fakewebrtccall.h" #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/platform_file.h" +#include "api/call/audio_sink.h" +#include "media/base/rtputils.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/platform_file.h" namespace cricket { FakeAudioSendStream::FakeAudioSendStream( diff --git a/media/engine/fakewebrtccall.h b/media/engine/fakewebrtccall.h index 0b4496b45f..04dc5d9e5d 100644 --- a/media/engine/fakewebrtccall.h +++ b/media/engine/fakewebrtccall.h @@ -17,22 +17,22 @@ // webrtc::VideoSendStream // webrtc::VideoReceiveStream -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_ #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/call/audio_receive_stream.h" -#include "webrtc/call/audio_send_stream.h" -#include "webrtc/call/call.h" -#include "webrtc/call/flexfec_receive_stream.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" +#include "api/video/video_frame.h" +#include "call/audio_receive_stream.h" +#include "call/audio_send_stream.h" +#include "call/call.h" +#include "call/flexfec_receive_stream.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/buffer.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" namespace cricket { class FakeAudioSendStream final : public webrtc::AudioSendStream { @@ -325,4 +325,4 @@ class FakeCall final : public webrtc::Call, public webrtc::PacketReceiver { }; } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCCALL_H_ diff --git a/media/engine/fakewebrtcdeviceinfo.h b/media/engine/fakewebrtcdeviceinfo.h index 38f9810e6b..b32db652f1 100644 --- a/media/engine/fakewebrtcdeviceinfo.h +++ b/media/engine/fakewebrtcdeviceinfo.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ +#define MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ #include -#include "webrtc/media/engine/webrtcvideocapturer.h" -#include "webrtc/rtc_base/stringutils.h" +#include "media/engine/webrtcvideocapturer.h" +#include "rtc_base/stringutils.h" // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo. class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { @@ -105,4 +105,4 @@ class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { std::vector devices_; }; -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ diff --git a/media/engine/fakewebrtcvcmfactory.h b/media/engine/fakewebrtcvcmfactory.h index 3124cd8fcb..70931e129a 100644 --- a/media/engine/fakewebrtcvcmfactory.h +++ b/media/engine/fakewebrtcvcmfactory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ +#define MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ #include -#include "webrtc/media/engine/fakewebrtcdeviceinfo.h" -#include "webrtc/media/engine/fakewebrtcvideocapturemodule.h" -#include "webrtc/media/engine/webrtcvideocapturer.h" +#include "media/engine/fakewebrtcdeviceinfo.h" +#include "media/engine/fakewebrtcvideocapturemodule.h" +#include "media/engine/webrtcvideocapturer.h" // Factory class to allow the fakes above to be injected into // WebRtcVideoCapturer. @@ -46,4 +46,4 @@ FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() { factory_->OnDestroyed(this); } -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ diff --git a/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h index 0d5299922f..2531e1a6ac 100644 --- a/media/engine/fakewebrtcvideocapturemodule.h +++ b/media/engine/fakewebrtcvideocapturemodule.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#define MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/engine/webrtcvideocapturer.h" +#include "api/video/i420_buffer.h" +#include "media/base/testutils.h" +#include "media/engine/webrtcvideocapturer.h" class FakeWebRtcVcmFactory; @@ -87,4 +87,4 @@ class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule { webrtc::VideoCaptureCapability cap_; }; -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ diff --git a/media/engine/fakewebrtcvideoengine.h b/media/engine/fakewebrtcvideoengine.h index e9afc76dd2..2153f6be38 100644 --- a/media/engine/fakewebrtcvideoengine.h +++ b/media/engine/fakewebrtcvideoengine.h @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ #include #include #include #include -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "media/base/codec.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread_annotations.h" namespace cricket { static const int kEventTimeoutMs = 10000; @@ -257,4 +257,4 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ diff --git a/media/engine/fakewebrtcvoiceengine.h b/media/engine/fakewebrtcvoiceengine.h index 13df1fcfcf..479cf261a4 100644 --- a/media/engine/fakewebrtcvoiceengine.h +++ b/media/engine/fakewebrtcvoiceengine.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ +#ifndef MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ +#define MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ #include #include -#include "webrtc/media/engine/webrtcvoe.h" -#include "webrtc/rtc_base/checks.h" +#include "media/engine/webrtcvoe.h" +#include "rtc_base/checks.h" namespace webrtc { namespace voe { @@ -132,4 +132,4 @@ class FakeWebRtcVoiceEngine : public webrtc::VoEBase { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ +#endif // MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ diff --git a/media/engine/internaldecoderfactory.cc b/media/engine/internaldecoderfactory.cc index 7a1c099f19..5e69602a5d 100644 --- a/media/engine/internaldecoderfactory.cc +++ b/media/engine/internaldecoderfactory.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/internaldecoderfactory.h" +#include "media/engine/internaldecoderfactory.h" #include -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/media/engine/internaldecoderfactory.h b/media/engine/internaldecoderfactory.h index 20ceecc188..283d103f7b 100644 --- a/media/engine/internaldecoderfactory.h +++ b/media/engine/internaldecoderfactory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ +#ifndef MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ +#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ #include -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideodecoderfactory.h" namespace cricket { @@ -31,4 +31,4 @@ class InternalDecoderFactory : public WebRtcVideoDecoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ +#endif // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ diff --git a/media/engine/internaldecoderfactory_unittest.cc b/media/engine/internaldecoderfactory_unittest.cc index bf1ca50f24..cbf39dfd03 100644 --- a/media/engine/internaldecoderfactory_unittest.cc +++ b/media/engine/internaldecoderfactory_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/internaldecoderfactory.h" +#include "media/engine/internaldecoderfactory.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" TEST(InternalDecoderFactory, TestVP8) { cricket::InternalDecoderFactory factory; diff --git a/media/engine/internalencoderfactory.cc b/media/engine/internalencoderfactory.cc index 004db79160..5f7a4ba2c3 100644 --- a/media/engine/internalencoderfactory.cc +++ b/media/engine/internalencoderfactory.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/internalencoderfactory.h" +#include "media/engine/internalencoderfactory.h" #include -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "system_wrappers/include/field_trial.h" namespace cricket { diff --git a/media/engine/internalencoderfactory.h b/media/engine/internalencoderfactory.h index cfc61016c0..b64d90450d 100644 --- a/media/engine/internalencoderfactory.h +++ b/media/engine/internalencoderfactory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ +#ifndef MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ +#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ #include -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" namespace cricket { @@ -34,4 +34,4 @@ class InternalEncoderFactory : public WebRtcVideoEncoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ +#endif // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ diff --git a/media/engine/nullwebrtcvideoengine.h b/media/engine/nullwebrtcvideoengine.h index 9c687b9db7..0ff997d7ad 100644 --- a/media/engine/nullwebrtcvideoengine.h +++ b/media/engine/nullwebrtcvideoengine.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ #include -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/mediaengine.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaengine.h" namespace webrtc { @@ -46,4 +46,4 @@ class NullWebRtcVideoEngine { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ diff --git a/media/engine/nullwebrtcvideoengine_unittest.cc b/media/engine/nullwebrtcvideoengine_unittest.cc index 5fa7b011f2..84f330a9e7 100644 --- a/media/engine/nullwebrtcvideoengine_unittest.cc +++ b/media/engine/nullwebrtcvideoengine_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/nullwebrtcvideoengine.h" -#include "webrtc/media/engine/webrtcvoiceengine.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" -#include "webrtc/test/mock_audio_encoder_factory.h" +#include "media/engine/nullwebrtcvideoengine.h" +#include "media/engine/webrtcvoiceengine.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" +#include "test/mock_audio_encoder_factory.h" namespace cricket { diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc index 1dbc43123c..a6d93a5691 100644 --- a/media/engine/payload_type_mapper.cc +++ b/media/engine/payload_type_mapper.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/payload_type_mapper.h" +#include "media/engine/payload_type_mapper.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/common_types.h" -#include "webrtc/media/base/mediaconstants.h" +#include "api/audio_codecs/audio_format.h" +#include "common_types.h" +#include "media/base/mediaconstants.h" namespace cricket { diff --git a/media/engine/payload_type_mapper.h b/media/engine/payload_type_mapper.h index 128f557ae7..914c08c97b 100644 --- a/media/engine/payload_type_mapper.h +++ b/media/engine/payload_type_mapper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ -#define WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ +#ifndef MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ +#define MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ #include #include -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" -#include "webrtc/media/base/codec.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" +#include "media/base/codec.h" namespace cricket { @@ -53,4 +53,4 @@ class PayloadTypeMapper { }; } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ +#endif // MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc index 628eb0cc91..dca8e61ce8 100644 --- a/media/engine/payload_type_mapper_unittest.cc +++ b/media/engine/payload_type_mapper_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/media/engine/payload_type_mapper.h" -#include "webrtc/test/gtest.h" +#include "media/engine/payload_type_mapper.h" +#include "test/gtest.h" namespace cricket { diff --git a/media/engine/scopedvideodecoder.cc b/media/engine/scopedvideodecoder.cc index b328286dd9..a9f85378ab 100644 --- a/media/engine/scopedvideodecoder.cc +++ b/media/engine/scopedvideodecoder.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/scopedvideodecoder.h" +#include "media/engine/scopedvideodecoder.h" #include -#include "webrtc/api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_decoder.h" namespace cricket { diff --git a/media/engine/scopedvideodecoder.h b/media/engine/scopedvideodecoder.h index c76c9fcbe1..983059b9a4 100644 --- a/media/engine/scopedvideodecoder.h +++ b/media/engine/scopedvideodecoder.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ -#define WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ +#ifndef MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ +#define MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ #include -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideodecoderfactory.h" namespace cricket { @@ -31,4 +31,4 @@ std::unique_ptr CreateScopedVideoDecoder( } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ +#endif // MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ diff --git a/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc index 0c07d8cd0c..0f563641f6 100644 --- a/media/engine/scopedvideoencoder.cc +++ b/media/engine/scopedvideoencoder.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/scopedvideoencoder.h" +#include "media/engine/scopedvideoencoder.h" #include -#include "webrtc/api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder.h" namespace cricket { diff --git a/media/engine/scopedvideoencoder.h b/media/engine/scopedvideoencoder.h index f0ff40fd10..ac452d7e6c 100644 --- a/media/engine/scopedvideoencoder.h +++ b/media/engine/scopedvideoencoder.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ -#define WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ +#ifndef MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ +#define MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ #include -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" namespace cricket { @@ -30,4 +30,4 @@ std::unique_ptr CreateScopedVideoEncoder( } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ +#endif // MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc index f25eaf9760..6ebf66dd50 100644 --- a/media/engine/simulcast.cc +++ b/media/engine/simulcast.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/engine/constants.h" -#include "webrtc/media/engine/simulcast.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "media/base/streamparams.h" +#include "media/engine/constants.h" +#include "media/engine/simulcast.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/field_trial.h" namespace cricket { diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h index 81668e420a..29ecfde1d1 100644 --- a/media/engine/simulcast.h +++ b/media/engine/simulcast.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ -#define WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ +#ifndef MEDIA_ENGINE_SIMULCAST_H_ +#define MEDIA_ENGINE_SIMULCAST_H_ #include -#include "webrtc/call/video_config.h" -#include "webrtc/rtc_base/basictypes.h" +#include "call/video_config.h" +#include "rtc_base/basictypes.h" namespace cricket { struct StreamParams; @@ -59,4 +59,4 @@ bool UseSimulcastScreenshare(); } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ +#endif // MEDIA_ENGINE_SIMULCAST_H_ diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index af84b8526e..ecd415dd9d 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/simulcast_encoder_adapter.h" +#include "media/engine/simulcast_encoder_adapter.h" #include // NOTE(ajm): Path provided by gyp. #include "libyuv/scale.h" // NOLINT -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/media/engine/scopedvideoencoder.h" -#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/video/i420_buffer.h" +#include "media/engine/scopedvideoencoder.h" +#include "modules/video_coding/codecs/vp8/screenshare_layers.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" namespace { diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h index 03576f6587..8833908ad2 100644 --- a/media/engine/simulcast_encoder_adapter.h +++ b/media/engine/simulcast_encoder_adapter.h @@ -9,8 +9,8 @@ * */ -#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ -#define WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ +#ifndef MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ +#define MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ #include #include @@ -18,10 +18,10 @@ #include #include -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/sequenced_task_checker.h" namespace webrtc { @@ -112,4 +112,4 @@ class SimulcastEncoderAdapter : public VP8Encoder { } // namespace webrtc -#endif // WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ +#endif // MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_ diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc index 7865e5f1ba..91b47deff6 100644 --- a/media/engine/simulcast_encoder_adapter_unittest.cc +++ b/media/engine/simulcast_encoder_adapter_unittest.cc @@ -12,11 +12,11 @@ #include #include -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/media/engine/simulcast_encoder_adapter.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_test_utility.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/gmock.h" +#include "common_video/include/video_frame_buffer.h" +#include "media/engine/simulcast_encoder_adapter.h" +#include "modules/video_coding/codecs/vp8/simulcast_test_utility.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/gmock.h" namespace webrtc { namespace testing { diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc index 8377d4f1c4..1433c5c335 100644 --- a/media/engine/simulcast_unittest.cc +++ b/media/engine/simulcast_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/media/engine/simulcast.h" -#include "webrtc/test/gtest.h" +#include "media/engine/simulcast.h" +#include "test/gtest.h" namespace cricket { diff --git a/media/engine/videodecodersoftwarefallbackwrapper.cc b/media/engine/videodecodersoftwarefallbackwrapper.cc index 0e7632ba14..e99ea285fe 100644 --- a/media/engine/videodecodersoftwarefallbackwrapper.cc +++ b/media/engine/videodecodersoftwarefallbackwrapper.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" +#include "media/engine/videodecodersoftwarefallbackwrapper.h" #include -#include "webrtc/media/engine/internaldecoderfactory.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "media/engine/internaldecoderfactory.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/media/engine/videodecodersoftwarefallbackwrapper.h b/media/engine/videodecodersoftwarefallbackwrapper.h index d6c3e0e0a8..84a86ca59c 100644 --- a/media/engine/videodecodersoftwarefallbackwrapper.h +++ b/media/engine/videodecodersoftwarefallbackwrapper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ -#define WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ +#ifndef MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ +#define MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ #include #include -#include "webrtc/api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_decoder.h" namespace webrtc { @@ -59,4 +59,4 @@ class VideoDecoderSoftwareFallbackWrapper : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ +#endif // MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_ diff --git a/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc index 84a6a59731..3a313b1ca1 100644 --- a/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc +++ b/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "media/engine/videodecodersoftwarefallbackwrapper.h" +#include "api/video_codecs/video_decoder.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { diff --git a/media/engine/videoencodersoftwarefallbackwrapper.cc b/media/engine/videoencodersoftwarefallbackwrapper.cc index 7e2a678a56..f908b6e91c 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper.cc +++ b/media/engine/videoencodersoftwarefallbackwrapper.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" +#include "media/engine/videoencodersoftwarefallbackwrapper.h" -#include "webrtc/media/base/h264_profile_level_id.h" -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "media/base/h264_profile_level_id.h" +#include "media/engine/internalencoderfactory.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { diff --git a/media/engine/videoencodersoftwarefallbackwrapper.h b/media/engine/videoencodersoftwarefallbackwrapper.h index 8dec2f5448..bd7560df20 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper.h +++ b/media/engine/videoencodersoftwarefallbackwrapper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ -#define WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ +#ifndef MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ +#define MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ #include #include #include -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/media/base/codec.h" +#include "api/video_codecs/video_encoder.h" +#include "media/base/codec.h" namespace webrtc { @@ -109,4 +109,4 @@ class VideoEncoderSoftwareFallbackWrapper : public VideoEncoder { } // namespace webrtc -#endif // WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ +#endif // MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_ diff --git a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc index f8521ab888..c3ac434462 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc +++ b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" +#include "media/engine/videoencodersoftwarefallbackwrapper.h" #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/media/engine/webrtccommon.h b/media/engine/webrtccommon.h index 21fc1924ef..8d108357fa 100644 --- a/media/engine/webrtccommon.h +++ b/media/engine/webrtccommon.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ +#ifndef MEDIA_ENGINE_WEBRTCCOMMON_H_ +#define MEDIA_ENGINE_WEBRTCCOMMON_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace cricket { @@ -55,4 +55,4 @@ namespace cricket { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ +#endif // MEDIA_ENGINE_WEBRTCCOMMON_H_ diff --git a/media/engine/webrtcmediaengine.cc b/media/engine/webrtcmediaengine.cc index 3a61ad73bb..99b6041a18 100644 --- a/media/engine/webrtcmediaengine.cc +++ b/media/engine/webrtcmediaengine.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/webrtcmediaengine.h" +#include "media/engine/webrtcmediaengine.h" #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/media/engine/webrtcvoiceengine.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "media/engine/webrtcvoiceengine.h" #ifdef HAVE_WEBRTC_VIDEO -#include "webrtc/media/engine/webrtcvideoengine.h" +#include "media/engine/webrtcvideoengine.h" #else -#include "webrtc/media/engine/nullwebrtcvideoengine.h" +#include "media/engine/nullwebrtcvideoengine.h" #endif namespace cricket { diff --git a/media/engine/webrtcmediaengine.h b/media/engine/webrtcmediaengine.h index 8740917e9f..f24f7c7c9f 100644 --- a/media/engine/webrtcmediaengine.h +++ b/media/engine/webrtcmediaengine.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ #include #include -#include "webrtc/call/call.h" -#include "webrtc/media/base/mediaengine.h" +#include "call/call.h" +#include "media/base/mediaengine.h" namespace webrtc { class AudioDecoderFactory; @@ -100,4 +100,4 @@ webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec( } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc index d22a8da757..372621734b 100644 --- a/media/engine/webrtcmediaengine_unittest.cc +++ b/media/engine/webrtcmediaengine_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "media/engine/webrtcmediaengine.h" +#include "test/gtest.h" using webrtc::RtpExtension; diff --git a/media/engine/webrtcvideocapturer.cc b/media/engine/webrtcvideocapturer.cc index 9b872fba04..47bbbe8818 100644 --- a/media/engine/webrtcvideocapturer.cc +++ b/media/engine/webrtcvideocapturer.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/webrtcvideocapturer.h" +#include "media/engine/webrtcvideocapturer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" -#include "webrtc/modules/video_capture/video_capture_factory.h" -#include "webrtc/rtc_base/win32.h" // Need this to #include the impl files. -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/win32.h" // Need this to #include the impl files. +#include "system_wrappers/include/field_trial.h" namespace cricket { diff --git a/media/engine/webrtcvideocapturer.h b/media/engine/webrtcvideocapturer.h index 6fbfcf2ca2..2454f819bc 100644 --- a/media/engine/webrtcvideocapturer.h +++ b/media/engine/webrtcvideocapturer.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ +#ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ +#define MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ #include #include #include -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/media/base/device.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "media/base/device.h" +#include "media/base/videocapturer.h" +#include "modules/video_capture/video_capture.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/scoped_ref_ptr.h" namespace cricket { @@ -82,4 +82,4 @@ class WebRtcVideoCapturer : public VideoCapturer, } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_ +#endif // MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_ diff --git a/media/engine/webrtcvideocapturer_unittest.cc b/media/engine/webrtcvideocapturer_unittest.cc index a4414f1e2a..24cb65d0be 100644 --- a/media/engine/webrtcvideocapturer_unittest.cc +++ b/media/engine/webrtcvideocapturer_unittest.cc @@ -15,14 +15,14 @@ #include #include -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/media/engine/fakewebrtcvcmfactory.h" -#include "webrtc/media/engine/webrtcvideocapturer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "media/base/testutils.h" +#include "media/base/videocommon.h" +#include "media/engine/fakewebrtcvcmfactory.h" +#include "media/engine/webrtcvideocapturer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" using cricket::VideoFormat; diff --git a/media/engine/webrtcvideocapturerfactory.cc b/media/engine/webrtcvideocapturerfactory.cc index 6ee361a0df..e7700010c1 100644 --- a/media/engine/webrtcvideocapturerfactory.cc +++ b/media/engine/webrtcvideocapturerfactory.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/media/engine/webrtcvideocapturer.h" -#include "webrtc/media/engine/webrtcvideocapturerfactory.h" +#include "media/engine/webrtcvideocapturer.h" +#include "media/engine/webrtcvideocapturerfactory.h" namespace cricket { diff --git a/media/engine/webrtcvideocapturerfactory.h b/media/engine/webrtcvideocapturerfactory.h index c1f91b70f6..da39afd510 100644 --- a/media/engine/webrtcvideocapturerfactory.h +++ b/media/engine/webrtcvideocapturerfactory.h @@ -9,10 +9,10 @@ */ // TODO(pthatcher): Rename file to match class name. -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ +#ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ +#define MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ -#include "webrtc/media/base/videocapturerfactory.h" +#include "media/base/videocapturerfactory.h" namespace cricket { @@ -24,4 +24,4 @@ class WebRtcVideoDeviceCapturerFactory : public VideoDeviceCapturerFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ +#endif // MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ diff --git a/media/engine/webrtcvideodecoderfactory.h b/media/engine/webrtcvideodecoderfactory.h index e4d1c98407..1bb770f0bf 100644 --- a/media/engine/webrtcvideodecoderfactory.h +++ b/media/engine/webrtcvideodecoderfactory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ -#include "webrtc/common_types.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/rtc_base/refcount.h" +#include "common_types.h" +#include "media/base/codec.h" +#include "rtc_base/refcount.h" namespace webrtc { class VideoDecoder; @@ -60,4 +60,4 @@ class WebRtcVideoDecoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#endif // MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ diff --git a/media/engine/webrtcvideoencoderfactory.h b/media/engine/webrtcvideoencoderfactory.h index 284f1ef133..9f066167ec 100644 --- a/media/engine/webrtcvideoencoderfactory.h +++ b/media/engine/webrtcvideoencoderfactory.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/media/base/codec.h" +#include "common_types.h" +#include "media/base/codec.h" namespace webrtc { class VideoEncoder; @@ -48,4 +48,4 @@ class WebRtcVideoEncoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#endif // MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ diff --git a/media/engine/webrtcvideoencoderfactory_unittest.cc b/media/engine/webrtcvideoencoderfactory_unittest.cc index 5d3c9abefe..2b156a89a2 100644 --- a/media/engine/webrtcvideoencoderfactory_unittest.cc +++ b/media/engine/webrtcvideoencoderfactory_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" class WebRtcVideoEncoderFactoryForTest : public cricket::WebRtcVideoEncoderFactory { diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc index 26b9397f3b..29fc442cb1 100644 --- a/media/engine/webrtcvideoengine.cc +++ b/media/engine/webrtcvideoengine.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/webrtcvideoengine.h" +#include "media/engine/webrtcvideoengine.h" #include #include @@ -16,32 +16,32 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video_codecs/sdp_video_format.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/api/video_codecs/video_decoder_factory.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/api/video_codecs/video_encoder_factory.h" -#include "webrtc/call/call.h" -#include "webrtc/common_video/h264/profile_level_id.h" -#include "webrtc/media/engine/constants.h" -#include "webrtc/media/engine/internaldecoderfactory.h" -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/media/engine/scopedvideodecoder.h" -#include "webrtc/media/engine/scopedvideoencoder.h" -#include "webrtc/media/engine/simulcast.h" -#include "webrtc/media/engine/simulcast_encoder_adapter.h" -#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" -#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/media/engine/webrtcvoiceengine.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/video/i420_buffer.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder_factory.h" +#include "call/call.h" +#include "common_video/h264/profile_level_id.h" +#include "media/engine/constants.h" +#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internalencoderfactory.h" +#include "media/engine/scopedvideodecoder.h" +#include "media/engine/scopedvideoencoder.h" +#include "media/engine/simulcast.h" +#include "media/engine/simulcast_encoder_adapter.h" +#include "media/engine/videodecodersoftwarefallbackwrapper.h" +#include "media/engine/videoencodersoftwarefallbackwrapper.h" +#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvoiceengine.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/field_trial.h" using DegradationPreference = webrtc::VideoSendStream::DegradationPreference; diff --git a/media/engine/webrtcvideoengine.h b/media/engine/webrtcvideoengine.h index ff5505915b..23d9b48016 100644 --- a/media/engine/webrtcvideoengine.h +++ b/media/engine/webrtcvideoengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ +#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ #include #include @@ -17,24 +17,24 @@ #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/api/video_codecs/sdp_video_format.h" -#include "webrtc/call/call.h" -#include "webrtc/call/flexfec_receive_stream.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/call/transport.h" +#include "api/optional.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/sdp_video_format.h" +#include "call/call.h" +#include "call/flexfec_receive_stream.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "media/base/mediaengine.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourceinterface.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" namespace webrtc { class VideoDecoder; @@ -534,4 +534,4 @@ class EncoderStreamFactory } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc index 195f757726..936bc739c1 100644 --- a/media/engine/webrtcvideoengine_unittest.cc +++ b/media/engine/webrtcvideoengine_unittest.cc @@ -13,28 +13,28 @@ #include #include -#include "webrtc/api/video_codecs/sdp_video_format.h" -#include "webrtc/api/video_codecs/video_decoder_factory.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/api/video_codecs/video_encoder_factory.h" -#include "webrtc/call/flexfec_receive_stream.h" -#include "webrtc/common_video/h264/profile_level_id.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/base/videoengine_unittest.h" -#include "webrtc/media/engine/constants.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/media/engine/fakewebrtcvideoengine.h" -#include "webrtc/media/engine/simulcast.h" -#include "webrtc/media/engine/webrtcvideoengine.h" -#include "webrtc/media/engine/webrtcvoiceengine.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gmock.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder_factory.h" +#include "call/flexfec_receive_stream.h" +#include "common_video/h264/profile_level_id.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/mediaconstants.h" +#include "media/base/rtputils.h" +#include "media/base/testutils.h" +#include "media/base/videoengine_unittest.h" +#include "media/engine/constants.h" +#include "media/engine/fakewebrtccall.h" +#include "media/engine/fakewebrtcvideoengine.h" +#include "media/engine/simulcast.h" +#include "media/engine/webrtcvideoengine.h" +#include "media/engine/webrtcvoiceengine.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringutils.h" +#include "test/field_trial.h" +#include "test/gmock.h" using webrtc::RtpExtension; diff --git a/media/engine/webrtcvoe.h b/media/engine/webrtcvoe.h index 79f0ed60e9..bdff21cfc6 100644 --- a/media/engine/webrtcvoe.h +++ b/media/engine/webrtcvoe.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ +#ifndef MEDIA_ENGINE_WEBRTCVOE_H_ +#define MEDIA_ENGINE_WEBRTCVOE_H_ #include -#include "webrtc/media/engine/webrtccommon.h" +#include "media/engine/webrtccommon.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/include/voe_codec.h" -#include "webrtc/voice_engine/include/voe_errors.h" +#include "common_types.h" +#include "modules/audio_device/include/audio_device.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_codec.h" +#include "voice_engine/include/voe_errors.h" namespace cricket { // automatically handles lifetime of WebRtc VoiceEngine @@ -91,4 +91,4 @@ class VoEWrapper { }; } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ +#endif // MEDIA_ENGINE_WEBRTCVOE_H_ diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc index d202106be0..271ace1212 100644 --- a/media/engine/webrtcvoiceengine.cc +++ b/media/engine/webrtcvoiceengine.cc @@ -10,7 +10,7 @@ #ifdef HAVE_WEBRTC_VOICE -#include "webrtc/media/engine/webrtcvoiceengine.h" +#include "media/engine/webrtcvoiceengine.h" #include #include @@ -18,32 +18,32 @@ #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/media/base/audiosource.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/engine/adm_helpers.h" -#include "webrtc/media/engine/apm_helpers.h" -#include "webrtc/media/engine/payload_type_mapper.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/media/engine/webrtcvoe.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "api/call/audio_sink.h" +#include "media/base/audiosource.h" +#include "media/base/mediaconstants.h" +#include "media/base/streamparams.h" +#include "media/engine/adm_helpers.h" +#include "media/engine/apm_helpers.h" +#include "media/engine/payload_type_mapper.h" +#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtcvoe.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/base64.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/transmit_mixer.h" namespace cricket { namespace { diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h index a42459ab79..e27857696a 100644 --- a/media/engine/webrtcvoiceengine.h +++ b/media/engine/webrtcvoiceengine.h @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ #include #include #include #include -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/call/audio_state.h" -#include "webrtc/call/call.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/engine/apm_helpers.h" -#include "webrtc/media/engine/webrtccommon.h" -#include "webrtc/media/engine/webrtcvoe.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/rtpreceiverinterface.h" +#include "call/audio_state.h" +#include "call/call.h" +#include "media/base/rtputils.h" +#include "media/engine/apm_helpers.h" +#include "media/engine/webrtccommon.h" +#include "media/engine/webrtcvoe.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "pc/channel.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_checker.h" namespace webrtc { namespace voe { @@ -308,4 +308,4 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, }; } // namespace cricket -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ diff --git a/media/engine/webrtcvoiceengine_unittest.cc b/media/engine/webrtcvoiceengine_unittest.cc index edb861ec2e..2c31253114 100644 --- a/media/engine/webrtcvoiceengine_unittest.cc +++ b/media/engine/webrtcvoiceengine_unittest.cc @@ -10,29 +10,29 @@ #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakenetworkinterface.h" -#include "webrtc/media/base/fakertp.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/media/engine/fakewebrtcvoiceengine.h" -#include "webrtc/media/engine/webrtcvoiceengine.h" -#include "webrtc/modules/audio_device/include/mock_audio_device.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" -#include "webrtc/test/mock_audio_encoder_factory.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakenetworkinterface.h" +#include "media/base/fakertp.h" +#include "media/base/mediaconstants.h" +#include "media/engine/fakewebrtccall.h" +#include "media/engine/fakewebrtcvoiceengine.h" +#include "media/engine/webrtcvoiceengine.h" +#include "modules/audio_device/include/mock_audio_device.h" +#include "modules/audio_processing/include/mock_audio_processing.h" +#include "pc/channel.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/field_trial.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" +#include "test/mock_audio_encoder_factory.h" +#include "voice_engine/transmit_mixer.h" using testing::_; using testing::ContainerEq; diff --git a/media/sctp/sctptransport.cc b/media/sctp/sctptransport.cc index 2dcc339032..42780f0e69 100644 --- a/media/sctp/sctptransport.cc +++ b/media/sctp/sctptransport.cc @@ -18,7 +18,7 @@ enum PreservedErrno { }; } -#include "webrtc/media/sctp/sctptransport.h" +#include "media/sctp/sctptransport.h" #include #include @@ -27,18 +27,18 @@ enum PreservedErrno { #include #include "usrsctplib/usrsctp.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/p2p/base/dtlstransportinternal.h" // For PF_NORMAL -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/trace_event.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.h" +#include "media/base/streamparams.h" +#include "p2p/base/dtlstransportinternal.h" // For PF_NORMAL +#include "rtc_base/arraysize.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/trace_event.h" namespace { diff --git a/media/sctp/sctptransport.h b/media/sctp/sctptransport.h index 8733603003..e99784dbe3 100644 --- a/media/sctp/sctptransport.h +++ b/media/sctp/sctptransport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_SCTP_SCTPTRANSPORT_H_ -#define WEBRTC_MEDIA_SCTP_SCTPTRANSPORT_H_ +#ifndef MEDIA_SCTP_SCTPTRANSPORT_H_ +#define MEDIA_SCTP_SCTPTRANSPORT_H_ #include @@ -18,14 +18,14 @@ #include #include -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" // For SendDataParams/ReceiveDataParams. -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/sctp/sctptransportinternal.h" +#include "media/base/mediachannel.h" +#include "media/sctp/sctptransportinternal.h" // Defined by "usrsctplib/usrsctp.h" struct sockaddr_conn; @@ -190,4 +190,4 @@ class SctpTransportFactory : public SctpTransportInternalFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_SCTP_SCTPTRANSPORT_H_ +#endif // MEDIA_SCTP_SCTPTRANSPORT_H_ diff --git a/media/sctp/sctptransport_unittest.cc b/media/sctp/sctptransport_unittest.cc index b2d7848798..92f7cbb2a8 100644 --- a/media/sctp/sctptransport_unittest.cc +++ b/media/sctp/sctptransport_unittest.cc @@ -16,15 +16,15 @@ #include #include -#include "webrtc/media/sctp/sctptransport.h" -#include "webrtc/p2p/base/fakedtlstransport.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" +#include "media/sctp/sctptransport.h" +#include "p2p/base/fakedtlstransport.h" +#include "rtc_base/bind.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" namespace { static const int kDefaultTimeout = 10000; // 10 seconds. diff --git a/media/sctp/sctptransportinternal.h b/media/sctp/sctptransportinternal.h index 620fdd6307..c8c606ed11 100644 --- a/media/sctp/sctptransportinternal.h +++ b/media/sctp/sctptransportinternal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ -#define WEBRTC_MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ +#ifndef MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ +#define MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ // TODO(deadbeef): Move SCTP code out of media/, and make it not depend on // anything in media/. @@ -18,13 +18,13 @@ #include #include -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/thread.h" // For SendDataParams/ReceiveDataParams. // TODO(deadbeef): Use something else for SCTP. It's confusing that we use an // SSRC field for SID. -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/p2p/base/packettransportinternal.h" +#include "media/base/mediachannel.h" +#include "p2p/base/packettransportinternal.h" namespace cricket { @@ -134,4 +134,4 @@ class SctpTransportInternalFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ +#endif // MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ diff --git a/modules/BUILD.gn b/modules/BUILD.gn index ead7855755..7a3ea2ad62 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -44,10 +44,10 @@ rtc_source_set("module_api") { if (rtc_include_tests) { modules_tests_resources = [ - "../../resources/audio_coding/testfile32kHz.pcm", - "../../resources/audio_coding/teststereo32kHz.pcm", - "../../resources/foreman_cif.yuv", - "../../resources/paris_qcif.yuv", + "../resources/audio_coding/testfile32kHz.pcm", + "../resources/audio_coding/teststereo32kHz.pcm", + "../resources/foreman_cif.yuv", + "../resources/paris_qcif.yuv", ] if (is_ios) { @@ -106,104 +106,104 @@ if (rtc_include_tests) { } modules_unittests_resources = [ - "../../resources/att-downlink.rx", - "../../resources/att-uplink.rx", - "../../resources/audio_coding/neteq_opus.rtp", - "../../resources/audio_coding/neteq_universal_new.rtp", - "../../resources/audio_coding/speech_mono_16kHz.pcm", - "../../resources/audio_coding/speech_mono_32_48kHz.pcm", - "../../resources/audio_coding/testfile32kHz.pcm", - "../../resources/audio_coding/teststereo32kHz.pcm", - "../../resources/audio_device/audio_short16.pcm", - "../../resources/audio_device/audio_short44.pcm", - "../../resources/audio_device/audio_short48.pcm", - "../../resources/audio_processing/agc/agc_audio.pcm", - "../../resources/audio_processing/agc/agc_no_circular_buffer.dat", - "../../resources/audio_processing/agc/agc_pitch_gain.dat", - "../../resources/audio_processing/agc/agc_pitch_lag.dat", - "../../resources/audio_processing/agc/agc_spectral_peak.dat", - "../../resources/audio_processing/agc/agc_vad.dat", - "../../resources/audio_processing/agc/agc_voicing_prob.dat", - "../../resources/audio_processing/agc/agc_with_circular_buffer.dat", - "../../resources/audio_processing/output_data_fixed.pb", - "../../resources/audio_processing/output_data_float.pb", - "../../resources/audio_processing/output_data_mac.pb", - "../../resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm", - "../../resources/audio_processing/transient/audio16kHz.pcm", - "../../resources/audio_processing/transient/audio32kHz.pcm", - "../../resources/audio_processing/transient/audio48kHz.pcm", - "../../resources/audio_processing/transient/audio8kHz.pcm", - "../../resources/audio_processing/transient/detect16kHz.dat", - "../../resources/audio_processing/transient/detect32kHz.dat", - "../../resources/audio_processing/transient/detect48kHz.dat", - "../../resources/audio_processing/transient/detect8kHz.dat", - "../../resources/audio_processing/transient/double-utils.dat", - "../../resources/audio_processing/transient/float-utils.dat", - "../../resources/audio_processing/transient/suppressed16kHz.pcm", - "../../resources/audio_processing/transient/suppressed32kHz.pcm", - "../../resources/audio_processing/transient/suppressed8kHz.pcm", - "../../resources/audio_processing/transient/wpd0.dat", - "../../resources/audio_processing/transient/wpd1.dat", - "../../resources/audio_processing/transient/wpd2.dat", - "../../resources/audio_processing/transient/wpd3.dat", - "../../resources/audio_processing/transient/wpd4.dat", - "../../resources/audio_processing/transient/wpd5.dat", - "../../resources/audio_processing/transient/wpd6.dat", - "../../resources/audio_processing/transient/wpd7.dat", - "../../resources/deflicker_before_cif_short.yuv", - "../../resources/far16_stereo.pcm", - "../../resources/far32_stereo.pcm", - "../../resources/far44_stereo.pcm", - "../../resources/far48_stereo.pcm", - "../../resources/far8_stereo.pcm", - "../../resources/foremanColorEnhanced_cif_short.yuv", - "../../resources/foreman_cif.yuv", - "../../resources/foreman_cif_short.yuv", - "../../resources/near16_stereo.pcm", - "../../resources/near32_stereo.pcm", - "../../resources/near44_stereo.pcm", - "../../resources/near48_stereo.pcm", - "../../resources/near8_stereo.pcm", - "../../resources/ref03.aecdump", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin", - "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin", - "../../resources/short_mixed_mono_48.dat", - "../../resources/short_mixed_mono_48_arm.dat", - "../../resources/short_mixed_mono_48.pcm", - "../../resources/short_mixed_stereo_48.dat", - "../../resources/short_mixed_stereo_48.pcm", - "../../resources/sprint-downlink.rx", - "../../resources/sprint-uplink.rx", - "../../resources/synthetic-trace.rx", - "../../resources/tmobile-downlink.rx", - "../../resources/tmobile-uplink.rx", - "../../resources/verizon3g-downlink.rx", - "../../resources/verizon3g-uplink.rx", - "../../resources/verizon4g-downlink.rx", - "../../resources/verizon4g-uplink.rx", - "../../resources/voice_engine/audio_tiny48.wav", + "../resources/att-downlink.rx", + "../resources/att-uplink.rx", + "../resources/audio_coding/neteq_opus.rtp", + "../resources/audio_coding/neteq_universal_new.rtp", + "../resources/audio_coding/speech_mono_16kHz.pcm", + "../resources/audio_coding/speech_mono_32_48kHz.pcm", + "../resources/audio_coding/testfile32kHz.pcm", + "../resources/audio_coding/teststereo32kHz.pcm", + "../resources/audio_device/audio_short16.pcm", + "../resources/audio_device/audio_short44.pcm", + "../resources/audio_device/audio_short48.pcm", + "../resources/audio_processing/agc/agc_audio.pcm", + "../resources/audio_processing/agc/agc_no_circular_buffer.dat", + "../resources/audio_processing/agc/agc_pitch_gain.dat", + "../resources/audio_processing/agc/agc_pitch_lag.dat", + "../resources/audio_processing/agc/agc_spectral_peak.dat", + "../resources/audio_processing/agc/agc_vad.dat", + "../resources/audio_processing/agc/agc_voicing_prob.dat", + "../resources/audio_processing/agc/agc_with_circular_buffer.dat", + "../resources/audio_processing/output_data_fixed.pb", + "../resources/audio_processing/output_data_float.pb", + "../resources/audio_processing/output_data_mac.pb", + "../resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm", + "../resources/audio_processing/transient/audio16kHz.pcm", + "../resources/audio_processing/transient/audio32kHz.pcm", + "../resources/audio_processing/transient/audio48kHz.pcm", + "../resources/audio_processing/transient/audio8kHz.pcm", + "../resources/audio_processing/transient/detect16kHz.dat", + "../resources/audio_processing/transient/detect32kHz.dat", + "../resources/audio_processing/transient/detect48kHz.dat", + "../resources/audio_processing/transient/detect8kHz.dat", + "../resources/audio_processing/transient/double-utils.dat", + "../resources/audio_processing/transient/float-utils.dat", + "../resources/audio_processing/transient/suppressed16kHz.pcm", + "../resources/audio_processing/transient/suppressed32kHz.pcm", + "../resources/audio_processing/transient/suppressed8kHz.pcm", + "../resources/audio_processing/transient/wpd0.dat", + "../resources/audio_processing/transient/wpd1.dat", + "../resources/audio_processing/transient/wpd2.dat", + "../resources/audio_processing/transient/wpd3.dat", + "../resources/audio_processing/transient/wpd4.dat", + "../resources/audio_processing/transient/wpd5.dat", + "../resources/audio_processing/transient/wpd6.dat", + "../resources/audio_processing/transient/wpd7.dat", + "../resources/deflicker_before_cif_short.yuv", + "../resources/far16_stereo.pcm", + "../resources/far32_stereo.pcm", + "../resources/far44_stereo.pcm", + "../resources/far48_stereo.pcm", + "../resources/far8_stereo.pcm", + "../resources/foremanColorEnhanced_cif_short.yuv", + "../resources/foreman_cif.yuv", + "../resources/foreman_cif_short.yuv", + "../resources/near16_stereo.pcm", + "../resources/near32_stereo.pcm", + "../resources/near44_stereo.pcm", + "../resources/near48_stereo.pcm", + "../resources/near8_stereo.pcm", + "../resources/ref03.aecdump", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin", + "../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin", + "../resources/short_mixed_mono_48.dat", + "../resources/short_mixed_mono_48_arm.dat", + "../resources/short_mixed_mono_48.pcm", + "../resources/short_mixed_stereo_48.dat", + "../resources/short_mixed_stereo_48.pcm", + "../resources/sprint-downlink.rx", + "../resources/sprint-uplink.rx", + "../resources/synthetic-trace.rx", + "../resources/tmobile-downlink.rx", + "../resources/tmobile-uplink.rx", + "../resources/verizon3g-downlink.rx", + "../resources/verizon3g-uplink.rx", + "../resources/verizon4g-downlink.rx", + "../resources/verizon4g-uplink.rx", + "../resources/voice_engine/audio_tiny48.wav", ] if (is_ios) { bundle_data("modules_unittests_bundle_data") { diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index d415098e98..ffa88af0f2 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -871,13 +871,13 @@ if (rtc_enable_protobuf) { deps = [ ":ana_config_proto", ] - proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" + proto_out_dir = "modules/audio_coding/audio_network_adaptor" } proto_library("ana_config_proto") { sources = [ "audio_network_adaptor/config.proto", ] - proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" + proto_out_dir = "modules/audio_coding/audio_network_adaptor" } } @@ -1461,7 +1461,7 @@ if (rtc_include_tests) { } # insert_packet_with_timing audio_decoder_unittests_resources = - [ "../../../resources/audio_coding/testfile32kHz.pcm" ] + [ "../../resources/audio_coding/testfile32kHz.pcm" ] if (is_ios) { bundle_data("audio_decoder_unittests_bundle_data") { @@ -1519,7 +1519,7 @@ if (rtc_include_tests) { sources = [ "neteq/neteq_unittest.proto", ] - proto_out_dir = "webrtc/modules/audio_coding/neteq" + proto_out_dir = "modules/audio_coding/neteq" } rtc_test("neteq_rtpplay") { @@ -1940,7 +1940,7 @@ if (rtc_include_tests) { ] data = [ - "../../../resources/speech_and_misc_wb.pcm", + "../../resources/speech_and_misc_wb.pcm", ] if (is_win) { diff --git a/modules/audio_coding/DEPS b/modules/audio_coding/DEPS index 3a745ffa99..3dc9624a4b 100644 --- a/modules/audio_coding/DEPS +++ b/modules/audio_coding/DEPS @@ -1,7 +1,7 @@ include_rules = [ - "+webrtc/call", - "+webrtc/common_audio", - "+webrtc/logging/rtc_event_log", - "+webrtc/audio_coding/neteq/neteq_unittest.pb.h", # Different path. - "+webrtc/system_wrappers", + "+call", + "+common_audio", + "+logging/rtc_event_log", + "+audio_coding/neteq/neteq_unittest.pb.h", # Different path. + "+system_wrappers", ] diff --git a/modules/audio_coding/acm2/acm_codec_database.cc b/modules/audio_coding/acm2/acm_codec_database.cc index 7bd8ee7576..7b3b1d2327 100644 --- a/modules/audio_coding/acm2/acm_codec_database.cc +++ b/modules/audio_coding/acm2/acm_codec_database.cc @@ -15,11 +15,11 @@ // TODO(tlegrand): Change constant input pointers in all functions to constant // references, where appropriate. -#include "webrtc/modules/audio_coding/acm2/acm_codec_database.h" +#include "modules/audio_coding/acm2/acm_codec_database.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX)) #error iSAC and iSACFX codecs cannot be enabled at the same time diff --git a/modules/audio_coding/acm2/acm_codec_database.h b/modules/audio_coding/acm2/acm_codec_database.h index d586cb9e13..74275a3510 100644 --- a/modules/audio_coding/acm2/acm_codec_database.h +++ b/modules/audio_coding/acm2/acm_codec_database.h @@ -13,12 +13,12 @@ * codecs. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ +#define MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "typedefs.h" namespace webrtc { @@ -79,4 +79,4 @@ class ACMCodecDB { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ +#endif // MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ diff --git a/modules/audio_coding/acm2/acm_receive_test.cc b/modules/audio_coding/acm2/acm_receive_test.cc index 1eae859cbe..6cfe464a32 100644 --- a/modules/audio_coding/acm2/acm_receive_test.cc +++ b/modules/audio_coding/acm2/acm_receive_test.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/acm_receive_test.h" +#include "modules/audio_coding/acm2/acm_receive_test.h" #include #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/acm2/acm_receive_test.h b/modules/audio_coding/acm2/acm_receive_test.h index c7faa567ba..657a12467a 100644 --- a/modules/audio_coding/acm2/acm_receive_test.h +++ b/modules/audio_coding/acm2/acm_receive_test.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ +#define MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "system_wrappers/include/clock.h" namespace webrtc { class AudioCodingModule; @@ -93,4 +93,4 @@ class AcmReceiveTestToggleOutputFreqOldApi : public AcmReceiveTestOldApi { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ +#endif // MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_H_ diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc index 8912eaa70c..f8393ed7e0 100644 --- a/modules/audio_coding/acm2/acm_receiver.cc +++ b/modules/audio_coding/acm2/acm_receiver.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/acm_receiver.h" +#include "modules/audio_coding/acm2/acm_receiver.h" #include // malloc #include // sort #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/acm2/acm_resampler.h" -#include "webrtc/modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/audio_codecs/audio_decoder.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_types.h" +#include "modules/audio_coding/acm2/acm_resampler.h" +#include "modules/audio_coding/acm2/call_statistics.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h index 93ff89cb68..b8b017b0f4 100644 --- a/modules/audio_coding/acm2/acm_receiver.h +++ b/modules/audio_coding/acm2/acm_receiver.h @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ +#define MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/modules/audio_coding/acm2/acm_resampler.h" -#include "webrtc/modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "modules/audio_coding/acm2/acm_resampler.h" +#include "modules/audio_coding/acm2/call_statistics.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -291,4 +291,4 @@ class AcmReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ +#endif // MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc index 4026c5b8e4..8fbea84413 100644 --- a/modules/audio_coding/acm2/acm_receiver_unittest.cc +++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/acm_receiver.h" +#include "modules/audio_coding/acm2/acm_receiver.h" #include // std::min #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_resampler.cc b/modules/audio_coding/acm2/acm_resampler.cc index 555263a2d1..3cd7caa4ee 100644 --- a/modules/audio_coding/acm2/acm_resampler.cc +++ b/modules/audio_coding/acm2/acm_resampler.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/acm_resampler.h" +#include "modules/audio_coding/acm2/acm_resampler.h" #include #include -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/rtc_base/logging.h" +#include "common_audio/resampler/include/resampler.h" +#include "rtc_base/logging.h" namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/acm2/acm_resampler.h b/modules/audio_coding/acm2/acm_resampler.h index 268db8b752..462201f9a8 100644 --- a/modules/audio_coding/acm2/acm_resampler.h +++ b/modules/audio_coding/acm2/acm_resampler.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ +#define MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/typedefs.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "typedefs.h" namespace webrtc { namespace acm2 { @@ -36,4 +36,4 @@ class ACMResampler { } // namespace acm2 } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ +#endif // MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ diff --git a/modules/audio_coding/acm2/acm_send_test.cc b/modules/audio_coding/acm2/acm_send_test.cc index a88ba7d3a0..d5f196b9a2 100644 --- a/modules/audio_coding/acm2/acm_send_test.cc +++ b/modules/audio_coding/acm2/acm_send_test.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/acm_send_test.h" +#include "modules/audio_coding/acm2/acm_send_test.h" #include #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/audio_encoder.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/acm2/acm_send_test.h b/modules/audio_coding/acm2/acm_send_test.h index b451e994c6..6aea0f1b52 100644 --- a/modules/audio_coding/acm2/acm_send_test.h +++ b/modules/audio_coding/acm2/acm_send_test.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ +#define MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" namespace webrtc { class AudioEncoder; @@ -85,4 +85,4 @@ class AcmSendTestOldApi : public AudioPacketizationCallback, } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ +#endif // MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_H_ diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc index 0244882de6..1f108f5ed9 100644 --- a/modules/audio_coding/acm2/audio_coding_module.cc +++ b/modules/audio_coding/acm2/audio_coding_module.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module.h" #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/acm2/acm_receiver.h" -#include "webrtc/modules/audio_coding/acm2/acm_resampler.h" -#include "webrtc/modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/acm2/acm_receiver.h" +#include "modules/audio_coding/acm2/acm_resampler.h" +#include "modules/audio_coding/acm2/codec_manager.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index 9c7e4cd97f..80fc4d80b7 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -13,38 +13,38 @@ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/acm2/acm_receive_test.h" -#include "webrtc/modules/audio_coding/acm2/acm_send_test.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/md5digest.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder.h" -#include "webrtc/test/mock_audio_encoder.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/acm2/acm_receive_test.h" +#include "modules/audio_coding/acm2/acm_send_test.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/tools/audio_checksum.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "modules/audio_coding/neteq/tools/constant_pcm_packet_source.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/output_audio_file.h" +#include "modules/audio_coding/neteq/tools/output_wav_file.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/md5digest.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder.h" +#include "test/mock_audio_encoder.h" +#include "test/testsupport/fileutils.h" using ::testing::AtLeast; using ::testing::Invoke; diff --git a/modules/audio_coding/acm2/call_statistics.cc b/modules/audio_coding/acm2/call_statistics.cc index 28511e90b6..a506ead30e 100644 --- a/modules/audio_coding/acm2/call_statistics.cc +++ b/modules/audio_coding/acm2/call_statistics.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/call_statistics.h" +#include "modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/call_statistics.h b/modules/audio_coding/acm2/call_statistics.h index 3993319e89..462afb525c 100644 --- a/modules/audio_coding/acm2/call_statistics.h +++ b/modules/audio_coding/acm2/call_statistics.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ +#define MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" // // This class is for book keeping of calls to ACM. It is not useful to log API @@ -61,4 +61,4 @@ class CallStatistics { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ +#endif // MODULES_AUDIO_CODING_ACM2_CALL_STATISTICS_H_ diff --git a/modules/audio_coding/acm2/call_statistics_unittest.cc b/modules/audio_coding/acm2/call_statistics_unittest.cc index ce4468a5f3..77c3863ea8 100644 --- a/modules/audio_coding/acm2/call_statistics_unittest.cc +++ b/modules/audio_coding/acm2/call_statistics_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/acm2/call_statistics.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/codec_manager.cc b/modules/audio_coding/acm2/codec_manager.cc index 7bbafc732a..63f0244752 100644 --- a/modules/audio_coding/acm2/codec_manager.cc +++ b/modules/audio_coding/acm2/codec_manager.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/codec_manager.h" +#include "modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/rtc_base/checks.h" -//#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +//#include "rtc_base/format_macros.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "rtc_base/logging.h" +#include "typedefs.h" namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/acm2/codec_manager.h b/modules/audio_coding/acm2/codec_manager.h index b5c8d3e53c..00652cc2b7 100644 --- a/modules/audio_coding/acm2/codec_manager.h +++ b/modules/audio_coding/acm2/codec_manager.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ +#define MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -72,4 +72,4 @@ class CodecManager final { } // namespace acm2 } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ +#endif // MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ diff --git a/modules/audio_coding/acm2/codec_manager_unittest.cc b/modules/audio_coding/acm2/codec_manager_unittest.cc index 4dfcbda044..e041b5e97a 100644 --- a/modules/audio_coding/acm2/codec_manager_unittest.cc +++ b/modules/audio_coding/acm2/codec_manager_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" +#include "modules/audio_coding/acm2/codec_manager.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/acm2/rent_a_codec.cc b/modules/audio_coding/acm2/rent_a_codec.cc index 3bc1464908..82a1a8d4ca 100644 --- a/modules/audio_coding/acm2/rent_a_codec.cc +++ b/modules/audio_coding/acm2/rent_a_codec.cc @@ -8,39 +8,39 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" #include #include -#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "rtc_base/logging.h" #ifdef WEBRTC_CODEC_G722 -#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" #endif #ifdef WEBRTC_CODEC_ILBC -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" #endif #ifdef WEBRTC_CODEC_ISACFX -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" // nogncheck -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" // nogncheck +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" // nogncheck +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" // nogncheck #endif #ifdef WEBRTC_CODEC_ISAC -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" // nogncheck -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" // nogncheck +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" // nogncheck +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" // nogncheck #endif #ifdef WEBRTC_CODEC_OPUS -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" #endif -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" #ifdef WEBRTC_CODEC_RED -#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" +#include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h" #endif -#include "webrtc/modules/audio_coding/acm2/acm_codec_database.h" +#include "modules/audio_coding/acm2/acm_codec_database.h" #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC) -#include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" #endif namespace webrtc { diff --git a/modules/audio_coding/acm2/rent_a_codec.h b/modules/audio_coding/acm2/rent_a_codec.h index 6dcf793d04..7dd2d6b024 100644 --- a/modules/audio_coding/acm2/rent_a_codec.h +++ b/modules/audio_coding/acm2/rent_a_codec.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ +#ifndef MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ +#define MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/optional.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/neteq/neteq_decoder_enum.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -204,4 +204,4 @@ class RentACodec { } // namespace acm2 } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ +#endif // MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ diff --git a/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/modules/audio_coding/acm2/rent_a_codec_unittest.cc index dcf63834ef..9eded20d23 100644 --- a/modules/audio_coding/acm2/rent_a_codec_unittest.cc +++ b/modules/audio_coding/acm2/rent_a_codec_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc index e367e109f4..55b326d548 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc index e2786ca873..54423e67b9 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" +#include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h index 8e76db268c..14000fed14 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -90,4 +90,4 @@ class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index a0dc12cebc..d297d27c88 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" +#include "rtc_base/fakeclock.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc index b585ce3ec0..587c858ece 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h" +#include "modules/audio_coding/audio_network_adaptor/bitrate_controller.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace audio_network_adaptor { diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h index 740edbd4e0..cad6d6a71b 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace audio_network_adaptor { @@ -46,4 +46,4 @@ class BitrateController final : public Controller { } // namespace audio_network_adaptor } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc index 9fab781010..97269923c3 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/bitrate_controller.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { namespace audio_network_adaptor { diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller.cc b/modules/audio_coding/audio_network_adaptor/channel_controller.cc index 052808d71a..55a913a5f3 100644 --- a/modules/audio_coding/audio_network_adaptor/channel_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/channel_controller.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/audio_network_adaptor/channel_controller.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller.h b/modules/audio_coding/audio_network_adaptor/channel_controller.h index 4920668d79..f53ddd6b19 100644 --- a/modules/audio_coding/audio_network_adaptor/channel_controller.h +++ b/modules/audio_coding/audio_network_adaptor/channel_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -50,4 +50,4 @@ class ChannelController final : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc index 980292c733..73160fe224 100644 --- a/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/channel_controller.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/controller.cc b/modules/audio_coding/audio_network_adaptor/controller.cc index 549352f36a..5e2dc859bf 100644 --- a/modules/audio_coding/audio_network_adaptor/controller.cc +++ b/modules/audio_coding/audio_network_adaptor/controller.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/controller.h b/modules/audio_coding/audio_network_adaptor/controller.h index 38c2c2122a..af2f569f89 100644 --- a/modules/audio_coding/audio_network_adaptor/controller.h +++ b/modules/audio_coding/audio_network_adaptor/controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "api/optional.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" namespace webrtc { @@ -40,4 +40,4 @@ class Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/modules/audio_coding/audio_network_adaptor/controller_manager.cc index 425c213c39..319e752d7b 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager.cc +++ b/modules/audio_coding/audio_network_adaptor/controller_manager.cc @@ -8,28 +8,28 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/audio_coding/audio_network_adaptor/bitrate_controller.h" +#include "modules/audio_coding/audio_network_adaptor/channel_controller.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "modules/audio_coding/audio_network_adaptor/dtx_controller.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" +#include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h" +#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/timeutils.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" #else -#include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" +#include "modules/audio_coding/audio_network_adaptor/config.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.h b/modules/audio_coding/audio_network_adaptor/controller_manager.h index 600fe65c10..5c63f2f514 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager.h +++ b/modules/audio_coding/audio_network_adaptor/controller_manager.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ #include #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/protobuf_utils.h" namespace webrtc { @@ -120,4 +120,4 @@ class ControllerManagerImpl final : public ControllerManager { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_MANAGER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc index aa4ff36502..846397a137 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc @@ -10,20 +10,20 @@ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" +#include "test/gtest.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" #else -#include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" +#include "modules/audio_coding/audio_network_adaptor/config.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc index b3e87766f7..97de177164 100644 --- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc +++ b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.pb.h" #else -#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.pb.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h index 0d9206d3b4..e40c8328af 100644 --- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h +++ b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ignore_wundef.h" +#include "system_wrappers/include/file_wrapper.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" #else -#include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" +#include "modules/audio_coding/audio_network_adaptor/config.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif @@ -52,4 +52,4 @@ class DebugDumpWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP_WRITER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller.cc index 1941a5e171..7c7d6ade1a 100644 --- a/modules/audio_coding/audio_network_adaptor/dtx_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/dtx_controller.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/audio_network_adaptor/dtx_controller.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/modules/audio_coding/audio_network_adaptor/dtx_controller.h index 2945e1163a..8a2427ed7c 100644 --- a/modules/audio_coding/audio_network_adaptor/dtx_controller.h +++ b/modules/audio_coding/audio_network_adaptor/dtx_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -46,4 +46,4 @@ class DtxController final : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc index 73527ee13c..2c58249506 100644 --- a/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/dtx_controller.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc index b4fcbfd5ea..a070b77baa 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/modules/audio_coding/audio_network_adaptor/event_log_writer.h index 7f7acef17f..fca8e53b66 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.h +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class RtcEventLog; @@ -39,4 +39,4 @@ class EventLogWriter final { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc index 443e4d1750..38537054bd 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h" -#include "webrtc/test/gtest.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc index 58644b9f1a..80cc695342 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h index 9259f309a4..c2735370d0 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ #include -#include "webrtc/common_audio/smoothing_filter.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_audio/smoothing_filter.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -69,4 +69,4 @@ class FecControllerPlrBased final : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BASED_H_ diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc index 1ae7b453c9..41d959d482 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/common_audio/mocks/mock_smoothing_filter.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" -#include "webrtc/test/gtest.h" +#include "common_audio/mocks/mock_smoothing_filter.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc index 0cf6d3bc39..eb56ea0dee 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h index ce04dc7698..ade55aea5d 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -63,4 +63,4 @@ class FecControllerRplrBased final : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc index a7b057ceb8..f20122fd2c 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc index 4dd6088829..9a5f032213 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h" +#include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h index 47a48fcd6f..bbda77ed52 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -78,4 +78,4 @@ class FrameLengthController final : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc index d2b535cd64..fa0af7dde6 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h index a91b33b34f..7687446cac 100644 --- a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h +++ b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/optional.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" namespace webrtc { @@ -49,4 +49,4 @@ class AudioNetworkAdaptor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ diff --git a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h index 148dec2aa8..5b2d11371b 100644 --- a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h +++ b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -36,4 +36,4 @@ struct AudioEncoderRuntimeConfig { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h b/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h index f58a48285b..15dc741e29 100644 --- a/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h +++ b/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "test/gmock.h" namespace webrtc { @@ -46,4 +46,4 @@ class MockAudioNetworkAdaptor : public AudioNetworkAdaptor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_AUDIO_NETWORK_ADAPTOR_H_ diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h index e856601802..df28e9e26f 100644 --- a/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h +++ b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "test/gmock.h" namespace webrtc { @@ -27,4 +27,4 @@ class MockController : public Controller { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h index 4976fd8d87..8d410a742d 100644 --- a/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h +++ b/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "test/gmock.h" namespace webrtc { @@ -30,4 +30,4 @@ class MockControllerManager : public ControllerManager { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_MANAGER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h index fba9ccce1f..06650abbd6 100644 --- a/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h +++ b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ -#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "test/gmock.h" namespace webrtc { @@ -37,4 +37,4 @@ class MockDebugDumpWriter : public DebugDumpWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ diff --git a/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h b/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h index 2f816db6a7..0375386e39 100644 --- a/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h +++ b/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ +#ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ +#define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -115,4 +115,4 @@ class ThresholdCurve { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ +#endif // MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ diff --git a/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc b/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc index 0897d0db94..0375e76609 100644 --- a/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/util/threshold_curve_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "test/gtest.h" // A threshold curve divides 2D space into three domains - below, on and above // the threshold curve. diff --git a/modules/audio_coding/codecs/audio_decoder.h b/modules/audio_coding/codecs/audio_decoder.h index da0628254d..b7b15cdd6e 100644 --- a/modules/audio_coding/codecs/audio_decoder.h +++ b/modules/audio_coding/codecs/audio_decoder.h @@ -12,9 +12,9 @@ // webrtc/api/audio_codecs/audio_decoder.h instead! // TODO(kwiberg): Remove it. -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ +#define MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_decoder.h" -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ +#endif // MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ diff --git a/modules/audio_coding/codecs/audio_encoder.h b/modules/audio_coding/codecs/audio_encoder.h index 942abb6f0d..010ae6705f 100644 --- a/modules/audio_coding/codecs/audio_encoder.h +++ b/modules/audio_coding/codecs/audio_encoder.h @@ -12,9 +12,9 @@ // webrtc/api/audio_codecs/audio_encoder.h instead! // TODO(ossu): Remove it. -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ +#define MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ -#include "webrtc/api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_encoder.h" -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ +#endif // MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ diff --git a/modules/audio_coding/codecs/audio_format_conversion.cc b/modules/audio_coding/codecs/audio_format_conversion.cc index 1e53bf35fc..39b0963247 100644 --- a/modules/audio_coding/codecs/audio_format_conversion.cc +++ b/modules/audio_coding/codecs/audio_format_conversion.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/sanitizer.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/audio_format_conversion.h b/modules/audio_coding/codecs/audio_format_conversion.h index 0fa3a5034d..23b45f602b 100644 --- a/modules/audio_coding/codecs/audio_format_conversion.h +++ b/modules/audio_coding/codecs/audio_format_conversion.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ +#define MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/common_types.h" +#include "api/audio_codecs/audio_format.h" +#include "common_types.h" namespace webrtc { @@ -21,4 +21,4 @@ CodecInst SdpToCodecInst(int payload_type, const SdpAudioFormat& audio_format); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ +#endif // MODULES_AUDIO_CODING_CODECS_AUDIO_FORMAT_CONVERSION_H_ diff --git a/modules/audio_coding/codecs/builtin_audio_decoder_factory.h b/modules/audio_coding/codecs/builtin_audio_decoder_factory.h index 7e6407aded..7494ac0e6d 100644 --- a/modules/audio_coding/codecs/builtin_audio_decoder_factory.h +++ b/modules/audio_coding/codecs/builtin_audio_decoder_factory.h @@ -12,9 +12,9 @@ // webrtc/api/audio_codecs/builtin_audio_decoder_factory.h instead! // TODO(kwiberg): Remove it. -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#define MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ +#endif // MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ diff --git a/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc b/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc index f6b44b6d3f..27b89b6b34 100644 --- a/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc +++ b/modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/builtin_audio_encoder_factory.h b/modules/audio_coding/codecs/builtin_audio_encoder_factory.h index fd0ed79bc5..6ec765ab97 100644 --- a/modules/audio_coding/codecs/builtin_audio_encoder_factory.h +++ b/modules/audio_coding/codecs/builtin_audio_encoder_factory.h @@ -12,9 +12,9 @@ // webrtc/api/audio_codecs/builtin_audio_decoder_factory.h instead! // TODO(ossu): Remove it. -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#define MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ +#endif // MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ diff --git a/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc b/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc index 1446268c1b..3955e4ab65 100644 --- a/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc +++ b/modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc @@ -12,9 +12,9 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc index 52661d32fa..78148ab350 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" #include #include diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/modules/audio_coding/codecs/cng/audio_encoder_cng.h index 66305e6ab9..4491289f28 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng.h +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ +#define MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/common_audio/vad/include/vad.h" -#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_encoder.h" +#include "common_audio/vad/include/vad.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -93,4 +93,4 @@ class AudioEncoderCng final : public AudioEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ +#endif // MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc index 5de1b03c84..ef3ff31337 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/common_audio/vad/mock/mock_vad.h" -#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" +#include "common_audio/vad/mock/mock_vad.h" +#include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "rtc_base/constructormagic.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" using ::testing::Return; using ::testing::_; diff --git a/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc index 3835e935d5..54e5189d30 100644 --- a/modules/audio_coding/codecs/cng/cng_unittest.cc +++ b/modules/audio_coding/codecs/cng/cng_unittest.cc @@ -10,9 +10,9 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.cc b/modules/audio_coding/codecs/cng/webrtc_cng.cc index b891d8423d..e2a3347a87 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.cc +++ b/modules/audio_coding/codecs/cng/webrtc_cng.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.h b/modules/audio_coding/codecs/cng/webrtc_cng.h index 98231e7be4..7653fbdb3f 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.h +++ b/modules/audio_coding/codecs/cng/webrtc_cng.h @@ -9,14 +9,14 @@ */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ +#define MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "rtc_base/buffer.h" +#include "typedefs.h" #define WEBRTC_CNG_MAX_LPC_ORDER 12 @@ -96,4 +96,4 @@ class ComfortNoiseEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ +#endif // MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc index fd285a75b2..a620a3ed7b 100644 --- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc +++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "modules/audio_coding/codecs/g711/g711_interface.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h index f72f202f37..29e4fa6593 100644 --- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h +++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ +#define MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -67,4 +67,4 @@ class AudioDecoderPcmA final : public AudioDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ +#endif // MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc index 711eed73de..b4384c5ee7 100644 --- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc +++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h" -#include "webrtc/rtc_base/checks.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g711/g711_interface.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h index 22a15a1cac..37b67cf72b 100644 --- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h +++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ +#define MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_encoder.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -121,4 +121,4 @@ class AudioEncoderPcmU final : public AudioEncoderPcm { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ +#endif // MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ diff --git a/modules/audio_coding/codecs/g711/g711.c b/modules/audio_coding/codecs/g711/g711.c index a183757ec5..ac9e44a651 100644 --- a/modules/audio_coding/codecs/g711/g711.c +++ b/modules/audio_coding/codecs/g711/g711.c @@ -21,7 +21,7 @@ */ #include "g711.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* Copied from the CCITT G.711 specification */ static const uint8_t ulaw_to_alaw_table[256] = { diff --git a/modules/audio_coding/codecs/g711/g711.h b/modules/audio_coding/codecs/g711/g711.h index 3b07d8ba8f..f34d266677 100644 --- a/modules/audio_coding/codecs/g711/g711.h +++ b/modules/audio_coding/codecs/g711/g711.h @@ -49,7 +49,7 @@ specification by other means. extern "C" { #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(__i386__) /*! \brief Find the bit position of the highest set bit in a word diff --git a/modules/audio_coding/codecs/g711/g711_interface.c b/modules/audio_coding/codecs/g711/g711_interface.c index 5b96a9c555..52f73fb9d8 100644 --- a/modules/audio_coding/codecs/g711/g711_interface.c +++ b/modules/audio_coding/codecs/g711/g711_interface.c @@ -10,7 +10,7 @@ #include #include "g711.h" #include "g711_interface.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" size_t WebRtcG711_EncodeA(const int16_t* speechIn, size_t len, diff --git a/modules/audio_coding/codecs/g711/g711_interface.h b/modules/audio_coding/codecs/g711/g711_interface.h index 00854bbb2c..bfaac3adbf 100644 --- a/modules/audio_coding/codecs/g711/g711_interface.h +++ b/modules/audio_coding/codecs/g711/g711_interface.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ +#define MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // Comfort noise constants #define G711_WEBRTC_SPEECH 1 @@ -132,4 +132,4 @@ int16_t WebRtcG711_Version(char* version, int16_t lenBytes); } #endif -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ +#endif // MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ diff --git a/modules/audio_coding/codecs/g711/test/testG711.cc b/modules/audio_coding/codecs/g711/test/testG711.cc index 5675b1f8b0..98f3925faa 100644 --- a/modules/audio_coding/codecs/g711/test/testG711.cc +++ b/modules/audio_coding/codecs/g711/test/testG711.cc @@ -17,7 +17,7 @@ #include /* include API */ -#include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h" +#include "modules/audio_coding/codecs/g711/g711_interface.h" /* Runtime statistics */ #include diff --git a/modules/audio_coding/codecs/g722/audio_decoder_g722.cc b/modules/audio_coding/codecs/g722/audio_decoder_g722.cc index 7e597f80ac..ea4a721b12 100644 --- a/modules/audio_coding/codecs/g722/audio_decoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_decoder_g722.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" #include -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g722/audio_decoder_g722.h b/modules/audio_coding/codecs/g722/audio_decoder_g722.h index ee2270f323..324044886d 100644 --- a/modules/audio_coding/codecs/g722/audio_decoder_g722.h +++ b/modules/audio_coding/codecs/g722/audio_decoder_g722.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ +#define MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/constructormagic.h" typedef struct WebRtcG722DecInst G722DecInst; @@ -76,4 +76,4 @@ class AudioDecoderG722StereoImpl final : public AudioDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ +#endif // MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc index 4c3e82d037..1d0ca930b9 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.h b/modules/audio_coding/codecs/g722/audio_encoder_g722.h index b4d9ef01e4..1f4b943f66 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.h +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ +#define MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h" -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/g722/audio_encoder_g722_config.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -65,4 +65,4 @@ class AudioEncoderG722Impl final : public AudioEncoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ +#endif // MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ diff --git a/modules/audio_coding/codecs/g722/g722_decode.c b/modules/audio_coding/codecs/g722/g722_decode.c index 71646c5f84..28740df6ce 100644 --- a/modules/audio_coding/codecs/g722/g722_decode.c +++ b/modules/audio_coding/codecs/g722/g722_decode.c @@ -35,7 +35,7 @@ #include #include "g722_enc_dec.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" #if !defined(FALSE) #define FALSE 0 diff --git a/modules/audio_coding/codecs/g722/g722_enc_dec.h b/modules/audio_coding/codecs/g722/g722_enc_dec.h index 7db4895fa5..3074aede93 100644 --- a/modules/audio_coding/codecs/g722/g722_enc_dec.h +++ b/modules/audio_coding/codecs/g722/g722_enc_dec.h @@ -31,7 +31,7 @@ #if !defined(_G722_ENC_DEC_H_) #define _G722_ENC_DEC_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /*! \page g722_page G.722 encoding and decoding \section g722_page_sec_1 What does it do? diff --git a/modules/audio_coding/codecs/g722/g722_encode.c b/modules/audio_coding/codecs/g722/g722_encode.c index 2bd784bf4a..1771319f8b 100644 --- a/modules/audio_coding/codecs/g722/g722_encode.c +++ b/modules/audio_coding/codecs/g722/g722_encode.c @@ -35,7 +35,7 @@ #include #include "g722_enc_dec.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" #if !defined(FALSE) #define FALSE 0 diff --git a/modules/audio_coding/codecs/g722/g722_interface.c b/modules/audio_coding/codecs/g722/g722_interface.c index 4244d5c809..3c869d6e06 100644 --- a/modules/audio_coding/codecs/g722/g722_interface.c +++ b/modules/audio_coding/codecs/g722/g722_interface.c @@ -14,7 +14,7 @@ #include #include "g722_enc_dec.h" #include "g722_interface.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst) { diff --git a/modules/audio_coding/codecs/g722/g722_interface.h b/modules/audio_coding/codecs/g722/g722_interface.h index b411ef0e8e..74930cc3f2 100644 --- a/modules/audio_coding/codecs/g722/g722_interface.h +++ b/modules/audio_coding/codecs/g722/g722_interface.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ +#define MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /* * Solution to support multiple instances @@ -179,4 +179,4 @@ int16_t WebRtcG722_Version(char *versionStr, short len); #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ */ diff --git a/modules/audio_coding/codecs/g722/test/testG722.cc b/modules/audio_coding/codecs/g722/test/testG722.cc index c55a2eb357..925e8af357 100644 --- a/modules/audio_coding/codecs/g722/test/testG722.cc +++ b/modules/audio_coding/codecs/g722/test/testG722.cc @@ -15,10 +15,10 @@ #include #include #include -#include "webrtc/typedefs.h" +#include "typedefs.h" /* include API */ -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" /* Runtime statistics */ #include diff --git a/modules/audio_coding/codecs/ilbc/abs_quant.h b/modules/audio_coding/codecs/ilbc/abs_quant.h index 5154534524..090ed73f12 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant.h +++ b/modules/audio_coding/codecs/ilbc/abs_quant.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/abs_quant_loop.h b/modules/audio_coding/codecs/ilbc/abs_quant_loop.h index c8bf67575f..92f6fff847 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant_loop.h +++ b/modules/audio_coding/codecs/ilbc/abs_quant_loop.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc index 61ec7bd562..153b742477 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" #include -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h index f2320fadff..edb65d09c6 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/constructormagic.h" typedef struct iLBC_decinst_t_ IlbcDecoderInstance; @@ -43,4 +43,4 @@ class AudioDecoderIlbcImpl final : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc index 2a6dda7f47..f6d90c8f85 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h index 6a80a69d32..a238689aca 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -51,4 +51,4 @@ class AudioEncoderIlbcImpl final : public AudioEncoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ diff --git a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h index c5c408880e..e8eb0696d2 100644 --- a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h +++ b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/bw_expand.h b/modules/audio_coding/codecs/ilbc/bw_expand.h index b3b16d5d69..6268baa9fa 100644 --- a/modules/audio_coding/codecs/ilbc/bw_expand.h +++ b/modules/audio_coding/codecs/ilbc/bw_expand.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/cb_construct.h b/modules/audio_coding/codecs/ilbc/cb_construct.h index 12df628211..aeb00da5f1 100644 --- a/modules/audio_coding/codecs/ilbc/cb_construct.h +++ b/modules/audio_coding/codecs/ilbc/cb_construct.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ #include #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy.h index 6da2f43c0b..e8e2fe979a 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ void WebRtcIlbcfix_CbMemEnergy( size_t range, diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h index 594ba5f01b..00eb0179f1 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ void WebRtcIlbcfix_CbMemEnergyAugmentation( int16_t *interpSamples, /* (i) The interpolated samples */ diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h index 2991869dd9..af8e658a02 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ void WebRtcIlbcfix_CbMemEnergyCalc( int32_t energy, /* (i) input start energy */ diff --git a/modules/audio_coding/codecs/ilbc/cb_search.h b/modules/audio_coding/codecs/ilbc/cb_search.h index ed1580c09d..c8626c5153 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search.h +++ b/modules/audio_coding/codecs/ilbc/cb_search.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ void WebRtcIlbcfix_CbSearch( IlbcEncoder *iLBCenc_inst, diff --git a/modules/audio_coding/codecs/ilbc/cb_search_core.h b/modules/audio_coding/codecs/ilbc/cb_search_core.h index 9648cf29d3..1db7f70c54 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search_core.h +++ b/modules/audio_coding/codecs/ilbc/cb_search_core.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/cb_update_best_index.h b/modules/audio_coding/codecs/ilbc/cb_update_best_index.h index a20fa38b2e..4929b640c4 100644 --- a/modules/audio_coding/codecs/ilbc/cb_update_best_index.h +++ b/modules/audio_coding/codecs/ilbc/cb_update_best_index.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/chebyshev.h b/modules/audio_coding/codecs/ilbc/chebyshev.h index bf10132da1..f990d0b9da 100644 --- a/modules/audio_coding/codecs/ilbc/chebyshev.h +++ b/modules/audio_coding/codecs/ilbc/chebyshev.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/comp_corr.h b/modules/audio_coding/codecs/ilbc/comp_corr.h index ab78c72b3e..6f6c5ec11c 100644 --- a/modules/audio_coding/codecs/ilbc/comp_corr.h +++ b/modules/audio_coding/codecs/ilbc/comp_corr.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/constants.h b/modules/audio_coding/codecs/ilbc/constants.h index 7c4ad4d928..9e12227e1e 100644 --- a/modules/audio_coding/codecs/ilbc/constants.h +++ b/modules/audio_coding/codecs/ilbc/constants.h @@ -16,11 +16,11 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ #include "defines.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* high pass filters */ diff --git a/modules/audio_coding/codecs/ilbc/create_augmented_vec.c b/modules/audio_coding/codecs/ilbc/create_augmented_vec.c index e05b88b20a..adc428df7b 100644 --- a/modules/audio_coding/codecs/ilbc/create_augmented_vec.c +++ b/modules/audio_coding/codecs/ilbc/create_augmented_vec.c @@ -18,8 +18,8 @@ #include "defines.h" #include "constants.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/sanitizer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" /*----------------------------------------------------------------* * Recreate a specific codebook vector from the augmented part. diff --git a/modules/audio_coding/codecs/ilbc/create_augmented_vec.h b/modules/audio_coding/codecs/ilbc/create_augmented_vec.h index f2582cd532..0616e2e0b2 100644 --- a/modules/audio_coding/codecs/ilbc/create_augmented_vec.h +++ b/modules/audio_coding/codecs/ilbc/create_augmented_vec.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/decode.h b/modules/audio_coding/codecs/ilbc/decode.h index 2d05182612..b35be969b9 100644 --- a/modules/audio_coding/codecs/ilbc/decode.h +++ b/modules/audio_coding/codecs/ilbc/decode.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/decode_residual.h b/modules/audio_coding/codecs/ilbc/decode_residual.h index e3fb7f78cb..048671e0d6 100644 --- a/modules/audio_coding/codecs/ilbc/decode_residual.h +++ b/modules/audio_coding/codecs/ilbc/decode_residual.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ #include #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h index 37ecf078ee..d83ad47538 100644 --- a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h +++ b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/defines.h b/modules/audio_coding/codecs/ilbc/defines.h index 2faaea15fc..3abac278f5 100644 --- a/modules/audio_coding/codecs/ilbc/defines.h +++ b/modules/audio_coding/codecs/ilbc/defines.h @@ -15,12 +15,12 @@ define.h ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ #include #include "signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* general codec settings */ diff --git a/modules/audio_coding/codecs/ilbc/do_plc.h b/modules/audio_coding/codecs/ilbc/do_plc.h index 38b8fdb7c0..76a598a9c6 100644 --- a/modules/audio_coding/codecs/ilbc/do_plc.h +++ b/modules/audio_coding/codecs/ilbc/do_plc.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/encode.c b/modules/audio_coding/codecs/ilbc/encode.c index fa4ffd06d0..72543555be 100644 --- a/modules/audio_coding/codecs/ilbc/encode.c +++ b/modules/audio_coding/codecs/ilbc/encode.c @@ -29,7 +29,7 @@ #include "index_conv_enc.h" #include "pack_bits.h" #include "hp_input.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #ifdef SPLIT_10MS #include "unpack_bits.h" diff --git a/modules/audio_coding/codecs/ilbc/encode.h b/modules/audio_coding/codecs/ilbc/encode.h index fe6ae6250c..0692a34568 100644 --- a/modules/audio_coding/codecs/ilbc/encode.h +++ b/modules/audio_coding/codecs/ilbc/encode.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/energy_inverse.h b/modules/audio_coding/codecs/ilbc/energy_inverse.h index fe25094325..cf5f88be57 100644 --- a/modules/audio_coding/codecs/ilbc/energy_inverse.h +++ b/modules/audio_coding/codecs/ilbc/energy_inverse.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/enh_upsample.h b/modules/audio_coding/codecs/ilbc/enh_upsample.h index 00bb28b0d8..62f69234c1 100644 --- a/modules/audio_coding/codecs/ilbc/enh_upsample.h +++ b/modules/audio_coding/codecs/ilbc/enh_upsample.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENH_UPSAMPLE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENH_UPSAMPLE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENH_UPSAMPLE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENH_UPSAMPLE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/enhancer.h b/modules/audio_coding/codecs/ilbc/enhancer.h index ed219fb1bb..5b4a30b0c2 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer.h +++ b/modules/audio_coding/codecs/ilbc/enhancer.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/enhancer_interface.h b/modules/audio_coding/codecs/ilbc/enhancer_interface.h index d540533a1c..17a0354b7c 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer_interface.h +++ b/modules/audio_coding/codecs/ilbc/enhancer_interface.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h index d23b25c1ac..947c462342 100644 --- a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h +++ b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/frame_classify.h b/modules/audio_coding/codecs/ilbc/frame_classify.h index 99f7144782..60b3249505 100644 --- a/modules/audio_coding/codecs/ilbc/frame_classify.h +++ b/modules/audio_coding/codecs/ilbc/frame_classify.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ size_t WebRtcIlbcfix_FrameClassify( /* (o) Index to the max-energy sub frame */ diff --git a/modules/audio_coding/codecs/ilbc/gain_dequant.h b/modules/audio_coding/codecs/ilbc/gain_dequant.h index 6bda066a56..efa3c7a32e 100644 --- a/modules/audio_coding/codecs/ilbc/gain_dequant.h +++ b/modules/audio_coding/codecs/ilbc/gain_dequant.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/gain_quant.h b/modules/audio_coding/codecs/ilbc/gain_quant.h index 395436410c..5780bee366 100644 --- a/modules/audio_coding/codecs/ilbc/gain_quant.h +++ b/modules/audio_coding/codecs/ilbc/gain_quant.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/get_cd_vec.h b/modules/audio_coding/codecs/ilbc/get_cd_vec.h index a5abb5e916..f16789ec11 100644 --- a/modules/audio_coding/codecs/ilbc/get_cd_vec.h +++ b/modules/audio_coding/codecs/ilbc/get_cd_vec.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_CD_VEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_CD_VEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_CD_VEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_CD_VEC_H_ #include diff --git a/modules/audio_coding/codecs/ilbc/get_lsp_poly.h b/modules/audio_coding/codecs/ilbc/get_lsp_poly.h index 46ade4870d..537b771506 100644 --- a/modules/audio_coding/codecs/ilbc/get_lsp_poly.h +++ b/modules/audio_coding/codecs/ilbc/get_lsp_poly.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/get_sync_seq.h b/modules/audio_coding/codecs/ilbc/get_sync_seq.h index 0e3b207753..9e97e60359 100644 --- a/modules/audio_coding/codecs/ilbc/get_sync_seq.h +++ b/modules/audio_coding/codecs/ilbc/get_sync_seq.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/hp_input.h b/modules/audio_coding/codecs/ilbc/hp_input.h index acdfa91262..fdc0c37497 100644 --- a/modules/audio_coding/codecs/ilbc/hp_input.h +++ b/modules/audio_coding/codecs/ilbc/hp_input.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/hp_output.h b/modules/audio_coding/codecs/ilbc/hp_output.h index 1840b68186..6f6a56dd19 100644 --- a/modules/audio_coding/codecs/ilbc/hp_output.h +++ b/modules/audio_coding/codecs/ilbc/hp_output.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/ilbc.c b/modules/audio_coding/codecs/ilbc/ilbc.c index 18e0f84ea7..08677d9b85 100644 --- a/modules/audio_coding/codecs/ilbc/ilbc.c +++ b/modules/audio_coding/codecs/ilbc/ilbc.c @@ -22,7 +22,7 @@ #include "encode.h" #include "init_decode.h" #include "decode.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #include int16_t WebRtcIlbcfix_EncoderAssign(IlbcEncoderInstance** iLBC_encinst, diff --git a/modules/audio_coding/codecs/ilbc/ilbc.h b/modules/audio_coding/codecs/ilbc/ilbc.h index c021f5be52..aa007a973e 100644 --- a/modules/audio_coding/codecs/ilbc/ilbc.h +++ b/modules/audio_coding/codecs/ilbc/ilbc.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ #include @@ -24,7 +24,7 @@ * Define the fixpoint numeric formats */ -#include "webrtc/typedefs.h" +#include "typedefs.h" /* * Solution to support multiple instances @@ -255,4 +255,4 @@ extern "C" { } #endif -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ diff --git a/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc index 69e218188b..b8d3c7c55a 100644 --- a/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc +++ b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/ilbc/index_conv_dec.h b/modules/audio_coding/codecs/ilbc/index_conv_dec.h index 354c5b8a58..4b61d31617 100644 --- a/modules/audio_coding/codecs/ilbc/index_conv_dec.h +++ b/modules/audio_coding/codecs/ilbc/index_conv_dec.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_DEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_DEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_DEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_DEC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/index_conv_enc.h b/modules/audio_coding/codecs/ilbc/index_conv_enc.h index d686331f26..935928a55c 100644 --- a/modules/audio_coding/codecs/ilbc/index_conv_enc.h +++ b/modules/audio_coding/codecs/ilbc/index_conv_enc.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/init_decode.h b/modules/audio_coding/codecs/ilbc/init_decode.h index cdd2192079..6f3a17becb 100644 --- a/modules/audio_coding/codecs/ilbc/init_decode.h +++ b/modules/audio_coding/codecs/ilbc/init_decode.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/init_encode.h b/modules/audio_coding/codecs/ilbc/init_encode.h index 7154661fbd..fc11cc7d20 100644 --- a/modules/audio_coding/codecs/ilbc/init_encode.h +++ b/modules/audio_coding/codecs/ilbc/init_encode.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/interpolate.h b/modules/audio_coding/codecs/ilbc/interpolate.h index 04832320a3..befe2416f4 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate.h +++ b/modules/audio_coding/codecs/ilbc/interpolate.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/interpolate_samples.h b/modules/audio_coding/codecs/ilbc/interpolate_samples.h index 7549d2c216..8a2827385f 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate_samples.h +++ b/modules/audio_coding/codecs/ilbc/interpolate_samples.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lpc_encode.h b/modules/audio_coding/codecs/ilbc/lpc_encode.h index 9f6f50416f..776b3a14cd 100644 --- a/modules/audio_coding/codecs/ilbc/lpc_encode.h +++ b/modules/audio_coding/codecs/ilbc/lpc_encode.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_check.h b/modules/audio_coding/codecs/ilbc/lsf_check.h index 2f4ac8cc89..bfcea083aa 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_check.h +++ b/modules/audio_coding/codecs/ilbc/lsf_check.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h index 3540c1c3b5..4530528497 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h index 799c1003a4..a2d2db61a2 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h index b2104d7d21..ace29dec00 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h +++ b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_poly.h b/modules/audio_coding/codecs/ilbc/lsf_to_poly.h index d85f510b27..782ef9f6c3 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_poly.h +++ b/modules/audio_coding/codecs/ilbc/lsf_to_poly.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h index a2bcaff349..11739853fb 100644 --- a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h +++ b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/my_corr.h b/modules/audio_coding/codecs/ilbc/my_corr.h index 214946410e..1d0ac85bde 100644 --- a/modules/audio_coding/codecs/ilbc/my_corr.h +++ b/modules/audio_coding/codecs/ilbc/my_corr.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/nearest_neighbor.h b/modules/audio_coding/codecs/ilbc/nearest_neighbor.h index 7d7fb6fccc..8ed52bc04d 100644 --- a/modules/audio_coding/codecs/ilbc/nearest_neighbor.h +++ b/modules/audio_coding/codecs/ilbc/nearest_neighbor.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/pack_bits.h b/modules/audio_coding/codecs/ilbc/pack_bits.h index 603ddd4c83..66df7fc803 100644 --- a/modules/audio_coding/codecs/ilbc/pack_bits.h +++ b/modules/audio_coding/codecs/ilbc/pack_bits.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_PACK_BITS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_PACK_BITS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_PACK_BITS_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_PACK_BITS_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsf.h b/modules/audio_coding/codecs/ilbc/poly_to_lsf.h index 5a7f7bbbbe..3f2a2a0115 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsf.h +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsf.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsp.h b/modules/audio_coding/codecs/ilbc/poly_to_lsp.h index ed20fd970b..cc275076fa 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsp.h +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsp.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/refiner.h b/modules/audio_coding/codecs/ilbc/refiner.h index f8a2abc2d6..92b81be1ca 100644 --- a/modules/audio_coding/codecs/ilbc/refiner.h +++ b/modules/audio_coding/codecs/ilbc/refiner.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h index 6abcc00b9d..ccf66d3295 100644 --- a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h +++ b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h index 7808da140d..eb5b80302e 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h +++ b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h index 353edb2225..660f8fe15d 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h index 94f804bfdd..6dc57196bf 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/smooth.h b/modules/audio_coding/codecs/ilbc/smooth.h index add0c7ba47..351543229a 100644 --- a/modules/audio_coding/codecs/ilbc/smooth.h +++ b/modules/audio_coding/codecs/ilbc/smooth.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/smooth_out_data.h b/modules/audio_coding/codecs/ilbc/smooth_out_data.h index 83244392bb..7ed1a055c9 100644 --- a/modules/audio_coding/codecs/ilbc/smooth_out_data.h +++ b/modules/audio_coding/codecs/ilbc/smooth_out_data.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/sort_sq.h b/modules/audio_coding/codecs/ilbc/sort_sq.h index eaf175be1d..436e1185c0 100644 --- a/modules/audio_coding/codecs/ilbc/sort_sq.h +++ b/modules/audio_coding/codecs/ilbc/sort_sq.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/split_vq.h b/modules/audio_coding/codecs/ilbc/split_vq.h index 2ca98cb5b1..3b303bd156 100644 --- a/modules/audio_coding/codecs/ilbc/split_vq.h +++ b/modules/audio_coding/codecs/ilbc/split_vq.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/state_construct.h b/modules/audio_coding/codecs/ilbc/state_construct.h index 26319193b8..9339f656e4 100644 --- a/modules/audio_coding/codecs/ilbc/state_construct.h +++ b/modules/audio_coding/codecs/ilbc/state_construct.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ /*----------------------------------------------------------------* * Generate the start state from the quantized indexes diff --git a/modules/audio_coding/codecs/ilbc/state_search.h b/modules/audio_coding/codecs/ilbc/state_search.h index 800beac09b..94a9d09266 100644 --- a/modules/audio_coding/codecs/ilbc/state_search.h +++ b/modules/audio_coding/codecs/ilbc/state_search.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/swap_bytes.h b/modules/audio_coding/codecs/ilbc/swap_bytes.h index a4484d621e..95182993ca 100644 --- a/modules/audio_coding/codecs/ilbc/swap_bytes.h +++ b/modules/audio_coding/codecs/ilbc/swap_bytes.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/test/iLBC_test.c b/modules/audio_coding/codecs/ilbc/test/iLBC_test.c index b440c7a45f..4dbc18513a 100644 --- a/modules/audio_coding/codecs/ilbc/test/iLBC_test.c +++ b/modules/audio_coding/codecs/ilbc/test/iLBC_test.c @@ -19,7 +19,7 @@ #include #include #include -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" /*---------------------------------------------------------------* * Main program to test iLBC encoding and decoding diff --git a/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c b/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c index 7ffa4a7d0e..132f3bdb37 100644 --- a/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c +++ b/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c @@ -21,7 +21,7 @@ iLBC_test.c #include #include #include -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" //#define JUNK_DATA #ifdef JUNK_DATA diff --git a/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c b/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c index 5454948287..a62a42edf6 100644 --- a/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c +++ b/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c @@ -21,13 +21,13 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/ilbc/defines.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/nit_encode.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/encode.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/init_decode.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/decode.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/constants.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/nit_encode.h" +#include "modules/audio_coding/codecs/ilbc/encode.h" +#include "modules/audio_coding/codecs/ilbc/init_decode.h" +#include "modules/audio_coding/codecs/ilbc/decode.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" #define ILBCNOOFWORDS_MAX (NO_OF_BYTES_30MS)/2 diff --git a/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt b/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt index db0e9a0979..99c6092116 100644 --- a/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt +++ b/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt @@ -5,7 +5,7 @@ # This script can be used to verify the bit exactness of iLBC fixed-point version 1.0.6 # -INP=../../../../../../../resources/audio_coding +INP=../../../../../../resources/audio_coding EXEP=../../../../../../../out/Release OUTP=./GeneratedFiles mkdir ./GeneratedFiles diff --git a/modules/audio_coding/codecs/ilbc/unpack_bits.h b/modules/audio_coding/codecs/ilbc/unpack_bits.h index 9586a120d0..01cf398004 100644 --- a/modules/audio_coding/codecs/ilbc/unpack_bits.h +++ b/modules/audio_coding/codecs/ilbc/unpack_bits.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/vq3.h b/modules/audio_coding/codecs/ilbc/vq3.h index b146ea3d85..9aab03d213 100644 --- a/modules/audio_coding/codecs/ilbc/vq3.h +++ b/modules/audio_coding/codecs/ilbc/vq3.h @@ -16,10 +16,10 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /*----------------------------------------------------------------* * Vector quantization of order 3 (based on MSE) diff --git a/modules/audio_coding/codecs/ilbc/vq4.h b/modules/audio_coding/codecs/ilbc/vq4.h index 9263759367..cc27b0c6ff 100644 --- a/modules/audio_coding/codecs/ilbc/vq4.h +++ b/modules/audio_coding/codecs/ilbc/vq4.h @@ -16,10 +16,10 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /*----------------------------------------------------------------* * Vector quantization of order 4 (based on MSE) diff --git a/modules/audio_coding/codecs/ilbc/window32_w32.h b/modules/audio_coding/codecs/ilbc/window32_w32.h index 27ed1b6a33..f53592e87b 100644 --- a/modules/audio_coding/codecs/ilbc/window32_w32.h +++ b/modules/audio_coding/codecs/ilbc/window32_w32.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/ilbc/xcorr_coef.h b/modules/audio_coding/codecs/ilbc/xcorr_coef.h index 9b81c0fe97..e2d511a6f9 100644 --- a/modules/audio_coding/codecs/ilbc/xcorr_coef.h +++ b/modules/audio_coding/codecs/ilbc/xcorr_coef.h @@ -16,8 +16,8 @@ ******************************************************************/ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ +#define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ #include "defines.h" diff --git a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h index 66f021a87c..eda1cfa545 100644 --- a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h +++ b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/optional.h" +#include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -56,4 +56,4 @@ class AudioDecoderIsacT final : public AudioDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ diff --git a/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h index 1abfe37fa7..90f3e8d46a 100644 --- a/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h +++ b/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -106,4 +106,4 @@ size_t AudioDecoderIsacT::Channels() const { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_ diff --git a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h index c12d734f7c..541b90c9f5 100644 --- a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h +++ b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_encoder.h" +#include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -95,4 +95,4 @@ class AudioEncoderIsacT final : public AudioEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ diff --git a/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h index 854f2eef0c..de41ace6d5 100644 --- a/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h +++ b/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "common_types.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -186,4 +186,4 @@ void AudioEncoderIsacT::RecreateEncoderInstance(const Config& config) { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ diff --git a/modules/audio_coding/codecs/isac/bandwidth_info.h b/modules/audio_coding/codecs/isac/bandwidth_info.h index 1e3f4c9a86..cb565e0fc0 100644 --- a/modules/audio_coding/codecs/isac/bandwidth_info.h +++ b/modules/audio_coding/codecs/isac/bandwidth_info.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" typedef struct { int in_use; @@ -21,4 +21,4 @@ typedef struct { int16_t jitter_info; } IsacBandwidthInfo; -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ diff --git a/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h b/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h index 4ddc3bb05c..0b4eadd448 100644 --- a/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h +++ b/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ -#include "webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h" +#include "modules/audio_coding/codecs/isac/audio_decoder_isac_t.h" +#include "modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h" namespace webrtc { using AudioDecoderIsacFixImpl = AudioDecoderIsacT; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_DECODER_ISACFIX_H_ diff --git a/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h b/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h index aefad78eb6..f0cc038328 100644 --- a/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h +++ b/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ -#include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h" +#include "modules/audio_coding/codecs/isac/audio_encoder_isac_t.h" +#include "modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h" namespace webrtc { using AudioEncoderIsacFixImpl = AudioEncoderIsacT; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_AUDIO_ENCODER_ISACFIX_H_ diff --git a/modules/audio_coding/codecs/isac/fix/include/isacfix.h b/modules/audio_coding/codecs/isac/fix/include/isacfix.h index 7f277ca25c..74df442955 100644 --- a/modules/audio_coding/codecs/isac/fix/include/isacfix.h +++ b/modules/audio_coding/codecs/isac/fix/include/isacfix.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ #include -#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "typedefs.h" typedef struct { void *dummy; @@ -634,4 +634,4 @@ extern "C" { -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_INCLUDE_ISACFIX_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/arith_routins.h b/modules/audio_coding/codecs/isac/fix/source/arith_routins.h index c76bf1a266..830c52fcaf 100644 --- a/modules/audio_coding/codecs/isac/fix/source/arith_routins.h +++ b/modules/audio_coding/codecs/isac/fix/source/arith_routins.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ #include "structs.h" @@ -157,4 +157,4 @@ int16_t WebRtcIsacfix_DecHistOneStepMulti( const uint16_t *initIndex, const int16_t lenData); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc b/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc index 45eefb913b..21259ee2e2 100644 --- a/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc +++ b/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h" +#include "modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc b/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc index 257a8b5597..0190ab91b6 100644 --- a/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc +++ b/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h" +#include "modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c index ab5aa0a074..d926f47e3a 100644 --- a/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c +++ b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c @@ -21,7 +21,7 @@ #include "bandwidth_estimator.h" #include "settings.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" /* array of quantization levels for bottle neck info; Matlab code: */ /* sprintf('%4.1ff, ', logspace(log10(5000), log10(40000), 12)) */ diff --git a/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h index 101ef62081..f80a5876fa 100644 --- a/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h +++ b/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ #include "structs.h" @@ -132,4 +132,4 @@ int16_t WebRtcIsacfix_GetNewFrameLength(int16_t bottle_neck, int16_t current_fra int16_t WebRtcIsacfix_GetSnr(int16_t bottle_neck, int16_t framesamples); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_BANDWIDTH_ESTIMATOR_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/codec.h b/modules/audio_coding/codecs/isac/fix/source/codec.h index 001a04f39b..88d40551f2 100644 --- a/modules/audio_coding/codecs/isac/fix/source/codec.h +++ b/modules/audio_coding/codecs/isac/fix/source/codec.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ #include "structs.h" @@ -225,4 +225,4 @@ extern FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; } // extern "C" #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/encode.c b/modules/audio_coding/codecs/isac/fix/source/encode.c index ee07660693..ef3e320e2c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/encode.c +++ b/modules/audio_coding/codecs/isac/fix/source/encode.c @@ -15,20 +15,20 @@ * */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "rtc_base/checks.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routins.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" +#include "modules/audio_coding/codecs/isac/fix/source/arith_routins.h" +#include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "modules/audio_coding/codecs/isac/fix/source/lpc_tables.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h" +#include "modules/audio_coding/codecs/isac/fix/source/structs.h" int WebRtcIsacfix_EncodeImpl(int16_t *in, diff --git a/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c index 0a6e26f05e..ed816c0ad7 100644 --- a/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c +++ b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c @@ -26,7 +26,7 @@ #include "lpc_tables.h" #include "settings.h" #include "signal_processing_library.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "rtc_base/sanitizer.h" /* * Eenumerations for arguments to functions WebRtcIsacfix_MatrixProduct1() diff --git a/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h index 1b87d0ea55..31f044de0b 100644 --- a/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h +++ b/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ #include "structs.h" @@ -186,4 +186,4 @@ void WebRtcIsacfix_MatrixProduct2MIPS(const int16_t matrix0[], const int matrix0_index_step); #endif -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ENTROPY_CODING_H_ diff --git a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c index 599f8f0536..a66a43ef99 100644 --- a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" // MIPS optimization of the function WebRtcIsacfix_MatrixProduct1. // Bit-exact with the function WebRtcIsacfix_MatrixProduct1C from diff --git a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c index 20437e5130..2eccdfaa61 100644 --- a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c +++ b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c @@ -20,7 +20,7 @@ #include #include "signal_processing_library.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[], const int32_t matrix1[], diff --git a/modules/audio_coding/codecs/isac/fix/source/fft.h b/modules/audio_coding/codecs/isac/fix/source/fft.h index dc7cea81b7..83062eafd4 100644 --- a/modules/audio_coding/codecs/isac/fix/source/fft.h +++ b/modules/audio_coding/codecs/isac/fix/source/fft.h @@ -27,8 +27,8 @@ * See the comments in the code for correct usage! */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ #include "structs.h" @@ -38,4 +38,4 @@ int16_t WebRtcIsacfix_FftRadix16Fastest(int16_t RexQx[], int16_t ImxQx[], int16_ -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FFT_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h index d488339b31..0a6b4a458f 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h +++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h index c96fb05b82..66f285adac 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h @@ -16,10 +16,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { @@ -49,4 +49,4 @@ extern const int16_t WebRtcIsacfix_kLowerApFactorsQ15[2]; } #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks.c index bc21617983..b4583e95d1 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbanks.c +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks.c @@ -23,7 +23,7 @@ #include "codec.h" #include "filterbank_tables.h" #include "settings.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // Declare a function pointer. AllpassFilter2FixDec16 WebRtcIsacfix_AllpassFilter2FixDec16; diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c index 4dd70cf6c7..949bca70e9 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" +#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" // WebRtcIsacfix_AllpassFilter2FixDec16 function optimized for MIPSDSP platform. // Bit-exact with WebRtcIsacfix_AllpassFilter2FixDec16C from filterbanks.c. diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c b/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c index cd0bb075c9..fd29ccb3ff 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c @@ -15,7 +15,7 @@ #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" void WebRtcIsacfix_AllpassFilter2FixDec16Neon( int16_t* data_ch1, // Input and output in channel 1, in Q0 diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc index c8e6ac87ad..4a42b077a0 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" +#include "modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "rtc_base/sanitizer.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" class FilterBanksTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/filters.c b/modules/audio_coding/codecs/isac/fix/source/filters.c index 31d4e086bf..85860f72f4 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filters.c +++ b/modules/audio_coding/codecs/isac/fix/source/filters.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "rtc_base/checks.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" // Autocorrelation function in fixed point. // NOTE! Different from SPLIB-version in how it scales the signal. diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_mips.c b/modules/audio_coding/codecs/isac/fix/source/filters_mips.c index 056dc275d3..ded3d03209 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filters_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/filters_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" // MIPS optimized implementation of the Autocorrelation function in fixed point. // NOTE! Different from SPLIB-version in how it scales the signal. diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_neon.c b/modules/audio_coding/codecs/isac/fix/source/filters_neon.c index 9ec2b13457..1734a969cb 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filters_neon.c +++ b/modules/audio_coding/codecs/isac/fix/source/filters_neon.c @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "rtc_base/checks.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" // Autocorrelation function in fixed point. // NOTE! Different from SPLIB-version in how it scales the signal. diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc index 527841af2b..6424e38f17 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" class FiltersTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h b/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h index a39444e418..5f0f822a1c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h +++ b/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -120,4 +120,4 @@ class IsacFix { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/modules/audio_coding/codecs/isac/fix/source/isacfix.c index 3377bf7dca..bbe9098b01 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -15,18 +15,18 @@ * */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "rtc_base/checks.h" +#include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" +#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "modules/audio_coding/codecs/isac/fix/source/structs.h" +#include "system_wrappers/include/cpu_features_wrapper.h" // Declare function pointers. FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice.c b/modules/audio_coding/codecs/isac/fix/source/lattice.c index 1f8b2c2804..81369991d5 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice.c @@ -17,7 +17,7 @@ #include "codec.h" #include "settings.h" -#include "webrtc/rtc_base/sanitizer.h" +#include "rtc_base/sanitizer.h" #define LATTICE_MUL_32_32_RSFT16(a32a, a32b, b32) \ ((int32_t)(WEBRTC_SPL_MUL(a32a, b32) + (WEBRTC_SPL_MUL_16_32_RSFT16(a32b, b32)))) diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S b/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S index 36411df0ab..e2d4318541 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S @@ -25,7 +25,7 @@ @ r12: constant #16384 @ r6, r7, r8, r10, r11: scratch -#include "webrtc/system_wrappers/include/asm_defines.h" +#include "system_wrappers/include/asm_defines.h" #include "settings.h" GLOBAL_FUNCTION WebRtcIsacfix_FilterArLoop diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c index 40c3bf8617..8f3cc53d19 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c @@ -16,7 +16,7 @@ #include "settings.h" #include "signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients * cth_Q15[] and sth_Q15[]. diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c index d488bfcb51..d5805b72e1 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "typedefs.h" // Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients // cth_Q15[] and sth_Q15[]. diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c b/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c index 9218a3a0e8..8ea9b63578 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" // Contains a function for the core loop in the normalized lattice MA // filter routine for iSAC codec, optimized for ARM Neon platform. diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h index aac927586c..97d291aca2 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ #ifdef __cplusplus extern "C" { @@ -66,4 +66,4 @@ int32_t WebRtcIsacfix_CalculateResidualEnergyMIPS(int lpc_order, } /* extern "C" */ #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_MASKING_MODEL_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c index 55602b9725..727008da32 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" // MIPS DSPR2 optimization for function WebRtcIsacfix_CalculateResidualEnergy // Bit-exact with WebRtcIsacfix_CalculateResidualEnergyC from file diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc index a81814d3e3..3d8586622b 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" class LpcMaskingModelTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h index 7e8121e834..7dfd5c71ca 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /* indices of KLT coefficients used */ extern const uint16_t WebRtcIsacfix_kSelIndGain[12]; @@ -94,4 +94,4 @@ extern const int16_t WebRtcIsacfix_kMeansGainQ8[KLT_NUM_MODELS][12]; extern const int32_t WebRtcIsacfix_kMeansShapeQ17[3][108]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c index ac8511ecc2..78cb93f7ae 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/compile_assert_c.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/compile_assert_c.h" /* log2[0.2, 0.5, 0.98] in Q8 */ static const int16_t kLogLagWinQ8[3] = { diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h index 40f15c433c..0aa727dd41 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ #include "structs.h" @@ -62,4 +62,4 @@ int32_t WebRtcIsacfix_Log2Q8( uint32_t x ); void WebRtcIsacfix_PCorr2Q32(const int16_t* in, int32_t* logcorQ8); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_ESTIMATOR_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c index 81ec1d65a2..1214e23bef 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" #ifdef WEBRTC_HAS_NEON #include #endif -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/compile_assert_c.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/compile_assert_c.h" extern int32_t WebRtcIsacfix_Log2Q8(uint32_t x); diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c index a76ed7d9fe..4ead84c492 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/compile_assert_c.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/compile_assert_c.h" extern int32_t WebRtcIsacfix_Log2Q8(uint32_t x); diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c index bcd6038476..e565e8564b 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" -#include "webrtc/rtc_base/compile_assert_c.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/structs.h" +#include "rtc_base/compile_assert_c.h" // Number of segments in a pitch subframe. static const int kSegments = 5; diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S index bc18d44568..44fcac86f8 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S @@ -13,7 +13,7 @@ @ @ Output is bit-exact with the reference C code in pitch_filter.c. -#include "webrtc/system_wrappers/include/asm_defines.h" +#include "system_wrappers/include/asm_defines.h" #include "settings.h" GLOBAL_FUNCTION WebRtcIsacfix_PitchFilterCore diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c index 366eef034d..f23d19de9c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" /* Filter coefficicients in Q15. */ static const int16_t kDampFilter[PITCH_DAMPORDER] = { diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c index 0f390b8a4f..785fd9464f 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_mips.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" void WebRtcIsacfix_PitchFilterCore(int loopNumber, int16_t gain, diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h index 4aab2b6c41..fbc797c7ea 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /********************* Pitch Filter Gain Coefficient Tables ************************/ /* cdf for quantized pitch filter gains */ @@ -41,4 +41,4 @@ extern const uint16_t WebRtcIsacfix_kCdfTableSizeGain[1]; /* transform matrix */ extern const int16_t WebRtcIsacfix_kTransform[4][4]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h index a5478b2eb2..ffe3cd80a5 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /********************* Pitch Filter Lag Coefficient Tables ************************/ @@ -98,4 +98,4 @@ extern const int16_t WebRtcIsacfix_kMeanLag2Hi[67]; extern const int16_t WebRtcIsacfix_kMeanLag4Hi[34]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/settings.h b/modules/audio_coding/codecs/isac/fix/source/settings.h index 82eb51a23a..34c0efefd0 100644 --- a/modules/audio_coding/codecs/isac/fix/source/settings.h +++ b/modules/audio_coding/codecs/isac/fix/source/settings.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ /* sampling frequency (Hz) */ @@ -212,4 +212,4 @@ #define ISAC_INCOMPATIBLE_FORMATS 6810 -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SETTINGS_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h index 55832063f4..fd8d04a68c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h @@ -16,11 +16,11 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /********************* AR Coefficient Tables ************************/ /* cdf for quantized reflection coefficient 1 */ @@ -92,4 +92,4 @@ extern const uint16_t WebRtcIsacfix_kGainInitInd[1]; /* Cosine table */ extern const int16_t WebRtcIsacfix_kCos[6][60]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/structs.h b/modules/audio_coding/codecs/isac/fix/source/structs.h index 278af7527d..8fdb109575 100644 --- a/modules/audio_coding/codecs/isac/fix/source/structs.h +++ b/modules/audio_coding/codecs/isac/fix/source/structs.h @@ -15,14 +15,14 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "typedefs.h" /* Bitstream struct for decoder */ typedef struct Bitstreamstruct_dec { @@ -379,4 +379,4 @@ typedef struct { //Bitstr_enc myBitStr; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ */ diff --git a/modules/audio_coding/codecs/isac/fix/source/transform.c b/modules/audio_coding/codecs/isac/fix/source/transform.c index 362610a1c4..2f1275da5c 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform.c +++ b/modules/audio_coding/codecs/isac/fix/source/transform.c @@ -15,9 +15,9 @@ * */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/fft.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/fft.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" /* Tables are defined in transform_tables.c file or ARM assembly files. */ /* Cosine table 1 in Q14 */ diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_mips.c b/modules/audio_coding/codecs/isac/fix/source/transform_mips.c index e5d35f2b73..a87b3b54f2 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/transform_mips.c @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/fft.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/fft.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" // The tables are defined in transform_tables.c file. extern const int16_t WebRtcIsacfix_kCosTab1[FRAMESAMPLES/2]; diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_neon.c b/modules/audio_coding/codecs/isac/fix/source/transform_neon.c index f0cbd5d075..79dadc4600 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform_neon.c +++ b/modules/audio_coding/codecs/isac/fix/source/transform_neon.c @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/fft.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "modules/audio_coding/codecs/isac/fix/source/fft.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" // Tables are defined in transform_tables.c file. // Cosine table 1 in Q14. diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_tables.c b/modules/audio_coding/codecs/isac/fix/source/transform_tables.c index 8f89fb8f80..49f235a2f2 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform_tables.c +++ b/modules/audio_coding/codecs/isac/fix/source/transform_tables.c @@ -13,8 +13,8 @@ * transform functions WebRtcIsacfix_Time2Spec and WebRtcIsacfix_Spec2Time. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "typedefs.h" /* Cosine table 1 in Q14. */ const int16_t WebRtcIsacfix_kCosTab1[FRAMESAMPLES/2] = { diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc index 35e5800107..347b0492e9 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" static const int kSamples = FRAMESAMPLES/2; static const int32_t spec2time_out_expected_1[kSamples] = { diff --git a/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc b/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc index 276eb60e28..f9f6cc9fbe 100644 --- a/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc +++ b/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h" using ::std::string; diff --git a/modules/audio_coding/codecs/isac/fix/test/kenny.cc b/modules/audio_coding/codecs/isac/fix/test/kenny.cc index 79a525bccf..b11c6702ce 100644 --- a/modules/audio_coding/codecs/isac/fix/test/kenny.cc +++ b/modules/audio_coding/codecs/isac/fix/test/kenny.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" // TODO(kma): Clean up the code and change benchmarking the whole codec to // separate encoder and decoder. diff --git a/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc b/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc index 5b9439fa9c..80d10abf7f 100644 --- a/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc +++ b/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h index a0e74b55e2..37074f8f5b 100644 --- a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h +++ b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ -#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -53,4 +53,4 @@ class LockedIsacBandwidthInfo final { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ diff --git a/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h b/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h index 06821c0447..fae2f3d4a7 100644 --- a/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h +++ b/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_DECODER_ISAC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_DECODER_ISAC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_DECODER_ISAC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_DECODER_ISAC_H_ -#include "webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/isac_float_type.h" +#include "modules/audio_coding/codecs/isac/audio_decoder_isac_t.h" +#include "modules/audio_coding/codecs/isac/main/source/isac_float_type.h" namespace webrtc { using AudioDecoderIsacFloatImpl = AudioDecoderIsacT; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ diff --git a/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h b/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h index 06bef4c032..dc32bcdde6 100644 --- a/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h +++ b/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ -#include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/isac_float_type.h" +#include "modules/audio_coding/codecs/isac/audio_encoder_isac_t.h" +#include "modules/audio_coding/codecs/isac/main/source/isac_float_type.h" namespace webrtc { using AudioEncoderIsacFloatImpl = AudioEncoderIsacT; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_AUDIO_ENCODER_ISAC_H_ diff --git a/modules/audio_coding/codecs/isac/main/include/isac.h b/modules/audio_coding/codecs/isac/main/include/isac.h index 327e7f4b1f..fcdb04a7a2 100644 --- a/modules/audio_coding/codecs/isac/main/include/isac.h +++ b/modules/audio_coding/codecs/isac/main/include/isac.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ #include -#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "typedefs.h" typedef struct WebRtcISACStruct ISACStruct; @@ -721,4 +721,4 @@ extern "C" { -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/arith_routines.h b/modules/audio_coding/codecs/isac/main/source/arith_routines.h index d2fcbfeb73..73d0c2306e 100644 --- a/modules/audio_coding/codecs/isac/main/source/arith_routines.h +++ b/modules/audio_coding/codecs/isac/main/source/arith_routines.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ #include "structs.h" @@ -60,4 +60,4 @@ int WebRtcIsac_DecHistOneStepMulti( const uint16_t *init_index,/* input: vector of initial cdf table search entries */ const int N); /* input: data vector length */ -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc b/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc index 8e0603e99e..b671002e1e 100644 --- a/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc +++ b/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h" +#include "modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc index 64b9815b80..b7f2c0b1af 100644 --- a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc +++ b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h" +#include "modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc index 3fe8c1a709..333ab52c00 100644 --- a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc +++ b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c index c2c166cee9..4a16932341 100644 --- a/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c +++ b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c @@ -19,7 +19,7 @@ #include "bandwidth_estimator.h" #include "settings.h" #include "isac.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #include #include diff --git a/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h index 0704337f7d..ddebdcd342 100644 --- a/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h +++ b/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ #include "structs.h" #include "settings.h" @@ -181,4 +181,4 @@ extern "C" { #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/codec.h b/modules/audio_coding/codecs/isac/main/source/codec.h index 7ef64b55fe..d938725b92 100644 --- a/modules/audio_coding/codecs/isac/main/source/codec.h +++ b/modules/audio_coding/codecs/isac/main/source/codec.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ #include "structs.h" @@ -230,4 +230,4 @@ void WebRtcIsac_Dir2Lat(double* a, int orderCoef, float* sth, float* cth); void WebRtcIsac_AutoCorr(double* r, const double* x, size_t N, size_t order); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/crc.h b/modules/audio_coding/codecs/isac/main/source/crc.h index 09583dfc5c..dc8942f138 100644 --- a/modules/audio_coding/codecs/isac/main/source/crc.h +++ b/modules/audio_coding/codecs/isac/main/source/crc.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /**************************************************************************** * WebRtcIsac_GetCrc(...) @@ -43,4 +43,4 @@ int WebRtcIsac_GetCrc( -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c index 12a263d14c..dcb658eb3b 100644 --- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c +++ b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c @@ -26,7 +26,7 @@ #include "lpc_shape_swb12_tables.h" #include "lpc_shape_swb16_tables.h" #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /****************************************************************************** * WebRtcIsac_RemoveLarMean() diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h index 3dd2311bab..c3efd886a1 100644 --- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h +++ b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h @@ -16,12 +16,12 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ #include "settings.h" #include "structs.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /****************************************************************************** * WebRtcIsac_RemoveLarMean() @@ -279,4 +279,4 @@ int16_t WebRtcIsac_AddMeanToLinearDomain( double* lpcGains); -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/entropy_coding.h b/modules/audio_coding/codecs/isac/main/source/entropy_coding.h index d715d86432..2ccd96b620 100644 --- a/modules/audio_coding/codecs/isac/main/source/entropy_coding.h +++ b/modules/audio_coding/codecs/isac/main/source/entropy_coding.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ #include "settings.h" #include "structs.h" @@ -340,4 +340,4 @@ int16_t WebRtcIsac_EncodeJitterInfo(int32_t jitterIndex, int16_t WebRtcIsac_DecodeJitterInfo(Bitstr* streamData, int32_t* jitterInfo); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/fft.h b/modules/audio_coding/codecs/isac/main/source/fft.h index a42f57bcb5..b583b50268 100644 --- a/modules/audio_coding/codecs/isac/main/source/fft.h +++ b/modules/audio_coding/codecs/isac/main/source/fft.h @@ -27,8 +27,8 @@ * See the comments in the code for correct usage! */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ #include "structs.h" @@ -42,4 +42,4 @@ int WebRtcIsac_Fftns (unsigned int ndim, const int dims[], double Re[], double I -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h index e8fda5e545..714e227081 100644 --- a/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/filterbank_tables.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ #include "structs.h" @@ -43,4 +43,4 @@ extern const float WebRtcIsac_kTransform1Float[8]; /* The matrix for transforming the backward composite state to lower channel state */ extern const float WebRtcIsac_kTransform2Float[8]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/isac.c b/modules/audio_coding/codecs/isac/main/source/isac.c index f83d4f8da0..79dc7e2b39 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac.c +++ b/modules/audio_coding/codecs/isac/main/source/isac.c @@ -15,22 +15,22 @@ * */ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" +#include "modules/audio_coding/codecs/isac/main/include/isac.h" #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/crc.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/structs.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h" +#include "modules/audio_coding/codecs/isac/main/source/codec.h" +#include "modules/audio_coding/codecs/isac/main/source/crc.h" +#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h" +#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h" +#include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h" +#include "modules/audio_coding/codecs/isac/main/source/structs.h" #define BIT_MASK_DEC_INIT 0x0001 #define BIT_MASK_ENC_INIT 0x0002 diff --git a/modules/audio_coding/codecs/isac/main/source/isac_float_type.h b/modules/audio_coding/codecs/isac/main/source/isac_float_type.h index e150d39261..59a8805bd5 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac_float_type.h +++ b/modules/audio_coding/codecs/isac/main/source/isac_float_type.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" +#include "modules/audio_coding/codecs/isac/main/include/isac.h" namespace webrtc { @@ -114,4 +114,4 @@ struct IsacFloat { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc index 3f7170c30b..727f0f61e0 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc +++ b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc @@ -9,9 +9,9 @@ */ #include -#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/isac/main/include/isac.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" struct WebRtcISACStruct; diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h b/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h index 8dfe383802..1566ab0d40 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_ #include "settings.h" #include "structs.h" @@ -47,4 +47,4 @@ void WebRtcIsac_GetLpcCoefUb( double* varscale, int16_t bandwidth); -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYIS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYIS_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c index 5cc6c11c70..8ce004b28e 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c @@ -18,7 +18,7 @@ #include "lpc_gain_swb_tables.h" #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" const double WebRtcIsac_kQSizeLpcGain = 0.100000; diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h index c163f4ab55..8cbbbfb939 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h @@ -16,11 +16,11 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" extern const double WebRtcIsac_kQSizeLpcGain; @@ -46,4 +46,4 @@ extern const uint16_t* WebRtcIsac_kLpcGainCdfMat[SUBFRAMES]; extern const double WebRtcIsac_kLpcGainDecorrMat[SUBFRAMES][SUBFRAMES]; -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c index 599b89d8a8..2c5698fbbb 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c @@ -18,7 +18,7 @@ #include "lpc_shape_swb12_tables.h" #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* * Mean value of LAR diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h index 256f1d4a73..b49fd98cc0 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h @@ -16,11 +16,11 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER]; @@ -62,4 +62,4 @@ extern const uint16_t WebRtcIsac_kLpcShapeCdfVec7Ub12[49]; extern const uint16_t* WebRtcIsac_kLpcShapeCdfMatUb12 [UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME]; -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c index 6176d2cf76..0f567ed7d7 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c @@ -18,7 +18,7 @@ #include "lpc_shape_swb16_tables.h" #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" /* * Mean value of LAR diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h index 3e1bdf71df..737f363e32 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h @@ -16,11 +16,11 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ #include "settings.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER]; @@ -75,4 +75,4 @@ extern const uint16_t WebRtcIsac_kLpcShapeEntropySearchUb16 extern const double WebRtcIsac_kLpcShapeQStepSizeUb16; -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_tables.h index 51f63163f0..9412f2e389 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_tables.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ #include "structs.h" @@ -97,4 +97,4 @@ extern const double WebRtcIsac_kLpcMeansGain[12]; extern const double WebRtcIsac_kLpcMeansShape[108]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h index 2b446e932d..dad326442e 100644 --- a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h +++ b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h @@ -9,11 +9,11 @@ */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_POSIX) #define WebRtcIsac_lrint lrint @@ -38,4 +38,4 @@ static __inline long int WebRtcIsac_lrint(double x_dbl) { #endif -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ +#endif // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h b/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h index 6fb02b378f..96e1e17ee4 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h +++ b/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ #include "structs.h" @@ -72,4 +72,4 @@ void WebRtcIsac_DecimateAllpass(const double *in, size_t N, /* number of input samples */ double *out); /* array of size N/2 */ -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_filter.c b/modules/audio_coding/codecs/isac/main/source/pitch_filter.c index 3010fbc61a..24ec63acdf 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_filter.c +++ b/modules/audio_coding/codecs/isac/main/source/pitch_filter.c @@ -16,7 +16,7 @@ #include "os_specific_inline.h" -#include "webrtc/rtc_base/compile_assert_c.h" +#include "rtc_base/compile_assert_c.h" /* * We are implementing the following filters; diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h index 8d708ce68f..16bfb065ec 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /* header file for coding tables for the pitch filter side-info in the entropy coder */ /********************* Pitch Filter Gain Coefficient Tables ************************/ @@ -42,4 +42,4 @@ extern const int16_t WebRtcIsac_kQMeanGain4Q12[144]; /* size of cdf table */ extern const uint16_t WebRtcIsac_kQCdfTableSizeGain[1]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h index 01989f0188..799c45a94c 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h @@ -15,10 +15,10 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" /* header file for coding tables for the pitch filter side-info in the entropy coder */ /********************* Pitch Filter Lag Coefficient Tables ************************/ @@ -111,4 +111,4 @@ extern const double WebRtcIsac_kTransform[4][4]; /* transpose transform matrix */ extern const double WebRtcIsac_kTransformTranspose[4][4]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/settings.h b/modules/audio_coding/codecs/isac/main/source/settings.h index 31a80653fe..c08d72ffe3 100644 --- a/modules/audio_coding/codecs/isac/main/source/settings.h +++ b/modules/audio_coding/codecs/isac/main/source/settings.h @@ -15,8 +15,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ /* sampling frequency (Hz) */ #define FS 16000 @@ -202,4 +202,4 @@ enum IsacSamplingRate {kIsacWideband = 16, kIsacSuperWideband = 32}; /* 6800 Call setup formats */ #define ISAC_INCOMPATIBLE_FORMATS 6810 -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h index 989cb367bf..82ab363adb 100644 --- a/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h @@ -16,8 +16,8 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ #include "structs.h" @@ -75,4 +75,4 @@ extern const uint16_t WebRtcIsac_kQGainInitIndex[1]; /* Cosine table */ extern const int16_t WebRtcIsac_kCos[6][60]; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/source/structs.h b/modules/audio_coding/codecs/isac/main/source/structs.h index a2cdca2c14..a33ef697fc 100644 --- a/modules/audio_coding/codecs/isac/main/source/structs.h +++ b/modules/audio_coding/codecs/isac/main/source/structs.h @@ -15,13 +15,13 @@ * */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ -#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/settings.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "modules/audio_coding/codecs/isac/main/include/isac.h" +#include "modules/audio_coding/codecs/isac/main/source/settings.h" +#include "typedefs.h" typedef struct Bitstreamstruct { @@ -492,4 +492,4 @@ typedef struct { TransformTables transform_tables; } ISACMainStruct; -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ */ diff --git a/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc b/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc index 9c11d23bca..33d9efcda1 100644 --- a/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc +++ b/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc @@ -21,7 +21,7 @@ /* include API */ #include "isac.h" #include "utility.h" -#include "webrtc/rtc_base/format_macros.h" +#include "rtc_base/format_macros.h" /* Defines */ #define SEED_FILE "randseed.txt" /* Used when running decoder on garbage data */ diff --git a/modules/audio_coding/codecs/isac/main/test/simpleKenny.c b/modules/audio_coding/codecs/isac/main/test/simpleKenny.c index 646cd4817f..0d2d2cb375 100644 --- a/modules/audio_coding/codecs/isac/main/test/simpleKenny.c +++ b/modules/audio_coding/codecs/isac/main/test/simpleKenny.c @@ -28,7 +28,7 @@ /* include API */ #include "isac.h" #include "utility.h" -#include "webrtc/rtc_base/format_macros.h" +#include "rtc_base/format_macros.h" /* max number of samples per frame (= 60 ms frame) */ #define MAX_FRAMESAMPLES_SWB 1920 diff --git a/modules/audio_coding/codecs/isac/main/util/utility.h b/modules/audio_coding/codecs/isac/main/util/utility.h index 1bb6d295b4..b5882a57fb 100644 --- a/modules/audio_coding/codecs/isac/main/util/utility.h +++ b/modules/audio_coding/codecs/isac/main/util/utility.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_UTIL_UTILITY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_UTIL_UTILITY_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_UTIL_UTILITY_H_ +#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_UTIL_UTILITY_H_ #include #include diff --git a/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc index 1f4ae804a1..7a811cf4b0 100644 --- a/modules/audio_coding/codecs/isac/unittest.cc +++ b/modules/audio_coding/codecs/isac/unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "rtc_base/buffer.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc index e0f1fafcaa..8c35b647b4 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" #include #include diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame.h b/modules/audio_coding/codecs/legacy_encoded_audio_frame.h index e8ea029423..275576e628 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame.h +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ +#define MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/audio_codecs/audio_decoder.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_decoder.h" namespace webrtc { @@ -45,4 +45,4 @@ class LegacyEncodedAudioFrame final : public AudioDecoder::EncodedAudioFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ +#endif // MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc index fe049ab44e..9fd60441a9 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.cc b/modules/audio_coding/codecs/opus/audio_decoder_opus.cc index 2270ff4d9d..a48c7dbdde 100644 --- a/modules/audio_coding/codecs/opus/audio_decoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/modules/audio_coding/codecs/opus/audio_decoder_opus.h index d8512ec53c..70aa40bdc4 100644 --- a/modules/audio_coding/codecs/opus/audio_decoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#define MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -52,4 +52,4 @@ class AudioDecoderOpusImpl final : public AudioDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#endif // MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 3b4473a921..3da6ea2a4a 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/string_to_number.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "common_types.h" +#include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/protobuf_utils.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/string_to_number.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h index f966dbe74d..f2a87c937c 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#define MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ #include #include #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h" -#include "webrtc/api/optional.h" -#include "webrtc/common_audio/smoothing_filter.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_format.h" +#include "api/audio_codecs/opus/audio_encoder_opus_config.h" +#include "api/optional.h" +#include "common_audio/smoothing_filter.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/protobuf_utils.h" namespace webrtc { @@ -179,4 +179,4 @@ class AudioEncoderOpus final : public AudioEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ +#endif // MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc index 08e168b099..5720e86d74 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc @@ -12,17 +12,17 @@ #include #include -#include "webrtc/common_audio/mocks/mock_smoothing_filter.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h" -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/mocks/mock_smoothing_filter.h" +#include "common_types.h" +#include "modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "test/field_trial.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { using ::testing::NiceMock; diff --git a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc index 28d5175e96..2fe6135a10 100644 --- a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/perf_test.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc index 8f42bf4ea7..e429f1cfa9 100644 --- a/modules/audio_coding/codecs/opus/opus_fec_test.cc +++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" using ::std::string; using ::std::tr1::tuple; diff --git a/modules/audio_coding/codecs/opus/opus_inst.h b/modules/audio_coding/codecs/opus/opus_inst.h index 976f09ea71..066fa2267f 100644 --- a/modules/audio_coding/codecs/opus/opus_inst.h +++ b/modules/audio_coding/codecs/opus/opus_inst.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ +#define MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ #include -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "opus.h" @@ -33,4 +33,4 @@ struct WebRtcOpusDecInst { }; -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ +#endif // MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INST_H_ diff --git a/modules/audio_coding/codecs/opus/opus_interface.c b/modules/audio_coding/codecs/opus/opus_interface.c index 6427f0fa91..5166f4cae5 100644 --- a/modules/audio_coding/codecs/opus/opus_interface.c +++ b/modules/audio_coding/codecs/opus/opus_interface.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h" +#include "rtc_base/checks.h" +#include "modules/audio_coding/codecs/opus/opus_inst.h" #include #include diff --git a/modules/audio_coding/codecs/opus/opus_interface.h b/modules/audio_coding/codecs/opus/opus_interface.h index 29851518a8..0909ef869f 100644 --- a/modules/audio_coding/codecs/opus/opus_interface.h +++ b/modules/audio_coding/codecs/opus/opus_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ +#define MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #ifdef __cplusplus extern "C" { @@ -394,4 +394,4 @@ int WebRtcOpus_PacketHasFec(const uint8_t* payload, } // extern "C" #endif -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ +#endif // MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ diff --git a/modules/audio_coding/codecs/opus/opus_speed_test.cc b/modules/audio_coding/codecs/opus/opus_speed_test.cc index 7165d29c8b..7a97d22592 100644 --- a/modules/audio_coding/codecs/opus/opus_speed_test.cc +++ b/modules/audio_coding/codecs/opus/opus_speed_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h" using ::std::string; diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc index 9cff920ce7..9f2c1bbe72 100644 --- a/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/opus/opus_inst.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc index 57724a34bc..b07624dffc 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc +++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h index 46dfbb266f..7d234224e3 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ +#define MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -41,4 +41,4 @@ class AudioDecoderPcm16B final : public AudioDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ +#endif // MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc index 7b4a919d7c..d179ffb99c 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc +++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h index 25d548c0c3..d6fd6e169e 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ +#define MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -47,4 +47,4 @@ class AudioEncoderPcm16B final : public AudioEncoderPcm { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ +#endif // MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.c b/modules/audio_coding/codecs/pcm16b/pcm16b.c index 120c79052b..7411d74223 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b.c +++ b/modules/audio_coding/codecs/pcm16b/pcm16b.c @@ -10,7 +10,7 @@ #include "pcm16b.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" size_t WebRtcPcm16b_Encode(const int16_t* speech, size_t len, diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.h b/modules/audio_coding/codecs/pcm16b/pcm16b.h index f96e741c46..f32eb9837d 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/pcm16b.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ +#define MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ /* * Define the fixpoint numeric formats */ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #ifdef __cplusplus extern "C" { @@ -65,4 +65,4 @@ size_t WebRtcPcm16b_Decode(const uint8_t* encoded, } #endif -#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ */ +#endif /* MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_H_ */ diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc b/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc index 36015e7663..6d0fc2d015 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc +++ b/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b_common.h b/modules/audio_coding/codecs/pcm16b/pcm16b_common.h index 5d764c9609..980a996408 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b_common.h +++ b/modules/audio_coding/codecs/pcm16b/pcm16b_common.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ +#define MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_decoder_factory.h" namespace webrtc { void Pcm16BAppendSupportedCodecSpecs(std::vector* specs); } -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ +#endif // MODULES_AUDIO_CODING_CODECS_PCM16B_PCM16B_COMMON_H_ diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc index 3680ff0c99..4b9df6e0e6 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" +#include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 664c13e429..e625c50d96 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ +#define MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/audio_codecs/audio_encoder.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -74,4 +74,4 @@ class AudioEncoderCopyRed final : public AudioEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ +#endif // MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc index a79bb1c638..06ae2a70a5 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_encoder.h" +#include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" +#include "test/mock_audio_encoder.h" using ::testing::Return; using ::testing::_; diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc index b9332e0b04..3f6a44371f 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc +++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h" +#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" using ::std::tr1::get; diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h index b79b1ef728..73e0d22419 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h +++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ +#ifndef MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ +#define MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { @@ -89,4 +89,4 @@ class AudioCodecSpeedTest : public testing::TestWithParam { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ +#endif // MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ diff --git a/modules/audio_coding/include/audio_coding_module.h b/modules/audio_coding/include/audio_coding_module.h index eb59404dd1..07a238a4de 100644 --- a/modules/audio_coding/include/audio_coding_module.h +++ b/modules/audio_coding/include/audio_coding_module.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ +#ifndef MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ +#define MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ #include #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/include/module.h" +#include "rtc_base/deprecation.h" +#include "rtc_base/function_view.h" +#include "system_wrappers/include/clock.h" +#include "typedefs.h" namespace webrtc { @@ -829,4 +829,4 @@ class AudioCodingModule { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ +#endif // MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_ diff --git a/modules/audio_coding/include/audio_coding_module_typedefs.h b/modules/audio_coding/include/audio_coding_module_typedefs.h index 280d6bffa2..69a60e7be2 100644 --- a/modules/audio_coding/include/audio_coding_module_typedefs.h +++ b/modules/audio_coding/include/audio_coding_module_typedefs.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ +#ifndef MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ +#define MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -48,4 +48,4 @@ enum OpusApplicationMode { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ +#endif // MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_TYPEDEFS_H_ diff --git a/modules/audio_coding/neteq/accelerate.cc b/modules/audio_coding/neteq/accelerate.cc index 1c36fa8c61..183ad7b2b5 100644 --- a/modules/audio_coding/neteq/accelerate.cc +++ b/modules/audio_coding/neteq/accelerate.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/accelerate.h" +#include "modules/audio_coding/neteq/accelerate.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h index 713344e3d0..0ec33c22ab 100644 --- a/modules/audio_coding/neteq/accelerate.h +++ b/modules/audio_coding/neteq/accelerate.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ +#define MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/time_stretch.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/time_stretch.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -78,4 +78,4 @@ struct AccelerateFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ diff --git a/modules/audio_coding/neteq/audio_decoder_impl.cc b/modules/audio_coding/neteq/audio_decoder_impl.cc index d60f4bf7d1..01e934bf3b 100644 --- a/modules/audio_coding/neteq/audio_decoder_impl.cc +++ b/modules/audio_coding/neteq/audio_decoder_impl.cc @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" #include -#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "rtc_base/checks.h" #ifdef WEBRTC_CODEC_G722 -#include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" #endif #ifdef WEBRTC_CODEC_ILBC -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" #endif #ifdef WEBRTC_CODEC_ISACFX -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" // nogncheck -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" // nogncheck +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" // nogncheck +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" // nogncheck #endif #ifdef WEBRTC_CODEC_ISAC -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" // nogncheck -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" // nogncheck +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" // nogncheck +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" // nogncheck #endif #ifdef WEBRTC_CODEC_OPUS -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" #endif -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_decoder_impl.h b/modules/audio_coding/neteq/audio_decoder_impl.h index 8dc746c856..c724e72817 100644 --- a/modules/audio_coding/neteq/audio_decoder_impl.h +++ b/modules/audio_coding/neteq/audio_decoder_impl.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ +#define MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/neteq/neteq_decoder_enum.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" #ifdef WEBRTC_CODEC_G722 -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" #endif namespace webrtc { @@ -28,4 +28,4 @@ namespace webrtc { bool CodecSupported(NetEqDecoder codec_type); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_ diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc index f6ae2ddaac..203b8561a8 100644 --- a/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/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/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" #include #include @@ -17,23 +17,23 @@ #include #include -#include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" -#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/opus/audio_encoder_opus.h" +#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector.cc b/modules/audio_coding/neteq/audio_multi_vector.cc index 8263752593..be67d68e3d 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.cc +++ b/modules/audio_coding/neteq/audio_multi_vector.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h index b6f1d393a4..6a51d567ee 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.h +++ b/modules/audio_coding/neteq/audio_multi_vector.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ #include // Access to size_t. #include -#include "webrtc/modules/audio_coding/neteq/audio_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -136,4 +136,4 @@ class AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ diff --git a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index af8d5f1b98..18980f2e83 100644 --- a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" #include #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector.cc b/modules/audio_coding/neteq/audio_vector.cc index c819daacaa..c66682b016 100644 --- a/modules/audio_coding/neteq/audio_vector.cc +++ b/modules/audio_coding/neteq/audio_vector.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/audio_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h index f3dfdd613e..9275cb34b7 100644 --- a/modules/audio_coding/neteq/audio_vector.h +++ b/modules/audio_coding/neteq/audio_vector.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ #include // Access to size_t. #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -165,4 +165,4 @@ class AudioVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ diff --git a/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc index e9ef93f80a..ef024d677f 100644 --- a/modules/audio_coding/neteq/audio_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/audio_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/background_noise.cc b/modules/audio_coding/neteq/background_noise.cc index cf77ec57e9..eda5c7514d 100644 --- a/modules/audio_coding/neteq/background_noise.cc +++ b/modules/audio_coding/neteq/background_noise.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/background_noise.h" #include #include // memcpy #include // min, max -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/cross_correlation.h" -#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/cross_correlation.h" +#include "modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h index 0c662bd384..c6d51ad521 100644 --- a/modules/audio_coding/neteq/background_noise.h +++ b/modules/audio_coding/neteq/background_noise.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ +#define MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ #include // size_t #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -134,4 +134,4 @@ class BackgroundNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_BACKGROUND_NOISE_H_ diff --git a/modules/audio_coding/neteq/background_noise_unittest.cc b/modules/audio_coding/neteq/background_noise_unittest.cc index 3305b2ca4e..e32492f57e 100644 --- a/modules/audio_coding/neteq/background_noise_unittest.cc +++ b/modules/audio_coding/neteq/background_noise_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for BackgroundNoise class. -#include "webrtc/modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/background_noise.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/buffer_level_filter.cc b/modules/audio_coding/neteq/buffer_level_filter.cc index 905479178d..5df59c7243 100644 --- a/modules/audio_coding/neteq/buffer_level_filter.cc +++ b/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/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" #include // Provide access to std::max. diff --git a/modules/audio_coding/neteq/buffer_level_filter.h b/modules/audio_coding/neteq/buffer_level_filter.h index bc9a10e25c..7a48c72b74 100644 --- a/modules/audio_coding/neteq/buffer_level_filter.h +++ b/modules/audio_coding/neteq/buffer_level_filter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ +#define MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -46,4 +46,4 @@ class BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_BUFFER_LEVEL_FILTER_H_ diff --git a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index cfa6e3df36..72c8727429 100644 --- a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc +++ b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for BufferLevelFilter class. -#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" #include // Access to pow function. -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/comfort_noise.cc b/modules/audio_coding/neteq/comfort_noise.cc index 8482e8dd12..d2635f3016 100644 --- a/modules/audio_coding/neteq/comfort_noise.cc +++ b/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/neteq/comfort_noise.h" +#include "modules/audio_coding/neteq/comfort_noise.h" #include -#include "webrtc/api/audio_codecs/audio_decoder.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/sync_buffer.h" -#include "webrtc/rtc_base/logging.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/dsp_helper.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h index fe663cc7b4..e13abb8d07 100644 --- a/modules/audio_coding/neteq/comfort_noise.h +++ b/modules/audio_coding/neteq/comfort_noise.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ +#define MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -68,4 +68,4 @@ class ComfortNoise { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ diff --git a/modules/audio_coding/neteq/comfort_noise_unittest.cc b/modules/audio_coding/neteq/comfort_noise_unittest.cc index 2de6886bbe..b3fbb4eb06 100644 --- a/modules/audio_coding/neteq/comfort_noise_unittest.cc +++ b/modules/audio_coding/neteq/comfort_noise_unittest.cc @@ -10,11 +10,11 @@ // Unit tests for ComfortNoise class. -#include "webrtc/modules/audio_coding/neteq/comfort_noise.h" +#include "modules/audio_coding/neteq/comfort_noise.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/cross_correlation.cc b/modules/audio_coding/neteq/cross_correlation.cc index ad89ab8a13..da9c913249 100644 --- a/modules/audio_coding/neteq/cross_correlation.cc +++ b/modules/audio_coding/neteq/cross_correlation.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/cross_correlation.h" +#include "modules/audio_coding/neteq/cross_correlation.h" #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/cross_correlation.h b/modules/audio_coding/neteq/cross_correlation.h index db14141027..ab18c7e133 100644 --- a/modules/audio_coding/neteq/cross_correlation.h +++ b/modules/audio_coding/neteq/cross_correlation.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ +#define MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -47,4 +47,4 @@ int CrossCorrelationWithAutoShift(const int16_t* sequence_1, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ diff --git a/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc index 94c542db6e..966d5c376d 100644 --- a/modules/audio_coding/neteq/decision_logic.cc +++ b/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/neteq/decision_logic.h" +#include "modules/audio_coding/neteq/decision_logic.h" #include -#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 "modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/decision_logic_fax.h" +#include "modules/audio_coding/neteq/decision_logic_normal.h" +#include "modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h index 7d9ba60fc2..b1ea84a6df 100644 --- a/modules/audio_coding/neteq/decision_logic.h +++ b/modules/audio_coding/neteq/decision_logic.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ +#define MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ -#include "webrtc/modules/audio_coding/neteq/defines.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/defines.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -165,4 +165,4 @@ class DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ diff --git a/modules/audio_coding/neteq/decision_logic_fax.cc b/modules/audio_coding/neteq/decision_logic_fax.cc index 7db8f30ede..cc21ee9deb 100644 --- a/modules/audio_coding/neteq/decision_logic_fax.cc +++ b/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/neteq/decision_logic_fax.h" +#include "modules/audio_coding/neteq/decision_logic_fax.h" #include #include -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/sync_buffer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic_fax.h b/modules/audio_coding/neteq/decision_logic_fax.h index 4efb874775..1eb5b76d1b 100644 --- a/modules/audio_coding/neteq/decision_logic_fax.h +++ b/modules/audio_coding/neteq/decision_logic_fax.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ +#define MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ -#include "webrtc/modules/audio_coding/neteq/decision_logic.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/decision_logic.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ class DecisionLogicFax : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ diff --git a/modules/audio_coding/neteq/decision_logic_normal.cc b/modules/audio_coding/neteq/decision_logic_normal.cc index c5f2570758..c78063cc6a 100644 --- a/modules/audio_coding/neteq/decision_logic_normal.cc +++ b/modules/audio_coding/neteq/decision_logic_normal.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" +#include "modules/audio_coding/neteq/decision_logic_normal.h" #include #include -#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/include/module_common_types.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic_normal.h b/modules/audio_coding/neteq/decision_logic_normal.h index b676bd4deb..f011ae94fe 100644 --- a/modules/audio_coding/neteq/decision_logic_normal.h +++ b/modules/audio_coding/neteq/decision_logic_normal.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ +#define MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ -#include "webrtc/modules/audio_coding/neteq/decision_logic.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/decision_logic.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -104,4 +104,4 @@ class DecisionLogicNormal : public DecisionLogic { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ diff --git a/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc index a5c577866a..1a7bab93da 100644 --- a/modules/audio_coding/neteq/decision_logic_unittest.cc +++ b/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -10,15 +10,15 @@ // Unit tests for DecisionLogic class and derived classes. -#include "webrtc/modules/audio_coding/neteq/decision_logic.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/packet_buffer.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" +#include "modules/audio_coding/neteq/decision_logic.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/audio_coding/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decoder_database.cc b/modules/audio_coding/neteq/decoder_database.cc index 526d159c86..feb02038a2 100644 --- a/modules/audio_coding/neteq/decoder_database.cc +++ b/modules/audio_coding/neteq/decoder_database.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/decoder_database.h" #include // pair -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h index 5feadd1bf1..dff6464af2 100644 --- a/modules/audio_coding/neteq/decoder_database.h +++ b/modules/audio_coding/neteq/decoder_database.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ +#define MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ #include #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_format.h" +#include "common_types.h" // NULL +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/packet.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -243,4 +243,4 @@ class DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc index 3e6548560e..be3c0b7ab8 100644 --- a/modules/audio_coding/neteq/decoder_database_unittest.cc +++ b/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/decoder_database.h" #include #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder.h" -#include "webrtc/test/mock_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder.h" +#include "test/mock_audio_decoder_factory.h" using testing::_; using testing::Invoke; diff --git a/modules/audio_coding/neteq/defines.h b/modules/audio_coding/neteq/defines.h index 3ed6b61889..496a36dfa5 100644 --- a/modules/audio_coding/neteq/defines.h +++ b/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_NETEQ_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ +#define MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ namespace webrtc { @@ -49,4 +49,4 @@ enum Modes { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DEFINES_H_ diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc index bf92588656..ab98a068b5 100644 --- a/modules/audio_coding/neteq/delay_manager.cc +++ b/modules/audio_coding/neteq/delay_manager.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/delay_manager.h" #include #include #include // max, min -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h index ac1de25c2f..6339096a6b 100644 --- a/modules/audio_coding/neteq/delay_manager.h +++ b/modules/audio_coding/neteq/delay_manager.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ +#define MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ #include // Provide access to size_t. #include #include -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -171,4 +171,4 @@ class DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_ diff --git a/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc index a6ee58d8e1..6bdbc38cf1 100644 --- a/modules/audio_coding/neteq/delay_manager_unittest.cc +++ b/modules/audio_coding/neteq/delay_manager_unittest.cc @@ -10,13 +10,13 @@ // Unit tests for DelayManager class. -#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/delay_manager.h" #include -#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_peak_detector.cc b/modules/audio_coding/neteq/delay_peak_detector.cc index b3fe8a746a..16f41d3399 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.cc +++ b/modules/audio_coding/neteq/delay_peak_detector.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" #include // max -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h index 455d4e95a0..2236ef21ba 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.h +++ b/modules/audio_coding/neteq/delay_peak_detector.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ #include // size_t #include #include -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -71,4 +71,4 @@ class DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ diff --git a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc index e92759399a..058ba66362 100644 --- a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc +++ b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for DelayPeakDetector class. -#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dsp_helper.cc b/modules/audio_coding/neteq/dsp_helper.cc index 3275665094..2a1d81ba0d 100644 --- a/modules/audio_coding/neteq/dsp_helper.cc +++ b/modules/audio_coding/neteq/dsp_helper.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "modules/audio_coding/neteq/dsp_helper.h" #include #include // Access to memset. #include // Access to min, max. -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h index 599110aa49..398fc00238 100644 --- a/modules/audio_coding/neteq/dsp_helper.h +++ b/modules/audio_coding/neteq/dsp_helper.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ +#define MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ #include // Access to size_t. -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -141,4 +141,4 @@ class DspHelper { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ diff --git a/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc index fbdc047844..1de16c9eca 100644 --- a/modules/audio_coding/neteq/dsp_helper_unittest.cc +++ b/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "modules/audio_coding/neteq/dsp_helper.h" -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_buffer.cc b/modules/audio_coding/neteq/dtmf_buffer.cc index c5e5adf1a7..b06de5e7e4 100644 --- a/modules/audio_coding/neteq/dtmf_buffer.cc +++ b/modules/audio_coding/neteq/dtmf_buffer.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "modules/audio_coding/neteq/dtmf_buffer.h" #include #include // max -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" // Modify the code to obtain backwards bit-exactness. Once bit-exactness is no // longer required, this #define should be removed (and the code that it diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h index 068ad64d84..341942f102 100644 --- a/modules/audio_coding/neteq/dtmf_buffer.h +++ b/modules/audio_coding/neteq/dtmf_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#define MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ #include #include // size_t -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -111,4 +111,4 @@ class DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ diff --git a/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc index d906d1ca52..7bcf1e0f4e 100644 --- a/modules/audio_coding/neteq/dtmf_buffer_unittest.cc +++ b/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/neteq/dtmf_buffer.h" +#include "modules/audio_coding/neteq/dtmf_buffer.h" #ifdef WIN32 #include // ntohl() @@ -18,7 +18,7 @@ #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" // Modify the tests so that they pass with the modifications done to DtmfBuffer // for backwards bit-exactness. Once bit-exactness is no longer required, this diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.cc b/modules/audio_coding/neteq/dtmf_tone_generator.cc index 416835b189..b848c600d0 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator.cc @@ -28,10 +28,10 @@ // 852 Hz 7 8 9 14 // 941 Hz 10 0 11 15 -#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/dtmf_tone_generator.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h index 713987d7e7..f3f77cc033 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/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_NETEQ_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -51,4 +51,4 @@ class DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ diff --git a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index 9eea103ed5..437af0d345 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -10,12 +10,12 @@ // Unit tests for DtmfToneGenerator class. -#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/dtmf_tone_generator.h" #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand.cc b/modules/audio_coding/neteq/expand.cc index f8ae526b3c..7223f6c228 100644 --- a/modules/audio_coding/neteq/expand.cc +++ b/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/neteq/expand.h" +#include "modules/audio_coding/neteq/expand.h" #include #include // memset @@ -16,14 +16,14 @@ #include // min, max #include // numeric_limits -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/background_noise.h" -#include "webrtc/modules/audio_coding/neteq/cross_correlation.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/statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/cross_correlation.h" +#include "modules/audio_coding/neteq/dsp_helper.h" +#include "modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h index af1543283b..0044ea0285 100644 --- a/modules/audio_coding/neteq/expand.h +++ b/modules/audio_coding/neteq/expand.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ +#define MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ #include #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -158,4 +158,4 @@ struct ExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_EXPAND_H_ diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc index 40cb2eb321..b52d626b8d 100644 --- a/modules/audio_coding/neteq/expand_unittest.cc +++ b/modules/audio_coding/neteq/expand_unittest.cc @@ -10,17 +10,17 @@ // Unit tests for Expand class. -#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/expand.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.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/statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "rtc_base/safe_conversions.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h index 9f5af7cea5..22bff2efa7 100644 --- a/modules/audio_coding/neteq/include/neteq.h +++ b/modules/audio_coding/neteq/include/neteq.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ +#define MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ #include // Provide access to size_t. #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -311,4 +311,4 @@ class NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ diff --git a/modules/audio_coding/neteq/merge.cc b/modules/audio_coding/neteq/merge.cc index df4f792c4a..71e0564e0d 100644 --- a/modules/audio_coding/neteq/merge.cc +++ b/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/neteq/merge.h" +#include "modules/audio_coding/neteq/merge.h" #include #include // memmove, memcpy, memset, size_t @@ -16,14 +16,14 @@ #include // min, max #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/cross_correlation.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/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/cross_correlation.h" +#include "modules/audio_coding/neteq/dsp_helper.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h index 34e6639ff8..6bb1bba805 100644 --- a/modules/audio_coding/neteq/merge.h +++ b/modules/audio_coding/neteq/merge.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MERGE_H_ +#define MODULES_AUDIO_CODING_NETEQ_MERGE_H_ #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -99,4 +99,4 @@ class Merge { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MERGE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MERGE_H_ diff --git a/modules/audio_coding/neteq/merge_unittest.cc b/modules/audio_coding/neteq/merge_unittest.cc index bfabb22885..7ff3b8c7b0 100644 --- a/modules/audio_coding/neteq/merge_unittest.cc +++ b/modules/audio_coding/neteq/merge_unittest.cc @@ -10,16 +10,16 @@ // Unit tests for Merge class. -#include "webrtc/modules/audio_coding/neteq/merge.h" +#include "modules/audio_coding/neteq/merge.h" #include -#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/statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h index da228459d4..f662fb6ec0 100644 --- a/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h +++ b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ -#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -34,4 +34,4 @@ class MockBufferLevelFilter : public BufferLevelFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_BUFFER_LEVEL_FILTER_H_ diff --git a/modules/audio_coding/neteq/mock/mock_decoder_database.h b/modules/audio_coding/neteq/mock/mock_decoder_database.h index 4018879164..049b693210 100644 --- a/modules/audio_coding/neteq/mock/mock_decoder_database.h +++ b/modules/audio_coding/neteq/mock/mock_decoder_database.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ #include -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/decoder_database.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -58,4 +58,4 @@ class MockDecoderDatabase : public DecoderDatabase { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DECODER_DATABASE_H_ diff --git a/modules/audio_coding/neteq/mock/mock_delay_manager.h b/modules/audio_coding/neteq/mock/mock_delay_manager.h index 85ed71dc70..61f209d5c4 100644 --- a/modules/audio_coding/neteq/mock/mock_delay_manager.h +++ b/modules/audio_coding/neteq/mock/mock_delay_manager.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ -#include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/delay_manager.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -59,4 +59,4 @@ class MockDelayManager : public DelayManager { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_ diff --git a/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h index 3a80cb4e70..f6cdea04f1 100644 --- a/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h +++ b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ -#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -32,4 +32,4 @@ class MockDelayPeakDetector : public DelayPeakDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_PEAK_DETECTOR_H_ diff --git a/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h index 0aac22c54d..153a4d716a 100644 --- a/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h +++ b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" +#include "modules/audio_coding/neteq/dtmf_buffer.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -35,4 +35,4 @@ class MockDtmfBuffer : public DtmfBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_BUFFER_H_ diff --git a/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h index bb0a535211..2cb5980891 100644 --- a/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/mock/mock_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_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ -#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/dtmf_tone_generator.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -32,4 +32,4 @@ class MockDtmfToneGenerator : public DtmfToneGenerator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DTMF_TONE_GENERATOR_H_ diff --git a/modules/audio_coding/neteq/mock/mock_expand.h b/modules/audio_coding/neteq/mock/mock_expand.h index 9465f6f550..05fdaec750 100644 --- a/modules/audio_coding/neteq/mock/mock_expand.h +++ b/modules/audio_coding/neteq/mock/mock_expand.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ -#include "webrtc/modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/expand.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -61,4 +61,4 @@ class MockExpandFactory : public ExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXPAND_H_ diff --git a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index 38486801d7..2a9019b341 100644 --- a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "rtc_base/constructormagic.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { @@ -95,4 +95,4 @@ class MockExternalPcm16B : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ diff --git a/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/modules/audio_coding/neteq/mock/mock_packet_buffer.h index 1530329a45..ac7d9b7a25 100644 --- a/modules/audio_coding/neteq/mock/mock_packet_buffer.h +++ b/modules/audio_coding/neteq/mock/mock_packet_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/packet_buffer.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -65,4 +65,4 @@ class MockPacketBuffer : public PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_PACKET_BUFFER_H_ diff --git a/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h b/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h index 8c6e93991b..27a2276664 100644 --- a/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h +++ b/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ -#include "webrtc/modules/audio_coding/neteq/red_payload_splitter.h" +#include "modules/audio_coding/neteq/red_payload_splitter.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -26,4 +26,4 @@ class MockRedPayloadSplitter : public RedPayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_RED_PAYLOAD_SPLITTER_H_ diff --git a/modules/audio_coding/neteq/mock/mock_statistics_calculator.h b/modules/audio_coding/neteq/mock/mock_statistics_calculator.h index c854b24589..85f26206c9 100644 --- a/modules/audio_coding/neteq/mock/mock_statistics_calculator.h +++ b/modules/audio_coding/neteq/mock/mock_statistics_calculator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ -#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -24,4 +24,4 @@ class MockStatisticsCalculator : public StatisticsCalculator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_STATISTICS_CALCULATOR_H_ diff --git a/modules/audio_coding/neteq/nack_tracker.cc b/modules/audio_coding/neteq/nack_tracker.cc index 9829cf93c7..d187883916 100644 --- a/modules/audio_coding/neteq/nack_tracker.cc +++ b/modules/audio_coding/neteq/nack_tracker.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/nack_tracker.h" +#include "modules/audio_coding/neteq/nack_tracker.h" #include // For assert. #include // For std::max. -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_coding/neteq/nack_tracker.h b/modules/audio_coding/neteq/nack_tracker.h index 4f98c82c9c..4f88d917c2 100644 --- a/modules/audio_coding/neteq/nack_tracker.h +++ b/modules/audio_coding/neteq/nack_tracker.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ +#define MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "rtc_base/gtest_prod_util.h" // // The NackTracker class keeps track of the lost packets, an estimate of @@ -205,4 +205,4 @@ class NackTracker { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ diff --git a/modules/audio_coding/neteq/nack_tracker_unittest.cc b/modules/audio_coding/neteq/nack_tracker_unittest.cc index f27b512b18..a3d1800a70 100644 --- a/modules/audio_coding/neteq/nack_tracker_unittest.cc +++ b/modules/audio_coding/neteq/nack_tracker_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/nack_tracker.h" +#include "modules/audio_coding/neteq/nack_tracker.h" #include #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/modules/audio_coding/neteq/neteq.cc b/modules/audio_coding/neteq/neteq.cc index 73233c42e4..8b74973aff 100644 --- a/modules/audio_coding/neteq/neteq.cc +++ b/modules/audio_coding/neteq/neteq.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/include/neteq.h" #include #include -#include "webrtc/modules/audio_coding/neteq/neteq_impl.h" +#include "modules/audio_coding/neteq/neteq_impl.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_decoder_enum.cc b/modules/audio_coding/neteq/neteq_decoder_enum.cc index e9abf206fc..2c61b0afdf 100644 --- a/modules/audio_coding/neteq/neteq_decoder_enum.cc +++ b/modules/audio_coding/neteq/neteq_decoder_enum.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h" +#include "modules/audio_coding/neteq/neteq_decoder_enum.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_decoder_enum.h b/modules/audio_coding/neteq/neteq_decoder_enum.h index e108ccfc41..024f03cd57 100644 --- a/modules/audio_coding/neteq/neteq_decoder_enum.h +++ b/modules/audio_coding/neteq/neteq_decoder_enum.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ +#define MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/api/optional.h" +#include "api/audio_codecs/audio_format.h" +#include "api/optional.h" namespace webrtc { @@ -53,4 +53,4 @@ rtc::Optional NetEqDecoderToSdpAudioFormat(NetEqDecoder nd); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ diff --git a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index ecdcafaf67..32af0ff92d 100644 --- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.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/neteq_external_decoder_test.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/include/module_common_types.h" +#include "test/gmock.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc index 7858e846f6..680250f20f 100644 --- a/modules/audio_coding/neteq/neteq_impl.cc +++ b/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/neteq/neteq_impl.h" +#include "modules/audio_coding/neteq/neteq_impl.h" #include @@ -16,37 +16,37 @@ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.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/merge.h" -#include "webrtc/modules/audio_coding/neteq/nack_tracker.h" -#include "webrtc/modules/audio_coding/neteq/normal.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/modules/audio_coding/neteq/packet_buffer.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/red_payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/audio_codecs/audio_decoder.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/accelerate.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/buffer_level_filter.h" +#include "modules/audio_coding/neteq/comfort_noise.h" +#include "modules/audio_coding/neteq/decision_logic.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/defines.h" +#include "modules/audio_coding/neteq/delay_manager.h" +#include "modules/audio_coding/neteq/delay_peak_detector.h" +#include "modules/audio_coding/neteq/dtmf_buffer.h" +#include "modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/merge.h" +#include "modules/audio_coding/neteq/nack_tracker.h" +#include "modules/audio_coding/neteq/normal.h" +#include "modules/audio_coding/neteq/packet.h" +#include "modules/audio_coding/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/post_decode_vad.h" +#include "modules/audio_coding/neteq/preemptive_expand.h" +#include "modules/audio_coding/neteq/red_payload_splitter.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "modules/audio_coding/neteq/timestamp_scaler.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/sanitizer.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index ea10558725..72d909ae79 100644 --- a/modules/audio_coding/neteq/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ +#define MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ #include #include -#include "webrtc/api/optional.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/include/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/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/defines.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/packet.h" // Declare PacketList. +#include "modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/rtcp.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -446,4 +446,4 @@ class NetEqImpl : public webrtc::NetEq { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc index fafc2df03e..c7717c856c 100644 --- a/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -10,29 +10,29 @@ #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/accelerate.h" -#include "webrtc/modules/audio_coding/neteq/expand.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.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_red_payload_splitter.h" -#include "webrtc/modules/audio_coding/neteq/neteq_impl.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/include/module_common_types.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder.h" -#include "webrtc/test/mock_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/accelerate.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/mock/mock_buffer_level_filter.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/mock/mock_delay_manager.h" +#include "modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" +#include "modules/audio_coding/neteq/mock/mock_dtmf_buffer.h" +#include "modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/mock/mock_packet_buffer.h" +#include "modules/audio_coding/neteq/mock/mock_red_payload_splitter.h" +#include "modules/audio_coding/neteq/neteq_impl.h" +#include "modules/audio_coding/neteq/preemptive_expand.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "modules/audio_coding/neteq/timestamp_scaler.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/safe_conversions.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder.h" +#include "test/mock_audio_decoder_factory.h" using ::testing::AtLeast; using ::testing::Return; diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index bfa9362f61..de2d9e860c 100644 --- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gmock.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/include/module_common_types.h" +#include "test/gmock.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc index 7c25dd4b81..ca3dde2acd 100644 --- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -15,15 +15,15 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/include/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/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 303973c580..010fe55b41 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/include/neteq.h" #include #include @@ -20,27 +20,27 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/rtc_base/sha1digest.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/flags.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" +#include "rtc_base/sha1digest.h" +#include "rtc_base/stringencode.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" #ifdef WEBRTC_NETEQ_UNITTEST_BITEXACT RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h" #else -#include "webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h" +#include "modules/audio_coding/neteq/neteq_unittest.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/modules/audio_coding/neteq/normal.cc b/modules/audio_coding/neteq/normal.cc index 551fd9bbe7..48d723a81b 100644 --- a/modules/audio_coding/neteq/normal.cc +++ b/modules/audio_coding/neteq/normal.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/normal.h" +#include "modules/audio_coding/neteq/normal.h" #include // memset, memcpy #include // min -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.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/rtc_base/checks.h" +#include "api/audio_codecs/audio_decoder.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/expand.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h index c764155eff..13cd333e3c 100644 --- a/modules/audio_coding/neteq/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#define MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ #include // Access to size_t. #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/safe_conversions.h" +#include "typedefs.h" namespace webrtc { @@ -72,4 +72,4 @@ class Normal { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ diff --git a/modules/audio_coding/neteq/normal_unittest.cc b/modules/audio_coding/neteq/normal_unittest.cc index 1044c4b1b3..b0655d9a81 100644 --- a/modules/audio_coding/neteq/normal_unittest.cc +++ b/modules/audio_coding/neteq/normal_unittest.cc @@ -10,21 +10,21 @@ // Unit tests for Normal class. -#include "webrtc/modules/audio_coding/neteq/normal.h" +#include "modules/audio_coding/neteq/normal.h" #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.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/expand.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_expand.h" -#include "webrtc/modules/audio_coding/neteq/random_vector.h" -#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/test/gtest.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/expand.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/mock/mock_expand.h" +#include "modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "test/gtest.h" using ::testing::_; using ::testing::Invoke; diff --git a/modules/audio_coding/neteq/packet.cc b/modules/audio_coding/neteq/packet.cc index f25f81a241..3cec310902 100644 --- a/modules/audio_coding/neteq/packet.cc +++ b/modules/audio_coding/neteq/packet.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/packet.h" +#include "modules/audio_coding/neteq/packet.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/packet.h b/modules/audio_coding/neteq/packet.h index 52a9a13401..3772f5c77a 100644 --- a/modules/audio_coding/neteq/packet.h +++ b/modules/audio_coding/neteq/packet.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#define MODULES_AUDIO_CODING_NETEQ_PACKET_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/buffer.h" +#include "typedefs.h" namespace webrtc { @@ -121,4 +121,4 @@ struct Packet { typedef std::list PacketList; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_PACKET_H_ diff --git a/modules/audio_coding/neteq/packet_buffer.cc b/modules/audio_coding/neteq/packet_buffer.cc index e0e2e9a128..b670c69eaa 100644 --- a/modules/audio_coding/neteq/packet_buffer.cc +++ b/modules/audio_coding/neteq/packet_buffer.cc @@ -12,15 +12,15 @@ // 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/neteq/packet_buffer.h" +#include "modules/audio_coding/neteq/packet_buffer.h" #include // find_if() -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/rtc_base/logging.h" +#include "api/audio_codecs/audio_decoder.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h index 5c2499c6b9..a7e54f75dd 100644 --- a/modules/audio_coding/neteq/packet_buffer.h +++ b/modules/audio_coding/neteq/packet_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ +#define MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "modules/audio_coding/neteq/packet.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -145,4 +145,4 @@ class PacketBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ diff --git a/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc index 7dcf6c45ca..4beead6729 100644 --- a/modules/audio_coding/neteq/packet_buffer_unittest.cc +++ b/modules/audio_coding/neteq/packet_buffer_unittest.cc @@ -10,14 +10,14 @@ // Unit tests for PacketBuffer class. -#include "webrtc/modules/audio_coding/neteq/packet_buffer.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_statistics_calculator.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/packet_buffer.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/mock/mock_statistics_calculator.h" +#include "modules/audio_coding/neteq/packet.h" +#include "modules/audio_coding/neteq/tick_timer.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::Return; using ::testing::StrictMock; diff --git a/modules/audio_coding/neteq/post_decode_vad.cc b/modules/audio_coding/neteq/post_decode_vad.cc index 714073ad10..a09d18ffd8 100644 --- a/modules/audio_coding/neteq/post_decode_vad.cc +++ b/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/neteq/post_decode_vad.h" +#include "modules/audio_coding/neteq/post_decode_vad.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h index a98992f939..649d20f7be 100644 --- a/modules/audio_coding/neteq/post_decode_vad.h +++ b/modules/audio_coding/neteq/post_decode_vad.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ +#define MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ #include // size_t -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/common_types.h" // NULL -#include "webrtc/modules/audio_coding/neteq/defines.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/audio_decoder.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "common_types.h" // NULL +#include "modules/audio_coding/neteq/defines.h" +#include "modules/audio_coding/neteq/packet.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ class PostDecodeVad { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ diff --git a/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/modules/audio_coding/neteq/post_decode_vad_unittest.cc index 231d7f1d7f..da3e4e864e 100644 --- a/modules/audio_coding/neteq/post_decode_vad_unittest.cc +++ b/modules/audio_coding/neteq/post_decode_vad_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for PostDecodeVad class. -#include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" +#include "modules/audio_coding/neteq/post_decode_vad.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.cc b/modules/audio_coding/neteq/preemptive_expand.cc index f51a5bdbc5..bc753895b1 100644 --- a/modules/audio_coding/neteq/preemptive_expand.cc +++ b/modules/audio_coding/neteq/preemptive_expand.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "modules/audio_coding/neteq/preemptive_expand.h" #include // min, max -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h index 1275a37f08..5af0078059 100644 --- a/modules/audio_coding/neteq/preemptive_expand.h +++ b/modules/audio_coding/neteq/preemptive_expand.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ +#define MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ #include -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/audio_coding/neteq/time_stretch.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/time_stretch.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -85,4 +85,4 @@ struct PreemptiveExpandFactory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ diff --git a/modules/audio_coding/neteq/random_vector.cc b/modules/audio_coding/neteq/random_vector.cc index b12f217155..c2df8cf80a 100644 --- a/modules/audio_coding/neteq/random_vector.cc +++ b/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/neteq/random_vector.h" +#include "modules/audio_coding/neteq/random_vector.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq/random_vector.h index 394e940d3d..143449397a 100644 --- a/modules/audio_coding/neteq/random_vector.h +++ b/modules/audio_coding/neteq/random_vector.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ #include // size_t -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -47,4 +47,4 @@ class RandomVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ diff --git a/modules/audio_coding/neteq/random_vector_unittest.cc b/modules/audio_coding/neteq/random_vector_unittest.cc index ca0a378bb5..44479a6dd6 100644 --- a/modules/audio_coding/neteq/random_vector_unittest.cc +++ b/modules/audio_coding/neteq/random_vector_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for RandomVector class. -#include "webrtc/modules/audio_coding/neteq/random_vector.h" +#include "modules/audio_coding/neteq/random_vector.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/red_payload_splitter.cc b/modules/audio_coding/neteq/red_payload_splitter.cc index daf24e7455..74822dd48d 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.cc +++ b/modules/audio_coding/neteq/red_payload_splitter.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/red_payload_splitter.h" +#include "modules/audio_coding/neteq/red_payload_splitter.h" #include #include -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "modules/audio_coding/neteq/decoder_database.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/red_payload_splitter.h b/modules/audio_coding/neteq/red_payload_splitter.h index 8134bfc508..1475b1b4a1 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.h +++ b/modules/audio_coding/neteq/red_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_NETEQ_RED_PAYLOAD_SPLITTER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ +#define MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/neteq/packet.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -48,4 +48,4 @@ class RedPayloadSplitter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ diff --git a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc index 4a1fb9eda5..7d97210595 100644 --- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc +++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc @@ -10,18 +10,18 @@ // Unit tests for RedPayloadSplitter class. -#include "webrtc/modules/audio_coding/neteq/red_payload_splitter.h" +#include "modules/audio_coding/neteq/red_payload_splitter.h" #include #include #include // pair -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/packet.h" +#include "test/gtest.h" +#include "test/mock_audio_decoder_factory.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/modules/audio_coding/neteq/rtcp.cc b/modules/audio_coding/neteq/rtcp.cc index 3f8ef0e4e9..2885398584 100644 --- a/modules/audio_coding/neteq/rtcp.cc +++ b/modules/audio_coding/neteq/rtcp.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/rtcp.h" +#include "modules/audio_coding/neteq/rtcp.h" #include #include #include -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/rtcp.h b/modules/audio_coding/neteq/rtcp.h index ae0ed8d785..92b2e2c7e8 100644 --- a/modules/audio_coding/neteq/rtcp.h +++ b/modules/audio_coding/neteq/rtcp.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_RTCP_H_ +#define MODULES_AUDIO_CODING_NETEQ_RTCP_H_ -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -55,4 +55,4 @@ class Rtcp { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_RTCP_H_ diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc index e47f92fe97..163cfff332 100644 --- a/modules/audio_coding/neteq/statistics_calculator.cc +++ b/modules/audio_coding/neteq/statistics_calculator.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" +#include "modules/audio_coding/neteq/statistics_calculator.h" #include #include // memset #include -#include "webrtc/modules/audio_coding/neteq/decision_logic.h" -#include "webrtc/modules/audio_coding/neteq/delay_manager.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_coding/neteq/decision_logic.h" +#include "modules/audio_coding/neteq/delay_manager.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h index f261a66dae..a3f0715f17 100644 --- a/modules/audio_coding/neteq/statistics_calculator.h +++ b/modules/audio_coding/neteq/statistics_calculator.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ #include #include -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -182,4 +182,4 @@ class StatisticsCalculator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_STATISTICS_CALCULATOR_H_ diff --git a/modules/audio_coding/neteq/sync_buffer.cc b/modules/audio_coding/neteq/sync_buffer.cc index 49f80132a1..28d7649fdb 100644 --- a/modules/audio_coding/neteq/sync_buffer.cc +++ b/modules/audio_coding/neteq/sync_buffer.cc @@ -10,8 +10,8 @@ #include // Access to min. -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/neteq/sync_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h index a3a78f5ca5..98a606b4f8 100644 --- a/modules/audio_coding/neteq/sync_buffer.h +++ b/modules/audio_coding/neteq/sync_buffer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#define MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -98,4 +98,4 @@ class SyncBuffer : public AudioMultiVector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ diff --git a/modules/audio_coding/neteq/sync_buffer_unittest.cc b/modules/audio_coding/neteq/sync_buffer_unittest.cc index cbf26e0c77..f3f789527c 100644 --- a/modules/audio_coding/neteq/sync_buffer_unittest.cc +++ b/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h index 56ed72fcee..0526546721 100644 --- a/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h +++ b/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h @@ -13,8 +13,8 @@ #include #include -#include "webrtc/typedefs.h" -#include "webrtc/modules/include/module_common_types.h" +#include "typedefs.h" +#include "modules/include/module_common_types.h" enum stereoModes { stereoModeMono, diff --git a/modules/audio_coding/neteq/test/RTPchange.cc b/modules/audio_coding/neteq/test/RTPchange.cc index 54395c026a..3e900024b8 100644 --- a/modules/audio_coding/neteq/test/RTPchange.cc +++ b/modules/audio_coding/neteq/test/RTPchange.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" -#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" +#include "modules/audio_coding/neteq/test/NETEQTEST_DummyRTPpacket.h" +#include "modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 //#define WEBRTC_DUMMY_RTP diff --git a/modules/audio_coding/neteq/test/RTPencode.cc b/modules/audio_coding/neteq/test/RTPencode.cc index 8ad50903f5..249fbaa19d 100644 --- a/modules/audio_coding/neteq/test/RTPencode.cc +++ b/modules/audio_coding/neteq/test/RTPencode.cc @@ -25,12 +25,12 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "typedefs.h" // needed for NetEqDecoder -#include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/audio_decoder_impl.h" +#include "modules/audio_coding/neteq/include/neteq.h" /************************/ /* Define payload types */ @@ -132,10 +132,10 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride); #include "webrtc_vad.h" #if ((defined CODEC_PCM16B) || (defined NETEQ_ARBITRARY_CODEC)) -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" #endif #ifdef CODEC_G711 -#include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h" +#include "modules/audio_coding/codecs/g711/g711_interface.h" #endif #ifdef CODEC_G729 #include "G729Interface.h" @@ -152,19 +152,19 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride); #include "AMRWBCreation.h" #endif #ifdef CODEC_ILBC -#include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/ilbc/ilbc.h" #endif #if (defined CODEC_ISAC || defined CODEC_ISAC_SWB) -#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" +#include "modules/audio_coding/codecs/isac/main/include/isac.h" #endif #ifdef NETEQ_ISACFIX_CODEC -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" #ifdef CODEC_ISAC #error Cannot have both ISAC and ISACfix defined. Please de-select one. #endif #endif #ifdef CODEC_G722 -#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" #endif #ifdef CODEC_G722_1_24 #include "G722_1Interface.h" @@ -194,10 +194,10 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride); #endif #if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \ defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48)) -#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" #endif #ifdef CODEC_OPUS -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" #endif /***********************************/ diff --git a/modules/audio_coding/neteq/test/RTPjitter.cc b/modules/audio_coding/neteq/test/RTPjitter.cc index 391f051f30..baaf8f0bec 100644 --- a/modules/audio_coding/neteq/test/RTPjitter.cc +++ b/modules/audio_coding/neteq/test/RTPjitter.cc @@ -25,8 +25,8 @@ #include -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" /*********************/ /* Misc. definitions */ diff --git a/modules/audio_coding/neteq/test/RTPtimeshift.cc b/modules/audio_coding/neteq/test/RTPtimeshift.cc index 3b7a53c4ab..a2429f1033 100644 --- a/modules/audio_coding/neteq/test/RTPtimeshift.cc +++ b/modules/audio_coding/neteq/test/RTPtimeshift.cc @@ -12,8 +12,8 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" +#include "test/gtest.h" #define FIRSTLINELEN 40 diff --git a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc index 2f8ca1b78f..c18133a823 100644 --- a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/safe_conversions.h" +#include "test/testsupport/fileutils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc b/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc index 5a73a6adb1..d88f789f02 100644 --- a/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" -#include "webrtc/rtc_base/flags.h" +#include "modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "rtc_base/flags.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc b/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc index f4edf37376..c2542b6937 100644 --- a/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_opus_quality_test.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" -#include "webrtc/rtc_base/flags.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/codecs/opus/opus_inst.h" +#include "modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "rtc_base/flags.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc index 5ea90569a5..c91d6f753f 100644 --- a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/safe_conversions.h" +#include "test/testsupport/fileutils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc index e64def4391..f74360eef4 100644 --- a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc +++ b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" -#include "webrtc/typedefs.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/audio_coding/neteq/tools/neteq_performance_test.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" +#include "typedefs.h" +#include "system_wrappers/include/field_trial.h" // Runs a test with 10% packet losses and 10% clock drift, to exercise // both loss concealment and time-stretching code. diff --git a/modules/audio_coding/neteq/test/neteq_speed_test.cc b/modules/audio_coding/neteq/test/neteq_speed_test.cc index c58381f6ac..1e8c1ea7fc 100644 --- a/modules/audio_coding/neteq/test/neteq_speed_test.cc +++ b/modules/audio_coding/neteq/test/neteq_speed_test.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/tools/neteq_performance_test.h" +#include "rtc_base/flags.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" // Define command line flags. DEFINE_int(runtime_ms, 10000, "Simulated runtime in ms."); diff --git a/modules/audio_coding/neteq/tick_timer.cc b/modules/audio_coding/neteq/tick_timer.cc index 4a1b9b7b1f..17f83b14ef 100644 --- a/modules/audio_coding/neteq/tick_timer.cc +++ b/modules/audio_coding/neteq/tick_timer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "modules/audio_coding/neteq/tick_timer.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h index 55e9eab361..93f9ee4a41 100644 --- a/modules/audio_coding/neteq/tick_timer.h +++ b/modules/audio_coding/neteq/tick_timer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ +#define MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -107,4 +107,4 @@ class TickTimer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ diff --git a/modules/audio_coding/neteq/tick_timer_unittest.cc b/modules/audio_coding/neteq/tick_timer_unittest.cc index 6f338d19ac..875f04db0a 100644 --- a/modules/audio_coding/neteq/tick_timer_unittest.cc +++ b/modules/audio_coding/neteq/tick_timer_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "modules/audio_coding/neteq/tick_timer.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/time_stretch.cc b/modules/audio_coding/neteq/time_stretch.cc index 630051b122..d0ea68af3a 100644 --- a/modules/audio_coding/neteq/time_stretch.cc +++ b/modules/audio_coding/neteq/time_stretch.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/time_stretch.h" +#include "modules/audio_coding/neteq/time_stretch.h" #include // min, max #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/background_noise.h" -#include "webrtc/modules/audio_coding/neteq/cross_correlation.h" -#include "webrtc/modules/audio_coding/neteq/dsp_helper.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/cross_correlation.h" +#include "modules/audio_coding/neteq/dsp_helper.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h index ff056e61d4..5192cbd269 100644 --- a/modules/audio_coding/neteq/time_stretch.h +++ b/modules/audio_coding/neteq/time_stretch.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ +#define MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ #include #include // memset, size_t -#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -113,4 +113,4 @@ class TimeStretch { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TIME_STRETCH_H_ diff --git a/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc index f549b27c28..8d0f4d4a64 100644 --- a/modules/audio_coding/neteq/time_stretch_unittest.cc +++ b/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -10,18 +10,18 @@ // Unit tests for Accelerate and PreemptiveExpand classes. -#include "webrtc/modules/audio_coding/neteq/accelerate.h" -#include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" +#include "modules/audio_coding/neteq/accelerate.h" +#include "modules/audio_coding/neteq/preemptive_expand.h" #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/neteq/background_noise.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/background_noise.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/timestamp_scaler.cc b/modules/audio_coding/neteq/timestamp_scaler.cc index f246cbedec..3b67a380b3 100644 --- a/modules/audio_coding/neteq/timestamp_scaler.cc +++ b/modules/audio_coding/neteq/timestamp_scaler.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" +#include "modules/audio_coding/neteq/timestamp_scaler.h" -#include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "modules/audio_coding/neteq/decoder_database.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h index bfb8d9c25e..fa67717742 100644 --- a/modules/audio_coding/neteq/timestamp_scaler.h +++ b/modules/audio_coding/neteq/timestamp_scaler.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ +#define MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/packet.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -65,4 +65,4 @@ class TimestampScaler { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ diff --git a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc index 13c45547ae..b3c1bb0ee0 100644 --- a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc +++ b/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/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" -#include "webrtc/modules/audio_coding/neteq/packet.h" -#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/neteq/mock/mock_decoder_database.h" +#include "modules/audio_coding/neteq/packet.h" +#include "modules/audio_coding/neteq/timestamp_scaler.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::Return; using ::testing::ReturnNull; diff --git a/modules/audio_coding/neteq/tools/DEPS b/modules/audio_coding/neteq/tools/DEPS index 0f16a4fcee..4db1e1d6e5 100644 --- a/modules/audio_coding/neteq/tools/DEPS +++ b/modules/audio_coding/neteq/tools/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+webrtc/logging/rtc_event_log", + "+logging/rtc_event_log", ] diff --git a/modules/audio_coding/neteq/tools/audio_checksum.h b/modules/audio_coding/neteq/tools/audio_checksum.h index 48fde65c45..9ec8358b2c 100644 --- a/modules/audio_coding/neteq/tools/audio_checksum.h +++ b/modules/audio_coding/neteq/tools/audio_checksum.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ #include -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/md5digest.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/md5digest.h" +#include "rtc_base/stringencode.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -56,4 +56,4 @@ class AudioChecksum : public AudioSink { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_CHECKSUM_H_ diff --git a/modules/audio_coding/neteq/tools/audio_loop.cc b/modules/audio_coding/neteq/tools/audio_loop.cc index 56765aaefa..b5ad8817fe 100644 --- a/modules/audio_coding/neteq/tools/audio_loop.cc +++ b/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/neteq/tools/audio_loop.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" #include #include diff --git a/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h index d226df4bac..b26f310e41 100644 --- a/modules/audio_coding/neteq/tools/audio_loop.h +++ b/modules/audio_coding/neteq/tools/audio_loop.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -56,4 +56,4 @@ class AudioLoop { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_LOOP_H_ diff --git a/modules/audio_coding/neteq/tools/audio_sink.cc b/modules/audio_coding/neteq/tools/audio_sink.cc index 665dc412bd..7d7af7ef9f 100644 --- a/modules/audio_coding/neteq/tools/audio_sink.cc +++ b/modules/audio_coding/neteq/tools/audio_sink.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/audio_sink.h b/modules/audio_coding/neteq/tools/audio_sink.h index 076b408e82..17b9e67a91 100644 --- a/modules/audio_coding/neteq/tools/audio_sink.h +++ b/modules/audio_coding/neteq/tools/audio_sink.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -68,4 +68,4 @@ class VoidAudioSink : public AudioSink { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ diff --git a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc index 29e3402a74..6b325b6c5c 100644 --- a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc +++ b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h" +#include "modules/audio_coding/neteq/tools/constant_pcm_packet_source.h" #include -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h index 12503339cb..7c5aa678fa 100644 --- a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h +++ b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -52,4 +52,4 @@ class ConstantPcmPacketSource : public PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_CONSTANT_PCM_PACKET_SOURCE_H_ diff --git a/modules/audio_coding/neteq/tools/encode_neteq_input.cc b/modules/audio_coding/neteq/tools/encode_neteq_input.cc index 41bed7c31b..d04e8187a1 100644 --- a/modules/audio_coding/neteq/tools/encode_neteq_input.cc +++ b/modules/audio_coding/neteq/tools/encode_neteq_input.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h" +#include "modules/audio_coding/neteq/tools/encode_neteq_input.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/encode_neteq_input.h b/modules/audio_coding/neteq/tools/encode_neteq_input.h index df78e2a18a..b44d4ac08c 100644 --- a/modules/audio_coding/neteq/tools/encode_neteq_input.h +++ b/modules/audio_coding/neteq/tools/encode_neteq_input.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ #include -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" -#include "webrtc/modules/include/module_common_types.h" +#include "api/audio_codecs/audio_encoder.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/include/module_common_types.h" namespace webrtc { namespace test { @@ -68,4 +68,4 @@ class EncodeNetEqInput : public NetEqInput { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_ENCODE_NETEQ_INPUT_H_ diff --git a/modules/audio_coding/neteq/tools/fake_decode_from_file.cc b/modules/audio_coding/neteq/tools/fake_decode_from_file.cc index eef32df4cf..6779e5e9a6 100644 --- a/modules/audio_coding/neteq/tools/fake_decode_from_file.cc +++ b/modules/audio_coding/neteq/tools/fake_decode_from_file.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" +#include "modules/audio_coding/neteq/tools/fake_decode_from_file.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/fake_decode_from_file.h b/modules/audio_coding/neteq/tools/fake_decode_from_file.h index 09c2e789f0..7aa8e6e40f 100644 --- a/modules/audio_coding/neteq/tools/fake_decode_from_file.h +++ b/modules/audio_coding/neteq/tools/fake_decode_from_file.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/optional.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" namespace webrtc { namespace test { @@ -70,4 +70,4 @@ class FakeDecodeFromFile : public AudioDecoder { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_FAKE_DECODE_FROM_FILE_H_ diff --git a/modules/audio_coding/neteq/tools/input_audio_file.cc b/modules/audio_coding/neteq/tools/input_audio_file.cc index 97d20bc973..8c8b72c5d1 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file.cc +++ b/modules/audio_coding/neteq/tools/input_audio_file.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h index 271c513587..a0ba7f6338 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file.h +++ b/modules/audio_coding/neteq/tools/input_audio_file.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -55,4 +55,4 @@ class InputAudioFile { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_INPUT_AUDIO_FILE_H_ diff --git a/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc index ff795d81eb..e0ee265aae 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc +++ b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for test InputAudioFile class. -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc index a0f5aa7217..72a539f1d0 100644 --- a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc +++ b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" +#include "modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" #include #include @@ -17,7 +17,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h index e142a3b0c3..cbac836054 100644 --- a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h +++ b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/audio_coding/neteq/tools/neteq_test.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -68,4 +68,4 @@ class NetEqDelayAnalyzer : public test::NetEqPostInsertPacket, } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_DELAY_ANALYZER_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc index 8d88b08caa..68dde5296f 100644 --- a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc @@ -9,11 +9,11 @@ */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" +#include "modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h index fc66c0f989..61e256ee71 100644 --- a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h +++ b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/include/module_common_types.h" +#include "api/audio_codecs/audio_decoder.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/include/module_common_types.h" namespace webrtc { namespace test { @@ -62,4 +62,4 @@ class NetEqExternalDecoderTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_input.cc b/modules/audio_coding/neteq/tools/neteq_input.cc index 752bb29a33..44513ab15b 100644 --- a/modules/audio_coding/neteq/tools/neteq_input.cc +++ b/modules/audio_coding/neteq/tools/neteq_input.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" #include diff --git a/modules/audio_coding/neteq/tools/neteq_input.h b/modules/audio_coding/neteq/tools/neteq_input.h index 08f554bd4e..cf283861f3 100644 --- a/modules/audio_coding/neteq/tools/neteq_input.h +++ b/modules/audio_coding/neteq/tools/neteq_input.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/rtc_base/buffer.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "rtc_base/buffer.h" namespace webrtc { namespace test { @@ -80,4 +80,4 @@ class NetEqInput { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_INPUT_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc b/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc index 13a061f976..12a12c44db 100644 --- a/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc +++ b/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.h" +#include "modules/audio_coding/neteq/tools/neteq_packet_source_input.h" #include #include -#include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/neteq/tools/rtc_event_log_source.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_packet_source_input.h b/modules/audio_coding/neteq/tools/neteq_packet_source_input.h index 35b54fa41f..b482556c5a 100644 --- a/modules/audio_coding/neteq/tools/neteq_packet_source_input.h +++ b/modules/audio_coding/neteq/tools/neteq_packet_source_input.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ #include #include -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { namespace test { @@ -81,4 +81,4 @@ class NetEqEventLogInput final : public NetEqPacketSourceInput { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PACKET_SOURCE_INPUT_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc index 8d0cf90d17..d3de4dee4b 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" +#include "modules/audio_coding/neteq/tools/neteq_performance_test.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tools/audio_loop.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" using webrtc::NetEq; using webrtc::test::AudioLoop; diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.h b/modules/audio_coding/neteq/tools/neteq_performance_test.h index d094db0f9b..a02e40c01d 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.h +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -29,4 +29,4 @@ class NetEqPerformanceTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 85adb597e0..7df46ff4f3 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "modules/audio_coding/neteq/tools/output_audio_file.h" +#include "modules/audio_coding/neteq/tools/output_wav_file.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "rtc_base/checks.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h index c1964b6dc8..f920191ab6 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.h +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/flags.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -137,4 +137,4 @@ class NetEqQualityTest : public ::testing::Test { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_replacement_input.cc b/modules/audio_coding/neteq/tools/neteq_replacement_input.cc index 553c71f1a4..a3e3413d82 100644 --- a/modules/audio_coding/neteq/tools/neteq_replacement_input.cc +++ b/modules/audio_coding/neteq/tools/neteq_replacement_input.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" +#include "modules/audio_coding/neteq/tools/neteq_replacement_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_coding/neteq/tools/fake_decode_from_file.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_replacement_input.h b/modules/audio_coding/neteq/tools/neteq_replacement_input.h index ee1e4ae66e..3a89399771 100644 --- a/modules/audio_coding/neteq/tools/neteq_replacement_input.h +++ b/modules/audio_coding/neteq/tools/neteq_replacement_input.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ #include #include -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" namespace webrtc { namespace test { @@ -48,4 +48,4 @@ class NetEqReplacementInput : public NetEqInput { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_REPLACEMENT_INPUT_H_ diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index d6647e42bc..eb057cc766 100644 --- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -22,21 +22,21 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tools/fake_decode_from_file.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" +#include "modules/audio_coding/neteq/tools/neteq_packet_source_input.h" +#include "modules/audio_coding/neteq/tools/neteq_replacement_input.h" +#include "modules/audio_coding/neteq/tools/neteq_test.h" +#include "modules/audio_coding/neteq/tools/output_audio_file.h" +#include "modules/audio_coding/neteq/tools/output_wav_file.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc index 598ffd76f3..39d9549577 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_test.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" +#include "modules/audio_coding/neteq/tools/neteq_test.h" #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_test.h b/modules/audio_coding/neteq/tools/neteq_test.h index 18fad9a971..2c0a07caad 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.h +++ b/modules/audio_coding/neteq/tools/neteq_test.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ #include #include #include #include -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "modules/audio_coding/neteq/tools/neteq_input.h" namespace webrtc { namespace test { @@ -103,4 +103,4 @@ class NetEqTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_TEST_H_ diff --git a/modules/audio_coding/neteq/tools/output_audio_file.h b/modules/audio_coding/neteq/tools/output_audio_file.h index 79344703de..7e65bc25db 100644 --- a/modules/audio_coding/neteq/tools/output_audio_file.h +++ b/modules/audio_coding/neteq/tools/output_audio_file.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ #include #include #include -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -47,4 +47,4 @@ class OutputAudioFile : public AudioSink { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_AUDIO_FILE_H_ diff --git a/modules/audio_coding/neteq/tools/output_wav_file.h b/modules/audio_coding/neteq/tools/output_wav_file.h index 7b3431d378..031a8cb929 100644 --- a/modules/audio_coding/neteq/tools/output_wav_file.h +++ b/modules/audio_coding/neteq/tools/output_wav_file.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ #include -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_audio/wav_file.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -40,4 +40,4 @@ class OutputWavFile : public AudioSink { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_OUTPUT_WAV_FILE_H_ diff --git a/modules/audio_coding/neteq/tools/packet.cc b/modules/audio_coding/neteq/tools/packet.cc index b5b1b2f97a..71337b6e68 100644 --- a/modules/audio_coding/neteq/tools/packet.cc +++ b/modules/audio_coding/neteq/tools/packet.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/packet.h" #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h index ce9ef5a466..583ef56c02 100644 --- a/modules/audio_coding/neteq/tools/packet.h +++ b/modules/audio_coding/neteq/tools/packet.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -114,4 +114,4 @@ class Packet { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_H_ diff --git a/modules/audio_coding/neteq/tools/packet_source.cc b/modules/audio_coding/neteq/tools/packet_source.cc index d6cb37ef39..30bf431835 100644 --- a/modules/audio_coding/neteq/tools/packet_source.cc +++ b/modules/audio_coding/neteq/tools/packet_source.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h index 233ddec018..3e825d4772 100644 --- a/modules/audio_coding/neteq/tools/packet_source.h +++ b/modules/audio_coding/neteq/tools/packet_source.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ #include #include -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -47,4 +47,4 @@ class PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_PACKET_SOURCE_H_ diff --git a/modules/audio_coding/neteq/tools/packet_unittest.cc b/modules/audio_coding/neteq/tools/packet_unittest.cc index 940276bdfc..ce6a3b9697 100644 --- a/modules/audio_coding/neteq/tools/packet_unittest.cc +++ b/modules/audio_coding/neteq/tools/packet_unittest.cc @@ -10,9 +10,9 @@ // Unit tests for test Packet class. -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/resample_input_audio_file.cc b/modules/audio_coding/neteq/tools/resample_input_audio_file.cc index 45c5b2028c..5050e1fb17 100644 --- a/modules/audio_coding/neteq/tools/resample_input_audio_file.cc +++ b/modules/audio_coding/neteq/tools/resample_input_audio_file.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/modules/audio_coding/neteq/tools/resample_input_audio_file.h index b008d19562..0099979e6e 100644 --- a/modules/audio_coding/neteq/tools/resample_input_audio_file.h +++ b/modules/audio_coding/neteq/tools/resample_input_audio_file.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ #include -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_audio/resampler/include/resampler.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -48,4 +48,4 @@ class ResampleInputAudioFile : public InputAudioFile { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_RESAMPLE_INPUT_AUDIO_FILE_H_ diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc index f54f91eb69..1603ee8f0d 100644 --- a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc +++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h" +#include "modules/audio_coding/neteq/tools/rtc_event_log_source.h" #include #include #include #include -#include "webrtc/call/call.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/checks.h" +#include "call/call.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/modules/audio_coding/neteq/tools/rtc_event_log_source.h index 15e3ce7eb8..df01e06535 100644 --- a/modules/audio_coding/neteq/tools/rtc_event_log_source.h +++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -62,4 +62,4 @@ class RtcEventLogSource : public PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ diff --git a/modules/audio_coding/neteq/tools/rtp_analyze.cc b/modules/audio_coding/neteq/tools/rtp_analyze.cc index 23f96c56b2..12721ccc96 100644 --- a/modules/audio_coding/neteq/tools/rtp_analyze.cc +++ b/modules/audio_coding/neteq/tools/rtp_analyze.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "webrtc/rtc_base/flags.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "rtc_base/flags.h" // Define command line flags. DEFINE_int(red, 117, "RTP payload type for RED"); diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.cc b/modules/audio_coding/neteq/tools/rtp_file_source.cc index 5ea8de919f..c9ae5f2e71 100644 --- a/modules/audio_coding/neteq/tools/rtp_file_source.cc +++ b/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/neteq/tools/rtp_file_source.h" +#include "modules/audio_coding/neteq/tools/rtp_file_source.h" #include #include @@ -20,10 +20,10 @@ #include -#include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/rtp_file_reader.h" +#include "modules/audio_coding/neteq/tools/packet.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/checks.h" +#include "test/rtp_file_reader.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.h b/modules/audio_coding/neteq/tools/rtp_file_source.h index 9b0160f4ef..6daa7482eb 100644 --- a/modules/audio_coding/neteq/tools/rtp_file_source.h +++ b/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/tools/packet_source.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -63,4 +63,4 @@ class RtpFileSource : public PacketSource { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_ diff --git a/modules/audio_coding/neteq/tools/rtp_generator.cc b/modules/audio_coding/neteq/tools/rtp_generator.cc index a6e883dccf..cedd7aeb9e 100644 --- a/modules/audio_coding/neteq/tools/rtp_generator.cc +++ b/modules/audio_coding/neteq/tools/rtp_generator.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" +#include "modules/audio_coding/neteq/tools/rtp_generator.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h index 154a38cb72..75dcf035bf 100644 --- a/modules/audio_coding/neteq/tools/rtp_generator.h +++ b/modules/audio_coding/neteq/tools/rtp_generator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ +#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ +#define MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -80,4 +80,4 @@ class TimestampJumpRtpGenerator : public RtpGenerator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ +#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ diff --git a/modules/audio_coding/neteq/tools/rtpcat.cc b/modules/audio_coding/neteq/tools/rtpcat.cc index d903ca2486..431de553ae 100644 --- a/modules/audio_coding/neteq/tools/rtpcat.cc +++ b/modules/audio_coding/neteq/tools/rtpcat.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/rtp_file_reader.h" -#include "webrtc/test/rtp_file_writer.h" +#include "rtc_base/checks.h" +#include "test/rtp_file_reader.h" +#include "test/rtp_file_writer.h" using webrtc::test::RtpFileReader; using webrtc::test::RtpFileWriter; diff --git a/modules/audio_coding/test/ACMTest.h b/modules/audio_coding/test/ACMTest.h index d7e87d34ba..3fc97ca31b 100644 --- a/modules/audio_coding/test/ACMTest.h +++ b/modules/audio_coding/test/ACMTest.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_ACMTEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_ACMTEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_ACMTEST_H_ +#define MODULES_AUDIO_CODING_TEST_ACMTEST_H_ class ACMTest { public: @@ -18,4 +18,4 @@ class ACMTest { virtual void Perform() = 0; }; -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_ACMTEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_ACMTEST_H_ diff --git a/modules/audio_coding/test/APITest.cc b/modules/audio_coding/test/APITest.cc index 7e67e3f861..fe94e59dab 100644 --- a/modules/audio_coding/test/APITest.cc +++ b/modules/audio_coding/test/APITest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/APITest.h" +#include "modules/audio_coding/test/APITest.h" #include #include @@ -19,16 +19,16 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/test/utility.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/APITest.h b/modules/audio_coding/test/APITest.h index 99a7201847..652d7c401c 100644 --- a/modules/audio_coding/test/APITest.h +++ b/modules/audio_coding/test/APITest.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_APITEST_H_ +#define MODULES_AUDIO_CODING_TEST_APITEST_H_ #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { @@ -159,4 +159,4 @@ class APITest : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_APITEST_H_ diff --git a/modules/audio_coding/test/Channel.cc b/modules/audio_coding/test/Channel.cc index 4c659530b1..7d5e6e291f 100644 --- a/modules/audio_coding/test/Channel.cc +++ b/modules/audio_coding/test/Channel.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/Channel.h" #include #include -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/audio_coding/test/Channel.h b/modules/audio_coding/test/Channel.h index aeb535a574..f64bf37851 100644 --- a/modules/audio_coding/test/Channel.h +++ b/modules/audio_coding/test/Channel.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_CHANNEL_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_CHANNEL_H_ +#ifndef MODULES_AUDIO_CODING_TEST_CHANNEL_H_ +#define MODULES_AUDIO_CODING_TEST_CHANNEL_H_ #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { @@ -126,4 +126,4 @@ class Channel : public AudioPacketizationCallback { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_CHANNEL_H_ +#endif // MODULES_AUDIO_CODING_TEST_CHANNEL_H_ diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc index 24d07194e3..1125fbe5cd 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/modules/audio_coding/test/EncodeDecodeTest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h" +#include "modules/audio_coding/test/EncodeDecodeTest.h" #include #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/utility.h" +#include "system_wrappers/include/trace.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h index f9a9a5bb52..941a92fb59 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.h +++ b/modules/audio_coding/test/EncodeDecodeTest.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ +#define MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/RTPFile.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/RTPFile.h" +#include "typedefs.h" namespace webrtc { @@ -120,4 +120,4 @@ class EncodeDecodeTest : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_ENCODEDECODETEST_H_ diff --git a/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc index 03d4fa777b..73c8542190 100644 --- a/modules/audio_coding/test/PCMFile.cc +++ b/modules/audio_coding/test/PCMFile.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/PCMFile.h" #include #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/test/PCMFile.h b/modules/audio_coding/test/PCMFile.h index 3576dc67d8..c140ef27cc 100644 --- a/modules/audio_coding/test/PCMFile.h +++ b/modules/audio_coding/test/PCMFile.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_PCMFILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_PCMFILE_H_ +#ifndef MODULES_AUDIO_CODING_TEST_PCMFILE_H_ +#define MODULES_AUDIO_CODING_TEST_PCMFILE_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -73,4 +73,4 @@ class PCMFile { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_PCMFILE_H_ +#endif // MODULES_AUDIO_CODING_TEST_PCMFILE_H_ diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc index 68f26150bc..c80615a36d 100644 --- a/modules/audio_coding/test/PacketLossTest.cc +++ b/modules/audio_coding/test/PacketLossTest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/PacketLossTest.h" +#include "modules/audio_coding/test/PacketLossTest.h" #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/test/PacketLossTest.h b/modules/audio_coding/test/PacketLossTest.h index 705fe73ff5..7eab442b59 100644 --- a/modules/audio_coding/test/PacketLossTest.h +++ b/modules/audio_coding/test/PacketLossTest.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ +#define MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ #include #include -#include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h" +#include "modules/audio_coding/test/EncodeDecodeTest.h" namespace webrtc { @@ -64,4 +64,4 @@ class PacketLossTest : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_PACKETLOSSTEST_H_ diff --git a/modules/audio_coding/test/RTPFile.cc b/modules/audio_coding/test/RTPFile.cc index 4bf4c9820a..d896e768cf 100644 --- a/modules/audio_coding/test/RTPFile.cc +++ b/modules/audio_coding/test/RTPFile.cc @@ -20,10 +20,10 @@ #endif #include "audio_coding_module.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "system_wrappers/include/rw_lock_wrapper.h" // TODO(tlegrand): Consider removing usage of gtest. -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/RTPFile.h b/modules/audio_coding/test/RTPFile.h index 696d41ebd2..dd6ee72e2e 100644 --- a/modules/audio_coding/test/RTPFile.h +++ b/modules/audio_coding/test/RTPFile.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_RTPFILE_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_RTPFILE_H_ +#ifndef MODULES_AUDIO_CODING_TEST_RTPFILE_H_ +#define MODULES_AUDIO_CODING_TEST_RTPFILE_H_ #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/include/module_common_types.h" +#include "system_wrappers/include/rw_lock_wrapper.h" +#include "typedefs.h" namespace webrtc { @@ -123,4 +123,4 @@ class RTPFile : public RTPStream { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_RTPFILE_H_ +#endif // MODULES_AUDIO_CODING_TEST_RTPFILE_H_ diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index aedf82c089..f840676f46 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/modules/audio_coding/test/TestAllCodecs.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/TestAllCodecs.h" +#include "modules/audio_coding/test/TestAllCodecs.h" #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/utility.h" +#include "rtc_base/logging.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" // Description of the test: // In this test we set up a one-way communication channel from a participant diff --git a/modules/audio_coding/test/TestAllCodecs.h b/modules/audio_coding/test/TestAllCodecs.h index 7df139b1ef..cdcc55cd35 100644 --- a/modules/audio_coding/test/TestAllCodecs.h +++ b/modules/audio_coding/test/TestAllCodecs.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ +#ifndef MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ +#define MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ #include -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "typedefs.h" namespace webrtc { @@ -80,4 +80,4 @@ class TestAllCodecs : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ +#endif // MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index 4ec3ed1dea..77cc24dc2b 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/TestRedFec.h" +#include "modules/audio_coding/test/TestRedFec.h" #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/utility.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" #ifdef SUPPORT_RED_WB #undef SUPPORT_RED_WB diff --git a/modules/audio_coding/test/TestRedFec.h b/modules/audio_coding/test/TestRedFec.h index 09d9259b16..98aa0080ec 100644 --- a/modules/audio_coding/test/TestRedFec.h +++ b/modules/audio_coding/test/TestRedFec.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ +#ifndef MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ +#define MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ #include #include -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" namespace webrtc { @@ -47,4 +47,4 @@ class TestRedFec : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ +#endif // MODULES_AUDIO_CODING_TEST_TESTREDFEC_H_ diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index 02bc141ae7..7f24fdc371 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/modules/audio_coding/test/TestStereo.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/TestStereo.h" +#include "modules/audio_coding/test/TestStereo.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/utility.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/TestStereo.h b/modules/audio_coding/test/TestStereo.h index 3489421345..a27d8d7206 100644 --- a/modules/audio_coding/test/TestStereo.h +++ b/modules/audio_coding/test/TestStereo.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ +#ifndef MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ +#define MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ #include #include -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" #define PCMA_AND_PCMU @@ -115,4 +115,4 @@ class TestStereo : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ +#endif // MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index ad5e066b54..5282d1bdd3 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/modules/audio_coding/test/TestVADDTX.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/TestVADDTX.h" +#include "modules/audio_coding/test/TestVADDTX.h" #include -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/TestVADDTX.h b/modules/audio_coding/test/TestVADDTX.h index b7e987137c..95d6ec455a 100644 --- a/modules/audio_coding/test/TestVADDTX.h +++ b/modules/audio_coding/test/TestVADDTX.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ +#ifndef MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ +#define MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" +#include "common_types.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" namespace webrtc { @@ -100,4 +100,4 @@ class TestOpusDtx final : public TestVadDtx { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ +#endif // MODULES_AUDIO_CODING_TEST_TESTVADDTX_H_ diff --git a/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc index 0d3f3f4758..7d58b6ded3 100644 --- a/modules/audio_coding/test/Tester.cc +++ b/modules/audio_coding/test/Tester.cc @@ -12,20 +12,20 @@ #include #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/APITest.h" -#include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h" -#include "webrtc/modules/audio_coding/test/PacketLossTest.h" -#include "webrtc/modules/audio_coding/test/TestAllCodecs.h" -#include "webrtc/modules/audio_coding/test/TestRedFec.h" -#include "webrtc/modules/audio_coding/test/TestStereo.h" -#include "webrtc/modules/audio_coding/test/TestVADDTX.h" -#include "webrtc/modules/audio_coding/test/TwoWayCommunication.h" -#include "webrtc/modules/audio_coding/test/iSACTest.h" -#include "webrtc/modules/audio_coding/test/opus_test.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/APITest.h" +#include "modules/audio_coding/test/EncodeDecodeTest.h" +#include "modules/audio_coding/test/PacketLossTest.h" +#include "modules/audio_coding/test/TestAllCodecs.h" +#include "modules/audio_coding/test/TestRedFec.h" +#include "modules/audio_coding/test/TestStereo.h" +#include "modules/audio_coding/test/TestVADDTX.h" +#include "modules/audio_coding/test/TwoWayCommunication.h" +#include "modules/audio_coding/test/iSACTest.h" +#include "modules/audio_coding/test/opus_test.h" +#include "system_wrappers/include/trace.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" using webrtc::Trace; diff --git a/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc index 3287c91e95..6663b1edce 100644 --- a/modules/audio_coding/test/TwoWayCommunication.cc +++ b/modules/audio_coding/test/TwoWayCommunication.cc @@ -20,14 +20,14 @@ #include #endif -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/TwoWayCommunication.h b/modules/audio_coding/test/TwoWayCommunication.h index f9d37f7f77..fb23275a9a 100644 --- a/modules/audio_coding/test/TwoWayCommunication.h +++ b/modules/audio_coding/test/TwoWayCommunication.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ +#ifndef MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ +#define MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ #include -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" namespace webrtc { @@ -58,4 +58,4 @@ class TwoWayCommunication : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ +#endif // MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ diff --git a/modules/audio_coding/test/delay_test.cc b/modules/audio_coding/test/delay_test.cc index 0ce7fd226a..1f3dc6da65 100644 --- a/modules/audio_coding/test/delay_test.cc +++ b/modules/audio_coding/test/delay_test.cc @@ -15,18 +15,18 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" +#include "rtc_base/flags.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" DEFINE_string(codec, "isac", "Codec Name"); DEFINE_int(sample_rate_hz, 16000, "Sampling rate in Hertz."); diff --git a/modules/audio_coding/test/iSACTest.cc b/modules/audio_coding/test/iSACTest.cc index 531fe96c9f..a14f795b9b 100644 --- a/modules/audio_coding/test/iSACTest.cc +++ b/modules/audio_coding/test/iSACTest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/iSACTest.h" +#include "modules/audio_coding/test/iSACTest.h" #include #include @@ -23,10 +23,10 @@ #include #endif -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/test/utility.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/test/iSACTest.h b/modules/audio_coding/test/iSACTest.h index 7d3a77e269..4fe3dc711d 100644 --- a/modules/audio_coding/test/iSACTest.h +++ b/modules/audio_coding/test/iSACTest.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_ISACTEST_H_ +#define MODULES_AUDIO_CODING_TEST_ISACTEST_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/utility.h" +#include "common_types.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/utility.h" #define MAX_FILE_NAME_LENGTH_BYTE 500 #define NO_OF_CLIENTS 15 @@ -77,4 +77,4 @@ class ISACTest : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_ISACTEST_H_ diff --git a/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc index db58289b16..5f1da58388 100644 --- a/modules/audio_coding/test/insert_packet_with_timing.cc +++ b/modules/audio_coding/test/insert_packet_with_timing.cc @@ -13,16 +13,16 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/flags.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" // Codec. DEFINE_string(codec, "opus", "Codec Name"); diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc index 9f5720b961..5ba810c054 100644 --- a/modules/audio_coding/test/opus_test.cc +++ b/modules/audio_coding/test/opus_test.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/test/opus_test.h" +#include "modules/audio_coding/test/opus_test.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/modules/audio_coding/test/TestStereo.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "modules/audio_coding/test/TestStereo.h" +#include "modules/audio_coding/test/utility.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_coding/test/opus_test.h b/modules/audio_coding/test/opus_test.h index ce570f6691..3e9d9a7187 100644 --- a/modules/audio_coding/test/opus_test.h +++ b/modules/audio_coding/test/opus_test.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ +#ifndef MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ +#define MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ #include #include -#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" -#include "webrtc/modules/audio_coding/acm2/acm_resampler.h" -#include "webrtc/modules/audio_coding/test/ACMTest.h" -#include "webrtc/modules/audio_coding/test/Channel.h" -#include "webrtc/modules/audio_coding/test/PCMFile.h" -#include "webrtc/modules/audio_coding/test/TestStereo.h" +#include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "modules/audio_coding/acm2/acm_resampler.h" +#include "modules/audio_coding/test/ACMTest.h" +#include "modules/audio_coding/test/Channel.h" +#include "modules/audio_coding/test/PCMFile.h" +#include "modules/audio_coding/test/TestStereo.h" namespace webrtc { @@ -58,4 +58,4 @@ class OpusTest : public ACMTest { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ +#endif // MODULES_AUDIO_CODING_TEST_OPUS_TEST_H_ diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc index 7aec5d024f..2e475ddbdb 100644 --- a/modules/audio_coding/test/target_delay_unittest.cc +++ b/modules/audio_coding/test/target_delay_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_coding/test/utility.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_coding/test/utility.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_coding/test/utility.cc b/modules/audio_coding/test/utility.cc index 043e6b93fb..ecade69d41 100644 --- a/modules/audio_coding/test/utility.cc +++ b/modules/audio_coding/test/utility.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "test/gtest.h" #define NUM_CODECS_WITH_FIXED_PAYLOAD_TYPE 13 diff --git a/modules/audio_coding/test/utility.h b/modules/audio_coding/test/utility.h index 8af3675167..07cbe7170d 100644 --- a/modules/audio_coding/test/utility.h +++ b/modules/audio_coding/test/utility.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_ -#define WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_ +#ifndef MODULES_AUDIO_CODING_TEST_UTILITY_H_ +#define MODULES_AUDIO_CODING_TEST_UTILITY_H_ -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "test/gtest.h" namespace webrtc { @@ -135,4 +135,4 @@ class VADCallback : public ACMVADCallback { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_ +#endif // MODULES_AUDIO_CODING_TEST_UTILITY_H_ diff --git a/modules/audio_conference_mixer/DEPS b/modules/audio_conference_mixer/DEPS index 031c60256f..24107576ac 100644 --- a/modules/audio_conference_mixer/DEPS +++ b/modules/audio_conference_mixer/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/system_wrappers", + "+audio/utility/audio_frame_operations.h", + "+system_wrappers", ] diff --git a/modules/audio_conference_mixer/include/audio_conference_mixer.h b/modules/audio_conference_mixer/include/audio_conference_mixer.h index 7b14f2f79d..0ccb6d9de5 100644 --- a/modules/audio_conference_mixer/include/audio_conference_mixer.h +++ b/modules/audio_conference_mixer/include/audio_conference_mixer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" namespace webrtc { class AudioMixerOutputReceiver; @@ -74,4 +74,4 @@ protected: }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ diff --git a/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h b/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h index c7b07a0bfd..4a0aa72139 100644 --- a/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h +++ b/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { class MixHistory; @@ -84,4 +84,4 @@ protected: }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 8e8b657d6b..7927d2464f 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" -#include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_conference_mixer/source/audio_conference_mixer_impl.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "modules/audio_conference_mixer/source/audio_frame_manipulator.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index 865de6f5e5..4d87c76e4b 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ #include #include #include -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" -#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/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer.h" +#include "modules/audio_conference_mixer/source/memory_pool.h" +#include "modules/audio_conference_mixer/source/time_scheduler.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { class AudioProcessing; @@ -189,4 +189,4 @@ private: }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ diff --git a/modules/audio_conference_mixer/source/audio_frame_manipulator.cc b/modules/audio_conference_mixer/source/audio_frame_manipulator.cc index 8e7351d033..6feb55d4ad 100644 --- a/modules/audio_conference_mixer/source/audio_frame_manipulator.cc +++ b/modules/audio_conference_mixer/source/audio_frame_manipulator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "modules/audio_conference_mixer/source/audio_frame_manipulator.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace { // Linear ramping over 80 samples. diff --git a/modules/audio_conference_mixer/source/audio_frame_manipulator.h b/modules/audio_conference_mixer/source/audio_frame_manipulator.h index c136597fc3..206be88e56 100644 --- a/modules/audio_conference_mixer/source/audio_frame_manipulator.h +++ b/modules/audio_conference_mixer/source/audio_frame_manipulator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { class AudioFrame; @@ -25,4 +25,4 @@ void RampOut(AudioFrame& audioFrame); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool.h b/modules/audio_conference_mixer/source/memory_pool.h index c0a813116b..6fb09ce080 100644 --- a/modules/audio_conference_mixer/source/memory_pool.h +++ b/modules/audio_conference_mixer/source/memory_pool.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #ifdef _WIN32 -#include "webrtc/modules/audio_conference_mixer/source/memory_pool_win.h" +#include "modules/audio_conference_mixer/source/memory_pool_win.h" #else -#include "webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h" +#include "modules/audio_conference_mixer/source/memory_pool_posix.h" #endif namespace webrtc { @@ -119,4 +119,4 @@ int32_t MemoryPool::PushMemory(MemoryType*& memory) } } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool_posix.h b/modules/audio_conference_mixer/source/memory_pool_posix.h index 695878dbb2..73baddadef 100644 --- a/modules/audio_conference_mixer/source/memory_pool_posix.h +++ b/modules/audio_conference_mixer/source/memory_pool_posix.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { template @@ -153,4 +153,4 @@ int32_t MemoryPoolImpl::CreateMemory( } } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool_win.h b/modules/audio_conference_mixer/source/memory_pool_win.h index 3ec9187492..ae2a51bc5c 100644 --- a/modules/audio_conference_mixer/source/memory_pool_win.h +++ b/modules/audio_conference_mixer/source/memory_pool_win.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ #include #include -#include "webrtc/system_wrappers/include/aligned_malloc.h" -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/aligned_malloc.h" +#include "system_wrappers/include/atomic32.h" +#include "typedefs.h" namespace webrtc { template struct MemoryPoolItem; @@ -196,4 +196,4 @@ MemoryPoolItem* MemoryPoolImpl::CreateMemory() } } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ diff --git a/modules/audio_conference_mixer/source/time_scheduler.cc b/modules/audio_conference_mixer/source/time_scheduler.cc index 5600e0ccb0..5a27b42b4b 100644 --- a/modules/audio_conference_mixer/source/time_scheduler.cc +++ b/modules/audio_conference_mixer/source/time_scheduler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/audio_conference_mixer/source/time_scheduler.h" +#include "rtc_base/timeutils.h" namespace webrtc { TimeScheduler::TimeScheduler(const int64_t periodicityInMs) diff --git a/modules/audio_conference_mixer/source/time_scheduler.h b/modules/audio_conference_mixer/source/time_scheduler.h index e3531c4874..158086132c 100644 --- a/modules/audio_conference_mixer/source/time_scheduler.h +++ b/modules/audio_conference_mixer/source/time_scheduler.h @@ -11,10 +11,10 @@ // The TimeScheduler class keeps track of periodic events. It is non-drifting // and keeps track of any missed periods so that it is possible to catch up. // (compare to a metronome) -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/criticalsection.h" -#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ -#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ +#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ +#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ namespace webrtc { @@ -42,4 +42,4 @@ private: }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ +#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ diff --git a/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc index ce18d9149d..6685899d3e 100644 --- a/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc +++ b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "test/gmock.h" namespace webrtc { diff --git a/modules/audio_device/DEPS b/modules/audio_device/DEPS index 51e8957e18..cb7a541b8d 100644 --- a/modules/audio_device/DEPS +++ b/modules/audio_device/DEPS @@ -1,6 +1,6 @@ include_rules = [ - "+webrtc/common_audio", - "+webrtc/system_wrappers", + "+common_audio", + "+system_wrappers", ] specific_include_rules = { @@ -8,24 +8,24 @@ specific_include_rules = { "+base/android", ], "audio_device_ios\.h": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "audio_device_ios\.mm": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "audio_device_unittest_ios\.mm": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "RTCAudioSession\.h": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "RTCAudioSessionConfiguration\.h": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "RTCAudioSessionDelegateAdapter\.h": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], "voice_processing_audio_unit\.mm": [ - "+webrtc/sdk/objc", + "+sdk/objc", ], } diff --git a/modules/audio_device/android/audio_common.h b/modules/audio_device/android/audio_common.h index 53618656a8..81ea733aa4 100644 --- a/modules/audio_device/android/audio_common.h +++ b/modules/audio_device/android/audio_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ namespace webrtc { @@ -25,4 +25,4 @@ const int kHighLatencyModeDelayEstimateInMilliseconds = 150; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_COMMON_H_ diff --git a/modules/audio_device/android/audio_device_template.h b/modules/audio_device/android/audio_device_template.h index 09706595a9..8d69cb4aa7 100644 --- a/modules/audio_device/android/audio_device_template.h +++ b/modules/audio_device/android/audio_device_template.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/audio_device_generic.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -515,4 +515,4 @@ class AudioDeviceTemplate : public AudioDeviceGeneric { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ diff --git a/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc index 49403c95ea..a354a7cc33 100644 --- a/modules/audio_device/android/audio_device_unittest.cc +++ b/modules/audio_device/android/audio_device_unittest.cc @@ -16,22 +16,22 @@ #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/build_info.h" -#include "webrtc/modules/audio_device/android/ensure_initialized.h" -#include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_device/include/mock_audio_transport.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/build_info.h" +#include "modules/audio_device/android/ensure_initialized.h" +#include "modules/audio_device/audio_device_impl.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/mock_audio_transport.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" using std::cout; using std::endl; diff --git a/modules/audio_device/android/audio_manager.cc b/modules/audio_device/android/audio_manager.cc index 60a1d9a9a5..9e38a85292 100644 --- a/modules/audio_device/android/audio_manager.cc +++ b/modules/audio_device/android/audio_manager.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/audio_manager.h" #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/utility/include/helpers_android.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" #define TAG "AudioManager" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/audio_manager.h b/modules/audio_device/android/audio_manager.h index 638b085972..dd6b51ff90 100644 --- a/modules/audio_device/android/audio_manager.h +++ b/modules/audio_device/android/audio_manager.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ #include #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/opensles_common.h" -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/opensles_common.h" +#include "modules/audio_device/audio_device_config.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/utility/include/helpers_android.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -213,4 +213,4 @@ class AudioManager { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ diff --git a/modules/audio_device/android/audio_manager_unittest.cc b/modules/audio_device/android/audio_manager_unittest.cc index e82376d7ef..00314ebfeb 100644 --- a/modules/audio_device/android/audio_manager_unittest.cc +++ b/modules/audio_device/android/audio_manager_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/build_info.h" -#include "webrtc/modules/audio_device/android/ensure_initialized.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/build_info.h" +#include "modules/audio_device/android/ensure_initialized.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" #define PRINT(...) fprintf(stderr, __VA_ARGS__); diff --git a/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc index ad8c02756e..b43764403c 100644 --- a/modules/audio_device/android/audio_record_jni.cc +++ b/modules/audio_device/android/audio_record_jni.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/audio_record_jni.h" +#include "modules/audio_device/android/audio_record_jni.h" #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" +#include "modules/audio_device/android/audio_common.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" #define TAG "AudioRecordJni" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/audio_record_jni.h b/modules/audio_device/android/audio_record_jni.h index 385c9ade34..f508280ad0 100644 --- a/modules/audio_device/android/audio_record_jni.h +++ b/modules/audio_device/android/audio_record_jni.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ #include #include -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/utility/include/helpers_android.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -160,4 +160,4 @@ class AudioRecordJni { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_RECORD_JNI_H_ diff --git a/modules/audio_device/android/audio_track_jni.cc b/modules/audio_device/android/audio_track_jni.cc index e4a2198d77..45e59c45aa 100644 --- a/modules/audio_device/android/audio_track_jni.cc +++ b/modules/audio_device/android/audio_track_jni.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/audio_track_jni.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/audio_track_jni.h" #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" #define TAG "AudioTrackJni" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/audio_track_jni.h b/modules/audio_device/android/audio_track_jni.h index 392299bf8e..fd9c61e1ff 100644 --- a/modules/audio_device/android/audio_track_jni.h +++ b/modules/audio_device/android/audio_track_jni.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/utility/include/helpers_android.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -152,4 +152,4 @@ class AudioTrackJni { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_ diff --git a/modules/audio_device/android/build_info.cc b/modules/audio_device/android/build_info.cc index 3628e408e5..9eab4b33ef 100644 --- a/modules/audio_device/android/build_info.cc +++ b/modules/audio_device/android/build_info.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/build_info.h" +#include "modules/audio_device/android/build_info.h" -#include "webrtc/modules/utility/include/helpers_android.h" +#include "modules/utility/include/helpers_android.h" namespace webrtc { diff --git a/modules/audio_device/android/build_info.h b/modules/audio_device/android/build_info.h index d9640dd7bf..2e292e8f08 100644 --- a/modules/audio_device/android/build_info.h +++ b/modules/audio_device/android/build_info.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ #include #include #include -#include "webrtc/modules/utility/include/jvm_android.h" +#include "modules/utility/include/jvm_android.h" namespace webrtc { @@ -82,4 +82,4 @@ class BuildInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ diff --git a/modules/audio_device/android/ensure_initialized.cc b/modules/audio_device/android/ensure_initialized.cc index 6407a64dcb..37086cc9eb 100644 --- a/modules/audio_device/android/ensure_initialized.cc +++ b/modules/audio_device/android/ensure_initialized.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/ensure_initialized.h" +#include "modules/audio_device/android/ensure_initialized.h" #include -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/modules/audio_device/android/audio_record_jni.h" -#include "webrtc/modules/audio_device/android/audio_track_jni.h" -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_device/android/audio_record_jni.h" +#include "modules/audio_device/android/audio_track_jni.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/checks.h" namespace webrtc { namespace audiodevicemodule { diff --git a/modules/audio_device/android/opensles_common.cc b/modules/audio_device/android/opensles_common.cc index 65ffbbea7f..019714dae4 100644 --- a/modules/audio_device/android/opensles_common.cc +++ b/modules/audio_device/android/opensles_common.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/opensles_common.h" +#include "modules/audio_device/android/opensles_common.h" #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_device/android/opensles_common.h b/modules/audio_device/android/opensles_common.h index c71ae8d72f..90988eef5a 100644 --- a/modules/audio_device/android/opensles_common.h +++ b/modules/audio_device/android/opensles_common.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -59,4 +59,4 @@ typedef ScopedSLObject ScopedSLObjectItf; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_ diff --git a/modules/audio_device/android/opensles_player.cc b/modules/audio_device/android/opensles_player.cc index 3a40bf4779..1530741387 100644 --- a/modules/audio_device/android/opensles_player.cc +++ b/modules/audio_device/android/opensles_player.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/opensles_player.h" +#include "modules/audio_device/android/opensles_player.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/fine_audio_buffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/array_view.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/fine_audio_buffer.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/timeutils.h" #define TAG "OpenSLESPlayer" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/opensles_player.h b/modules/audio_device/android/opensles_player.h index d6fcd464ac..167c356330 100644 --- a/modules/audio_device/android/opensles_player.h +++ b/modules/audio_device/android/opensles_player.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ #include #include #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/opensles_common.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/opensles_common.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/utility/include/helpers_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -193,4 +193,4 @@ class OpenSLESPlayer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ diff --git a/modules/audio_device/android/opensles_recorder.cc b/modules/audio_device/android/opensles_recorder.cc index df94ba8e15..123406889c 100644 --- a/modules/audio_device/android/opensles_recorder.cc +++ b/modules/audio_device/android/opensles_recorder.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/android/opensles_recorder.h" +#include "modules/audio_device/android/opensles_recorder.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/fine_audio_buffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/array_view.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/fine_audio_buffer.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/timeutils.h" #define TAG "OpenSLESRecorder" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/opensles_recorder.h b/modules/audio_device/android/opensles_recorder.h index 5f8da40c9c..478c0340af 100644 --- a/modules/audio_device/android/opensles_recorder.h +++ b/modules/audio_device/android/opensles_recorder.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ +#ifndef MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ +#define MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ #include #include @@ -17,13 +17,13 @@ #include -#include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/opensles_common.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/android/audio_common.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/opensles_common.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/utility/include/helpers_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -190,4 +190,4 @@ class OpenSLESRecorder { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ +#endif // MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_RECORDER_H_ diff --git a/modules/audio_device/audio_device_buffer.cc b/modules/audio_device/audio_device_buffer.cc index 063c65f4fc..779cb06a07 100644 --- a/modules/audio_device/audio_device_buffer.cc +++ b/modules/audio_device/audio_device_buffer.cc @@ -11,17 +11,17 @@ #include #include -#include "webrtc/modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/audio_device_buffer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_device/audio_device_config.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index ed8b1f7722..9a02e0642a 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ +#ifndef MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ +#define MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/typedefs.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/buffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" +#include "system_wrappers/include/file_wrapper.h" +#include "typedefs.h" namespace webrtc { @@ -260,4 +260,4 @@ class AudioDeviceBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ +#endif // MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ diff --git a/modules/audio_device/audio_device_config.h b/modules/audio_device/audio_device_config.h index 3204cf509a..e2ad1fd547 100644 --- a/modules/audio_device/audio_device_config.h +++ b/modules/audio_device/audio_device_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ // Enumerators // @@ -26,5 +26,5 @@ enum { GET_MIC_VOLUME_INTERVAL_MS = 1000 }; #endif #endif -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ +#endif // AUDIO_DEVICE_AUDIO_DEVICE_CONFIG_H_ diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 23c3b9de83..a03c7fad11 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/include/audio_device_data_observer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/refcountedobject.h" +#include "modules/audio_device/include/audio_device_data_observer.h" +#include "rtc_base/checks.h" +#include "rtc_base/refcountedobject.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_generic.cc b/modules/audio_device/audio_device_generic.cc index f865d037e7..142d993745 100644 --- a/modules/audio_device/audio_device_generic.cc +++ b/modules/audio_device/audio_device_generic.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/audio_device_generic.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_generic.h b/modules/audio_device/audio_device_generic.h index cdcb934778..8f3e9dc004 100644 --- a/modules/audio_device/audio_device_generic.h +++ b/modules/audio_device/audio_device_generic.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ -#include "webrtc/modules/audio_device/audio_device_buffer.h" -#include "webrtc/modules/audio_device/include/audio_device.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/include/audio_device.h" namespace webrtc { @@ -158,4 +158,4 @@ class AudioDeviceGeneric { } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H +#endif // AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index e8a3a72605..820d5f6a46 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_device/audio_device_impl.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_device/audio_device_config.h" +#include "modules/audio_device/audio_device_generic.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcount.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/metrics.h" #include #include @@ -27,12 +27,12 @@ #endif #elif defined(WEBRTC_ANDROID) #include -#include "webrtc/modules/audio_device/android/audio_device_template.h" -#include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/android/audio_record_jni.h" -#include "webrtc/modules/audio_device/android/audio_track_jni.h" -#include "webrtc/modules/audio_device/android/opensles_player.h" -#include "webrtc/modules/audio_device/android/opensles_recorder.h" +#include "modules/audio_device/android/audio_device_template.h" +#include "modules/audio_device/android/audio_manager.h" +#include "modules/audio_device/android/audio_record_jni.h" +#include "modules/audio_device/android/audio_track_jni.h" +#include "modules/audio_device/android/opensles_player.h" +#include "modules/audio_device/android/opensles_recorder.h" #elif defined(WEBRTC_LINUX) #if defined(LINUX_ALSA) #include "audio_device_alsa_linux.h" @@ -47,11 +47,11 @@ #endif #if defined(WEBRTC_DUMMY_FILE_DEVICES) -#include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h" +#include "modules/audio_device/dummy/file_audio_device_factory.h" #endif -#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" -#include "webrtc/modules/audio_device/dummy/file_audio_device.h" +#include "modules/audio_device/dummy/audio_device_dummy.h" +#include "modules/audio_device/dummy/file_audio_device.h" #define CHECK_INITIALIZED() \ { \ diff --git a/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h index 69e32d4a3a..77c4cc51a2 100644 --- a/modules/audio_device/audio_device_impl.h +++ b/modules/audio_device/audio_device_impl.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H_ #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) #include -#include "webrtc/modules/audio_device/audio_device_buffer.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -201,4 +201,4 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { #endif // defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) -#endif // WEBRTC_MODULES_INTERFACE_AUDIO_DEVICE_IMPL_H_ +#endif // MODULES_INTERFACE_AUDIO_DEVICE_IMPL_H_ diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc index 24db9ae8e5..ae310de7ab 100644 --- a/modules/audio_device/audio_device_unittest.cc +++ b/modules/audio_device/audio_device_unittest.cc @@ -12,23 +12,23 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_device/include/mock_audio_transport.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "modules/audio_device/audio_device_impl.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/mock_audio_transport.h" +#include "rtc_base/buffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/logging.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timeutils.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::AtLeast; diff --git a/modules/audio_device/dummy/audio_device_dummy.cc b/modules/audio_device/dummy/audio_device_dummy.cc index 91033b7d64..cb41e4a9b8 100644 --- a/modules/audio_device/dummy/audio_device_dummy.cc +++ b/modules/audio_device/dummy/audio_device_dummy.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" +#include "modules/audio_device/dummy/audio_device_dummy.h" namespace webrtc { diff --git a/modules/audio_device/dummy/audio_device_dummy.h b/modules/audio_device/dummy/audio_device_dummy.h index bbadbdde90..5865720183 100644 --- a/modules/audio_device/dummy/audio_device_dummy.h +++ b/modules/audio_device/dummy/audio_device_dummy.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ #include -#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/audio_device_generic.h" namespace webrtc { @@ -125,4 +125,4 @@ class AudioDeviceDummy : public AudioDeviceGeneric { } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H +#endif // AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc index 4d8e11a14e..2194748564 100644 --- a/modules/audio_device/dummy/file_audio_device.cc +++ b/modules/audio_device/dummy/file_audio_device.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/dummy/file_audio_device.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "modules/audio_device/dummy/file_audio_device.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h index 615c1373f4..61e717ef42 100644 --- a/modules/audio_device/dummy/file_audio_device.h +++ b/modules/audio_device/dummy/file_audio_device.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H -#define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H +#ifndef AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_ +#define AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_ #include #include #include -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/audio_device/audio_device_generic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/file_wrapper.h" namespace rtc { class PlatformThread; @@ -179,4 +179,4 @@ class FileAudioDevice : public AudioDeviceGeneric { } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_H +#endif // AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_ diff --git a/modules/audio_device/dummy/file_audio_device_factory.cc b/modules/audio_device/dummy/file_audio_device_factory.cc index 9aeba205d9..9056646812 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.cc +++ b/modules/audio_device/dummy/file_audio_device_factory.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h" +#include "modules/audio_device/dummy/file_audio_device_factory.h" #include #include -#include "webrtc/modules/audio_device/dummy/file_audio_device.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/dummy/file_audio_device.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_device/dummy/file_audio_device_factory.h b/modules/audio_device/dummy/file_audio_device_factory.h index 6763e02518..62c489da9d 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.h +++ b/modules/audio_device/dummy/file_audio_device_factory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H -#define WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H +#ifndef AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ +#define AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -39,4 +39,4 @@ class FileAudioDeviceFactory { } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H +#endif // AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ diff --git a/modules/audio_device/fine_audio_buffer.cc b/modules/audio_device/fine_audio_buffer.cc index 848721061a..f49f123104 100644 --- a/modules/audio_device/fine_audio_buffer.cc +++ b/modules/audio_device/fine_audio_buffer.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/fine_audio_buffer.h" +#include "modules/audio_device/fine_audio_buffer.h" #include #include #include -#include "webrtc/modules/audio_device/audio_device_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_device/fine_audio_buffer.h b/modules/audio_device/fine_audio_buffer.h index df806dbdb9..22928b4354 100644 --- a/modules/audio_device/fine_audio_buffer.h +++ b/modules/audio_device/fine_audio_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ +#ifndef MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ +#define MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "rtc_base/buffer.h" +#include "typedefs.h" namespace webrtc { @@ -88,4 +88,4 @@ class FineAudioBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ +#endif // MODULES_AUDIO_DEVICE_FINE_AUDIO_BUFFER_H_ diff --git a/modules/audio_device/fine_audio_buffer_unittest.cc b/modules/audio_device/fine_audio_buffer_unittest.cc index ada14e0717..43d3f6353d 100644 --- a/modules/audio_device/fine_audio_buffer_unittest.cc +++ b/modules/audio_device/fine_audio_buffer_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/fine_audio_buffer.h" +#include "modules/audio_device/fine_audio_buffer.h" #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_device/mock_audio_device_buffer.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_device/mock_audio_device_buffer.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::AtLeast; diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h index 8a27c15dfe..8751b8e589 100644 --- a/modules/audio_device/include/audio_device.h +++ b/modules/audio_device/include/audio_device.h @@ -11,9 +11,9 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "modules/include/module.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_device/include/audio_device_data_observer.h b/modules/audio_device/include/audio_device_data_observer.h index e96720c696..0247166a28 100644 --- a/modules/audio_device/include/audio_device_data_observer.h +++ b/modules/audio_device/include/audio_device_data_observer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ +#ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ +#define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -44,4 +44,4 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ +#endif // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ diff --git a/modules/audio_device/include/audio_device_defines.h b/modules/audio_device/include/audio_device_defines.h index ccc263c57b..c581339952 100644 --- a/modules/audio_device/include/audio_device_defines.h +++ b/modules/audio_device/include/audio_device_defines.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ +#ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ +#define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -165,4 +165,4 @@ class AudioParameters { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ +#endif // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DEFINES_H_ diff --git a/modules/audio_device/include/fake_audio_device.h b/modules/audio_device/include/fake_audio_device.h index 8b38088d9a..c6765dfc03 100644 --- a/modules/audio_device/include/fake_audio_device.h +++ b/modules/audio_device/include/fake_audio_device.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ +#ifndef MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ +#define MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device.h" namespace webrtc { @@ -153,4 +153,4 @@ class FakeAudioDeviceModule : public AudioDeviceModule { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ +#endif // MODULES_AUDIO_DEVICE_INCLUDE_FAKE_AUDIO_DEVICE_H_ diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h index 1b80f7ee01..f824eeb72b 100644 --- a/modules/audio_device/include/mock_audio_device.h +++ b/modules/audio_device/include/mock_audio_device.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ +#ifndef MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ +#define MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ #include -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_device/include/audio_device.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -113,4 +113,4 @@ class MockAudioDeviceModule : public AudioDeviceModule { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ +#endif // MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ diff --git a/modules/audio_device/include/mock_audio_transport.h b/modules/audio_device/include/mock_audio_transport.h index a05e7ea839..baa0227b39 100644 --- a/modules/audio_device/include/mock_audio_transport.h +++ b/modules/audio_device/include/mock_audio_transport.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ +#ifndef MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ +#define MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ -#include "webrtc/modules/audio_device/include/audio_device_defines.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_device/include/audio_device_defines.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -65,4 +65,4 @@ class MockAudioTransport : public AudioTransport { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ +#endif // MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_TRANSPORT_H_ diff --git a/modules/audio_device/ios/audio_device_ios.h b/modules/audio_device/ios/audio_device_ios.h index 2067d88740..caaeaace00 100644 --- a/modules/audio_device/ios/audio_device_ios.h +++ b/modules/audio_device/ios/audio_device_ios.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ +#ifndef MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ +#define MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ #include -#include "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h" -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/ios/audio_session_observer.h" -#include "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gtest_prod_util.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "sdk/objc/Framework/Headers/WebRTC/RTCMacros.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/ios/audio_session_observer.h" +#include "modules/audio_device/ios/voice_processing_audio_unit.h" +#include "rtc_base/buffer.h" +#include "rtc_base/gtest_prod_util.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" RTC_FWD_DECL_OBJC_CLASS(RTCAudioSessionDelegateAdapter); @@ -304,4 +304,4 @@ class AudioDeviceIOS : public AudioDeviceGeneric, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ +#endif // MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ diff --git a/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm index 81558b53bb..12c75af566 100644 --- a/modules/audio_device/ios/audio_device_ios.mm +++ b/modules/audio_device/ios/audio_device_ios.mm @@ -11,28 +11,28 @@ #import #import -#include "webrtc/modules/audio_device/ios/audio_device_ios.h" +#include "modules/audio_device/ios/audio_device_ios.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_device/fine_audio_buffer.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "api/array_view.h" +#include "modules/audio_device/fine_audio_buffer.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/Common/helpers.h" +#include "system_wrappers/include/metrics.h" #import "WebRTC/RTCLogging.h" -#import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" -#import "webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h" -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" +#import "modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" +#import "sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" namespace webrtc { diff --git a/modules/audio_device/ios/audio_device_not_implemented_ios.mm b/modules/audio_device/ios/audio_device_not_implemented_ios.mm index f67c0a96f3..dee3cc7119 100644 --- a/modules/audio_device/ios/audio_device_not_implemented_ios.mm +++ b/modules/audio_device/ios/audio_device_not_implemented_ios.mm @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/ios/audio_device_ios.h" +#include "modules/audio_device/ios/audio_device_ios.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_device/ios/audio_device_unittest_ios.mm b/modules/audio_device/ios/audio_device_unittest_ios.mm index 4e805ad94e..b0a356f2e6 100644 --- a/modules/audio_device/ios/audio_device_unittest_ios.mm +++ b/modules/audio_device/ios/audio_device_unittest_ios.mm @@ -16,23 +16,23 @@ #include #include -#include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_device/include/mock_audio_transport.h" -#include "webrtc/modules/audio_device/ios/audio_device_ios.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_device/audio_device_impl.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/mock_audio_transport.h" +#include "modules/audio_device/ios/audio_device_ios.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" -#import "webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h" -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" +#import "sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" using std::cout; using std::endl; diff --git a/modules/audio_device/ios/audio_session_observer.h b/modules/audio_device/ios/audio_session_observer.h index 459226fb75..13a979bd4e 100644 --- a/modules/audio_device/ios/audio_session_observer.h +++ b/modules/audio_device/ios/audio_session_observer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ +#ifndef MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ +#define MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -39,4 +39,4 @@ class AudioSessionObserver { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ +#endif // MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ diff --git a/modules/audio_device/ios/objc/RTCAudioSession.h b/modules/audio_device/ios/objc/RTCAudioSession.h index 2f52ca383d..006fb81cb6 100644 --- a/modules/audio_device/ios/objc/RTCAudioSession.h +++ b/modules/audio_device/ios/objc/RTCAudioSession.h @@ -8,4 +8,4 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" diff --git a/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h b/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h index e40910820d..b1e41d1e11 100644 --- a/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h +++ b/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h @@ -8,4 +8,4 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" diff --git a/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h index 9f71e972f4..7a0f9d2594 100644 --- a/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h +++ b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" namespace webrtc { class AudioSessionObserver; diff --git a/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm index 6ef1261990..6bb3df2e67 100644 --- a/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm +++ b/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" +#import "modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" -#include "webrtc/modules/audio_device/ios/audio_session_observer.h" +#include "modules/audio_device/ios/audio_session_observer.h" #import "WebRTC/RTCLogging.h" diff --git a/modules/audio_device/ios/voice_processing_audio_unit.h b/modules/audio_device/ios/voice_processing_audio_unit.h index 2f881e77fc..3105c129bd 100644 --- a/modules/audio_device/ios/voice_processing_audio_unit.h +++ b/modules/audio_device/ios/voice_processing_audio_unit.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ +#ifndef MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ +#define MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ #include @@ -134,4 +134,4 @@ class VoiceProcessingAudioUnit { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ +#endif // MODULES_AUDIO_DEVICE_IOS_VOICE_PROCESSING_AUDIO_UNIT_H_ diff --git a/modules/audio_device/ios/voice_processing_audio_unit.mm b/modules/audio_device/ios/voice_processing_audio_unit.mm index 3701f3fee3..e764d2fa44 100644 --- a/modules/audio_device/ios/voice_processing_audio_unit.mm +++ b/modules/audio_device/ios/voice_processing_audio_unit.mm @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h" +#import "modules/audio_device/ios/voice_processing_audio_unit.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/metrics.h" #import "WebRTC/RTCLogging.h" -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h" #if !defined(NDEBUG) static void LogStreamDescription(AudioStreamBasicDescription description) { diff --git a/modules/audio_device/linux/alsasymboltable_linux.cc b/modules/audio_device/linux/alsasymboltable_linux.cc index 2459625692..d605dbaac7 100644 --- a/modules/audio_device/linux/alsasymboltable_linux.cc +++ b/modules/audio_device/linux/alsasymboltable_linux.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" +#include "modules/audio_device/linux/alsasymboltable_linux.h" namespace webrtc { namespace adm_linux_alsa { diff --git a/modules/audio_device/linux/alsasymboltable_linux.h b/modules/audio_device/linux/alsasymboltable_linux.h index 14b016cf67..9c1f954522 100644 --- a/modules/audio_device/linux/alsasymboltable_linux.h +++ b/modules/audio_device/linux/alsasymboltable_linux.h @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H -#define WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H +#ifndef AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H_ +#define AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H_ -#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" namespace webrtc { namespace adm_linux_alsa { @@ -146,4 +146,4 @@ LATE_BINDING_SYMBOL_TABLE_DECLARE_END(AlsaSymbolTable) } // namespace adm_linux_alsa } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H +#endif // AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H_ diff --git a/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc index 9e2c5b1835..f271606dfd 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/audio_device_config.h" +#include "modules/audio_device/linux/audio_device_alsa_linux.h" +#include "rtc_base/logging.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/sleep.h" webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; // Accesses ALSA functions through our late-binding symbol table instead of diff --git a/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h index 034f083c62..96a15ebac1 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/modules/audio_device/linux/audio_device_alsa_linux.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H_ #include -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" #if defined(USE_X11) #include diff --git a/modules/audio_device/linux/audio_device_pulse_linux.cc b/modules/audio_device/linux/audio_device_pulse_linux.cc index 02f03c7f5f..ecbe63b97a 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "modules/audio_device/audio_device_config.h" +#include "modules/audio_device/linux/audio_device_pulse_linux.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/event_wrapper.h" webrtc::adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h index 6170944212..2a83b5c0a3 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/modules/audio_device/linux/audio_device_pulse_linux.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H_ #include -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread_checker.h" #include #include diff --git a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc index 9ce0ca10e4..02d9cf9ac8 100644 --- a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc +++ b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include "rtc_base/logging.h" extern webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 58fb4003e2..c8dca5b9a9 100644 --- a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H +#ifndef AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H_ +#define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/linux/alsasymboltable_linux.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" #include diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index afffc1def4..21f7fd045c 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" extern webrtc::adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index f639e8290d..ae0cb47318 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H +#ifndef AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H_ +#define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/typedefs.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" +#include "rtc_base/thread_checker.h" +#include "typedefs.h" #include #include diff --git a/modules/audio_device/linux/latebindingsymboltable_linux.cc b/modules/audio_device/linux/latebindingsymboltable_linux.cc index 549f6e9e83..35f53fad9b 100644 --- a/modules/audio_device/linux/latebindingsymboltable_linux.cc +++ b/modules/audio_device/linux/latebindingsymboltable_linux.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" #ifdef WEBRTC_LINUX #include diff --git a/modules/audio_device/linux/latebindingsymboltable_linux.h b/modules/audio_device/linux/latebindingsymboltable_linux.h index 03f0b719d9..b834f5c76e 100644 --- a/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H -#define WEBRTC_AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H +#ifndef AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H_ +#define AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H_ #include #include // for NULL #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" // This file provides macros for creating "symbol table" classes to simplify the // dynamic loading of symbols from DLLs. Currently the implementation only @@ -175,4 +175,4 @@ const char *const ClassName##_kSymbolNames[ClassName##_SYMBOL_TABLE_SIZE] = { } // namespace adm_linux } // namespace webrtc -#endif // WEBRTC_ADM_LATEBINDINGSYMBOLTABLE_LINUX_H +#endif // ADM_LATEBINDINGSYMBOLTABLE_LINUX_H_ diff --git a/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/modules/audio_device/linux/pulseaudiosymboltable_linux.cc index 26a173d4b6..3d012fe619 100644 --- a/modules/audio_device/linux/pulseaudiosymboltable_linux.cc +++ b/modules/audio_device/linux/pulseaudiosymboltable_linux.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" +#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" namespace webrtc { namespace adm_linux_pulse { diff --git a/modules/audio_device/linux/pulseaudiosymboltable_linux.h b/modules/audio_device/linux/pulseaudiosymboltable_linux.h index f0d6d3858d..d21446ce8a 100644 --- a/modules/audio_device/linux/pulseaudiosymboltable_linux.h +++ b/modules/audio_device/linux/pulseaudiosymboltable_linux.h @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H -#define WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H +#ifndef AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H_ +#define AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H_ -#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" namespace webrtc { namespace adm_linux_pulse { @@ -103,4 +103,4 @@ LATE_BINDING_SYMBOL_TABLE_DECLARE_END(PulseAudioSymbolTable) } // namespace adm_linux_pulse } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H +#endif // AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H_ diff --git a/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc index 0de5009ba3..01604ce600 100644 --- a/modules/audio_device/mac/audio_device_mac.cc +++ b/modules/audio_device/mac/audio_device_mac.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/mac/audio_device_mac.h" -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "modules/audio_device/mac/audio_device_mac.h" +#include "modules/audio_device/audio_device_config.h" +#include "modules/audio_device/mac/portaudio/pa_ringbuffer.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/event_wrapper.h" #include #include // OSAtomicCompareAndSwap() diff --git a/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h index bdd8d8352e..db8cfea50e 100644 --- a/modules/audio_device/mac/audio_device_mac.h +++ b/modules/audio_device/mac/audio_device_mac.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_MAC_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_MAC_H_ #include -#include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/event_wrapper.h" #include #include diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.cc b/modules/audio_device/mac/audio_mixer_manager_mac.cc index 6bf6dbdc2b..14d3f98cbb 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.cc +++ b/modules/audio_device/mac/audio_mixer_manager_mac.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "modules/audio_device/mac/audio_mixer_manager_mac.h" #include // getpid() diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h index 74d17ba30f..1d90fb0321 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H +#ifndef AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H_ +#define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H_ -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/typedefs.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "typedefs.h" #include diff --git a/modules/audio_device/mac/portaudio/pa_ringbuffer.c b/modules/audio_device/mac/portaudio/pa_ringbuffer.c index 19c8d750ba..7a95024757 100644 --- a/modules/audio_device/mac/portaudio/pa_ringbuffer.c +++ b/modules/audio_device/mac/portaudio/pa_ringbuffer.c @@ -56,8 +56,8 @@ #include #include #include -#include "webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h" -#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" +#include "modules/audio_device/mac/portaudio/pa_memorybarrier.h" +#include "modules/audio_device/mac/portaudio/pa_ringbuffer.h" /*************************************************************************** * Initialize FIFO. diff --git a/modules/audio_device/mac/portaudio/pa_ringbuffer.h b/modules/audio_device/mac/portaudio/pa_ringbuffer.h index 541a872062..210a65e4d8 100644 --- a/modules/audio_device/mac/portaudio/pa_ringbuffer.h +++ b/modules/audio_device/mac/portaudio/pa_ringbuffer.h @@ -1,5 +1,5 @@ -#ifndef WEBRTC_AUDIO_DEVICE_PA_RINGBUFFER_H -#define WEBRTC_AUDIO_DEVICE_PA_RINGBUFFER_H +#ifndef AUDIO_DEVICE_PA_RINGBUFFER_H_ +#define AUDIO_DEVICE_PA_RINGBUFFER_H_ /* * $Id: pa_ringbuffer.h 1421 2009-11-18 16:09:05Z bjornroche $ * Portable Audio I/O Library diff --git a/modules/audio_device/mock_audio_device_buffer.h b/modules/audio_device/mock_audio_device_buffer.h index bfef605a30..f172c17eec 100644 --- a/modules/audio_device/mock_audio_device_buffer.h +++ b/modules/audio_device/mock_audio_device_buffer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ +#ifndef MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ +#define MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ -#include "webrtc/modules/audio_device/audio_device_buffer.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_device/audio_device_buffer.h" +#include "test/gmock.h" namespace webrtc { @@ -31,4 +31,4 @@ class MockAudioDeviceBuffer : public AudioDeviceBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ +#endif // MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc index 0c6d34e4c4..aaf31fc91e 100644 --- a/modules/audio_device/win/audio_device_core_win.cc +++ b/modules/audio_device/win/audio_device_core_win.cc @@ -18,11 +18,11 @@ #pragma message(">> INFO: Windows Core Audio is not supported in VS 2003") #endif -#include "webrtc/modules/audio_device/audio_device_config.h" +#include "modules/audio_device/audio_device_config.h" #ifdef WEBRTC_WINDOWS_CORE_AUDIO_BUILD -#include "webrtc/modules/audio_device/win/audio_device_core_win.h" +#include "modules/audio_device/win/audio_device_core_win.h" #include #include @@ -37,9 +37,9 @@ #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/sleep.h" // Macro that calls a COM method returning HRESULT value. #define EXIT_ON_ERROR(hres) do { if (FAILED(hres)) goto Exit; } while(0) diff --git a/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h index 34dfee6b4a..d4bf4738c8 100644 --- a/modules/audio_device/win/audio_device_core_win.h +++ b/modules/audio_device/win/audio_device_core_win.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ +#ifndef AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ +#define AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ #if (_MSC_VER >= 1400) // only include for VS 2005 and higher -#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/audio_device_generic.h" #include // CLSID_CWMAudioAEC // (must be before audioclient.h) @@ -24,8 +24,8 @@ #include #include // IMediaObject -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority #pragma comment( lib, "avrt.lib" ) @@ -348,4 +348,4 @@ private: } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ +#endif // AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ diff --git a/modules/audio_mixer/DEPS b/modules/audio_mixer/DEPS index 025ce053a2..a076950bce 100644 --- a/modules/audio_mixer/DEPS +++ b/modules/audio_mixer/DEPS @@ -1,15 +1,15 @@ include_rules = [ - "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/call", - "+webrtc/common_audio", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_conference_mixer", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_processing", - "+webrtc/modules/media_file", - "+webrtc/modules/pacing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/utility", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", + "+audio/utility/audio_frame_operations.h", + "+call", + "+common_audio", + "+modules/audio_coding", + "+modules/audio_conference_mixer", + "+modules/audio_device", + "+modules/audio_processing", + "+modules/media_file", + "+modules/pacing", + "+modules/rtp_rtcp", + "+modules/utility", + "+system_wrappers", + "+voice_engine", ] diff --git a/modules/audio_mixer/audio_frame_manipulator.cc b/modules/audio_mixer/audio_frame_manipulator.cc index 3f16bf7823..0f5a83fed7 100644 --- a/modules/audio_mixer/audio_frame_manipulator.cc +++ b/modules/audio_mixer/audio_frame_manipulator.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_mixer/audio_frame_manipulator.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_mixer/audio_frame_manipulator.h b/modules/audio_mixer/audio_frame_manipulator.h index 20b66ca10d..fe87169676 100644 --- a/modules/audio_mixer/audio_frame_manipulator.h +++ b/modules/audio_mixer/audio_frame_manipulator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ +#ifndef MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ +#define MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { @@ -27,4 +27,4 @@ void RemixFrame(size_t target_number_of_channels, AudioFrame* frame); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ +#endif // MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ diff --git a/modules/audio_mixer/audio_frame_manipulator_unittest.cc b/modules/audio_mixer/audio_frame_manipulator_unittest.cc index e163d0f0ca..b3be883ce0 100644 --- a/modules/audio_mixer/audio_frame_manipulator_unittest.cc +++ b/modules/audio_mixer/audio_frame_manipulator_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_mixer/audio_frame_manipulator.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc index 2ad4a3459f..51f6658725 100644 --- a/modules/audio_mixer/audio_mixer_impl.cc +++ b/modules/audio_mixer/audio_mixer_impl.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_mixer/audio_mixer_impl.h" #include #include #include #include -#include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" -#include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_mixer/audio_frame_manipulator.h" +#include "modules/audio_mixer/default_output_rate_calculator.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h index abc98f13a6..3fb21dac58 100644 --- a/modules/audio_mixer/audio_mixer_impl.h +++ b/modules/audio_mixer/audio_mixer_impl.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ +#ifndef MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ +#define MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ #include #include -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/modules/audio_mixer/frame_combiner.h" -#include "webrtc/modules/audio_mixer/output_rate_calculator.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/audio/audio_mixer.h" +#include "modules/audio_mixer/frame_combiner.h" +#include "modules/audio_mixer/output_rate_calculator.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -111,4 +111,4 @@ class AudioMixerImpl : public AudioMixer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ +#endif // MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ diff --git a/modules/audio_mixer/audio_mixer_impl_unittest.cc b/modules/audio_mixer/audio_mixer_impl_unittest.cc index ac7783b1e8..678f625eac 100644 --- a/modules/audio_mixer/audio_mixer_impl_unittest.cc +++ b/modules/audio_mixer/audio_mixer_impl_unittest.cc @@ -16,14 +16,14 @@ #include #include -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gmock.h" +#include "api/audio/audio_mixer.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_mixer/default_output_rate_calculator.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/task_queue.h" +#include "test/gmock.h" using testing::_; using testing::Exactly; diff --git a/modules/audio_mixer/default_output_rate_calculator.cc b/modules/audio_mixer/default_output_rate_calculator.cc index b46ca88353..05c7bc3366 100644 --- a/modules/audio_mixer/default_output_rate_calculator.cc +++ b/modules/audio_mixer/default_output_rate_calculator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" +#include "modules/audio_mixer/default_output_rate_calculator.h" #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/include/audio_processing.h" namespace webrtc { diff --git a/modules/audio_mixer/default_output_rate_calculator.h b/modules/audio_mixer/default_output_rate_calculator.h index 02c724dc6b..2d34f3489c 100644 --- a/modules/audio_mixer/default_output_rate_calculator.h +++ b/modules/audio_mixer/default_output_rate_calculator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ +#ifndef MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ +#define MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ #include -#include "webrtc/modules/audio_mixer/output_rate_calculator.h" +#include "modules/audio_mixer/output_rate_calculator.h" namespace webrtc { @@ -32,4 +32,4 @@ class DefaultOutputRateCalculator : public OutputRateCalculator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ +#endif // MODULES_AUDIO_MIXER_DEFAULT_OUTPUT_RATE_CALCULATOR_H_ diff --git a/modules/audio_mixer/frame_combiner.cc b/modules/audio_mixer/frame_combiner.cc index ad9ddafa78..9e9bcfafb0 100644 --- a/modules/audio_mixer/frame_combiner.cc +++ b/modules/audio_mixer/frame_combiner.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/frame_combiner.h" +#include "modules/audio_mixer/frame_combiner.h" #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/array_view.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/audio_mixer/audio_frame_manipulator.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/audio_mixer/frame_combiner.h b/modules/audio_mixer/frame_combiner.h index 7b7e240b3d..88ab0d7f9a 100644 --- a/modules/audio_mixer/frame_combiner.h +++ b/modules/audio_mixer/frame_combiner.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ +#ifndef MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ +#define MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/include/module_common_types.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/include/module_common_types.h" namespace webrtc { @@ -42,4 +42,4 @@ class FrameCombiner { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ +#endif // MODULES_AUDIO_MIXER_FRAME_COMBINER_H_ diff --git a/modules/audio_mixer/frame_combiner_unittest.cc b/modules/audio_mixer/frame_combiner_unittest.cc index fc048d0b2c..568143608c 100644 --- a/modules/audio_mixer/frame_combiner_unittest.cc +++ b/modules/audio_mixer/frame_combiner_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/frame_combiner.h" +#include "modules/audio_mixer/frame_combiner.h" #include #include #include -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/audio_mixer/gain_change_calculator.h" -#include "webrtc/modules/audio_mixer/sine_wave_generator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/audio_mixer/gain_change_calculator.h" +#include "modules/audio_mixer/sine_wave_generator.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_mixer/gain_change_calculator.cc b/modules/audio_mixer/gain_change_calculator.cc index 13017d4220..ae7c6d59e7 100644 --- a/modules/audio_mixer/gain_change_calculator.cc +++ b/modules/audio_mixer/gain_change_calculator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/gain_change_calculator.h" +#include "modules/audio_mixer/gain_change_calculator.h" #include #include diff --git a/modules/audio_mixer/gain_change_calculator.h b/modules/audio_mixer/gain_change_calculator.h index e23438430a..fe7957cdd5 100644 --- a/modules/audio_mixer/gain_change_calculator.h +++ b/modules/audio_mixer/gain_change_calculator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ +#ifndef MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ +#define MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ -#include "webrtc/api/array_view.h" +#include "api/array_view.h" namespace webrtc { @@ -35,4 +35,4 @@ class GainChangeCalculator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ +#endif // MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ diff --git a/modules/audio_mixer/output_rate_calculator.h b/modules/audio_mixer/output_rate_calculator.h index f9c7e1dcee..cb3ca96b2d 100644 --- a/modules/audio_mixer/output_rate_calculator.h +++ b/modules/audio_mixer/output_rate_calculator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ +#ifndef MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ +#define MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ #include @@ -26,4 +26,4 @@ class OutputRateCalculator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ +#endif // MODULES_AUDIO_MIXER_OUTPUT_RATE_CALCULATOR_H_ diff --git a/modules/audio_mixer/sine_wave_generator.cc b/modules/audio_mixer/sine_wave_generator.cc index e3acfe4748..85b9ce59fc 100644 --- a/modules/audio_mixer/sine_wave_generator.cc +++ b/modules/audio_mixer/sine_wave_generator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_mixer/sine_wave_generator.h" +#include "modules/audio_mixer/sine_wave_generator.h" #include -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_mixer/sine_wave_generator.h b/modules/audio_mixer/sine_wave_generator.h index 910f5ae185..b5c4674e20 100644 --- a/modules/audio_mixer/sine_wave_generator.h +++ b/modules/audio_mixer/sine_wave_generator.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ +#ifndef MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ +#define MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -35,4 +35,4 @@ class SineWaveGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ +#endif // MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 3f8b70abe4..974b59ee0d 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -375,7 +375,7 @@ if (rtc_enable_protobuf) { "debug.proto", ] - proto_out_dir = "webrtc/modules/audio_processing" + proto_out_dir = "modules/audio_processing" } } @@ -863,7 +863,7 @@ if (rtc_include_tests) { sources = [ "test/unittest.proto", ] - proto_out_dir = "webrtc/modules/audio_processing/test" + proto_out_dir = "modules/audio_processing/test" } rtc_static_library("audioproc_protobuf_utils") { diff --git a/modules/audio_processing/DEPS b/modules/audio_processing/DEPS index 742971fd1a..79fd071785 100644 --- a/modules/audio_processing/DEPS +++ b/modules/audio_processing/DEPS @@ -1,12 +1,12 @@ include_rules = [ - "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/common_audio", - "+webrtc/system_wrappers", + "+audio/utility/audio_frame_operations.h", + "+common_audio", + "+system_wrappers", ] specific_include_rules = { ".*test\.cc": [ - "+webrtc/rtc_tools", + "+rtc_tools", # Android platform build has different paths. "+gtest", "+external/webrtc", diff --git a/modules/audio_processing/aec/aec_common.h b/modules/audio_processing/aec/aec_common.h index 0e3cddeb4c..3069309ebe 100644 --- a/modules/audio_processing/aec/aec_common.h +++ b/modules/audio_processing/aec/aec_common.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" #ifdef _MSC_VER /* visual c++ */ #define ALIGN16_BEG __declspec(align(16)) @@ -36,4 +36,4 @@ extern const float WebRtcAec_kMinFarendPSD; } // namespace webrtc #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ diff --git a/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc index d580690804..8527bfbe2d 100644 --- a/modules/audio_processing/aec/aec_core.cc +++ b/modules/audio_processing/aec/aec_core.cc @@ -12,7 +12,7 @@ * The core AEC algorithm, which is presented with time-aligned signals. */ -#include "webrtc/modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/aec_core.h" #include #include @@ -20,19 +20,19 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" extern "C" { -#include "webrtc/common_audio/ring_buffer.h" +#include "common_audio/ring_buffer.h" } -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/aec/aec_common.h" -#include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/aec/aec_common.h" +#include "modules/audio_processing/aec/aec_core_optimized_methods.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/metrics.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h index 9a4c241915..eff920d163 100644 --- a/modules/audio_processing/aec/aec_core.h +++ b/modules/audio_processing/aec/aec_core.h @@ -12,22 +12,22 @@ * Specifies the interface for the AEC core. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ +#define MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ #include #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" +#include "common_audio/ring_buffer.h" } -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/aec/aec_common.h" -#include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/aec/aec_common.h" +#include "modules/audio_processing/utility/block_mean_calculator.h" +#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -332,4 +332,4 @@ void WebRtcAec_SetSystemDelay(AecCore* self, int delay); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_ diff --git a/modules/audio_processing/aec/aec_core_mips.cc b/modules/audio_processing/aec/aec_core_mips.cc index 93f075b830..ebe6349e93 100644 --- a/modules/audio_processing/aec/aec_core_mips.cc +++ b/modules/audio_processing/aec/aec_core_mips.cc @@ -12,15 +12,15 @@ * The core AEC algorithm, which is presented with time-aligned signals. */ -#include "webrtc/modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/aec_core.h" #include extern "C" { -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/aec/aec_core_optimized_methods.h" +#include "modules/audio_processing/utility/ooura_fft.h" namespace webrtc { diff --git a/modules/audio_processing/aec/aec_core_neon.cc b/modules/audio_processing/aec/aec_core_neon.cc index 4995ebf5d3..1fbf56b8b6 100644 --- a/modules/audio_processing/aec/aec_core_neon.cc +++ b/modules/audio_processing/aec/aec_core_neon.cc @@ -19,11 +19,11 @@ #include // memset extern "C" { -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aec/aec_common.h" -#include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/aec/aec_common.h" +#include "modules/audio_processing/aec/aec_core_optimized_methods.h" +#include "modules/audio_processing/utility/ooura_fft.h" namespace webrtc { diff --git a/modules/audio_processing/aec/aec_core_optimized_methods.h b/modules/audio_processing/aec/aec_core_optimized_methods.h index 5e873c8c80..93f278862a 100644 --- a/modules/audio_processing/aec/aec_core_optimized_methods.h +++ b/modules/audio_processing/aec/aec_core_optimized_methods.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ +#define MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ #include -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "typedefs.h" namespace webrtc { @@ -77,4 +77,4 @@ extern WebRtcAecWindowData WebRtcAec_WindowData; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_ diff --git a/modules/audio_processing/aec/aec_core_sse2.cc b/modules/audio_processing/aec/aec_core_sse2.cc index ac93919a77..0532662bed 100644 --- a/modules/audio_processing/aec/aec_core_sse2.cc +++ b/modules/audio_processing/aec/aec_core_sse2.cc @@ -17,11 +17,11 @@ #include // memset extern "C" { -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aec/aec_common.h" -#include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/aec/aec_common.h" +#include "modules/audio_processing/aec/aec_core_optimized_methods.h" +#include "modules/audio_processing/utility/ooura_fft.h" namespace webrtc { diff --git a/modules/audio_processing/aec/aec_resampler.cc b/modules/audio_processing/aec/aec_resampler.cc index ff2960bd30..2851c0b6dd 100644 --- a/modules/audio_processing/aec/aec_resampler.cc +++ b/modules/audio_processing/aec/aec_resampler.cc @@ -12,14 +12,14 @@ * clock skew by resampling the farend signal. */ -#include "webrtc/modules/audio_processing/aec/aec_resampler.h" +#include "modules/audio_processing/aec/aec_resampler.h" #include #include #include -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec/aec_resampler.h b/modules/audio_processing/aec/aec_resampler.h index 3a7400b010..130f7ec7c7 100644 --- a/modules/audio_processing/aec/aec_resampler.h +++ b/modules/audio_processing/aec/aec_resampler.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ +#define MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ -#include "webrtc/modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/aec_core.h" namespace webrtc { @@ -36,4 +36,4 @@ void WebRtcAec_ResampleLinear(void* resampInst, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ diff --git a/modules/audio_processing/aec/echo_cancellation.cc b/modules/audio_processing/aec/echo_cancellation.cc index 9e9e7076ce..52777c156d 100644 --- a/modules/audio_processing/aec/echo_cancellation.cc +++ b/modules/audio_processing/aec/echo_cancellation.cc @@ -11,20 +11,20 @@ /* * Contains the API functions for the AEC. */ -#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" +#include "modules/audio_processing/aec/echo_cancellation.h" #include #include #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/ring_buffer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/modules/audio_processing/aec/aec_resampler.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/aec_resampler.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/aec/echo_cancellation.h b/modules/audio_processing/aec/echo_cancellation.h index 10471139dc..a75ea42033 100644 --- a/modules/audio_processing/aec/echo_cancellation.h +++ b/modules/audio_processing/aec/echo_cancellation.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ +#define MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ #include #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" +#include "common_audio/ring_buffer.h" } -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "typedefs.h" namespace webrtc { @@ -296,4 +296,4 @@ struct AecCore* WebRtcAec_aec_core(void* handle); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_ diff --git a/modules/audio_processing/aec/echo_cancellation_unittest.cc b/modules/audio_processing/aec/echo_cancellation_unittest.cc index 647e90cda2..b9c89fd9e9 100644 --- a/modules/audio_processing/aec/echo_cancellation_unittest.cc +++ b/modules/audio_processing/aec/echo_cancellation_unittest.cc @@ -10,14 +10,14 @@ // TODO(bjornv): Make this a comprehensive test. -#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" +#include "modules/audio_processing/aec/echo_cancellation.h" #include #include -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc index 141d608008..3a51bf19e8 100644 --- a/modules/audio_processing/aec/system_delay_unittest.cc +++ b/modules/audio_processing/aec/system_delay_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/echo_cancellation.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.cc b/modules/audio_processing/aec3/adaptive_fir_filter.cc index 303ff7735d..cde456ce05 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" #if defined(WEBRTC_HAS_NEON) #include #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif #include #include -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h index ee2cbbdfae..7872869351 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.h +++ b/modules/audio_processing/aec3/adaptive_fir_filter.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace aec3 { @@ -150,4 +150,4 @@ class AdaptiveFirFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ diff --git a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc index c861d464e1..0a2b839a98 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc @@ -8,28 +8,28 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" #include #include #include #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" -#include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/shadow_filter_update_gain.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/random.h" +#include "rtc_base/safe_minmax.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/aec3_common.cc b/modules/audio_processing/aec3/aec3_common.cc index ae0624703b..4541c2dc78 100644 --- a/modules/audio_processing/aec3/aec3_common.cc +++ b/modules/audio_processing/aec3/aec3_common.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/typedefs.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "typedefs.h" +#include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec3_common.h b/modules/audio_processing/aec3/aec3_common.h index feb5bdbf62..d71125b5e7 100644 --- a/modules/audio_processing/aec3/aec3_common.h +++ b/modules/audio_processing/aec3/aec3_common.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -112,4 +112,4 @@ static_assert(!ValidFullBandRate(8001), } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ diff --git a/modules/audio_processing/aec3/aec3_fft.cc b/modules/audio_processing/aec3/aec3_fft.cc index cb06956d21..c8120cb864 100644 --- a/modules/audio_processing/aec3/aec3_fft.cc +++ b/modules/audio_processing/aec3/aec3_fft.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/aec3_fft.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec3_fft.h b/modules/audio_processing/aec3/aec3_fft.h index d8531d2d5c..2a5dfef47f 100644 --- a/modules/audio_processing/aec3/aec3_fft.h +++ b/modules/audio_processing/aec3/aec3_fft.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -57,4 +57,4 @@ class Aec3Fft { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_ diff --git a/modules/audio_processing/aec3/aec3_fft_unittest.cc b/modules/audio_processing/aec3/aec3_fft_unittest.cc index ae1f52e5af..46831e021a 100644 --- a/modules/audio_processing/aec3/aec3_fft_unittest.cc +++ b/modules/audio_processing/aec3/aec3_fft_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/aec3_fft.h" #include -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index 8323099905..6ea54fcf3d 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/aec_state.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" +#include "api/array_view.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h index 38ed3b047b..c7f9bfc4a7 100644 --- a/modules/audio_processing/aec3/aec_state.h +++ b/modules/audio_processing/aec3/aec_state.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/aec3/erl_estimator.h" -#include "webrtc/modules/audio_processing/aec3/erle_estimator.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/erl_estimator.h" +#include "modules/audio_processing/aec3/erle_estimator.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -153,4 +153,4 @@ class AecState { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ diff --git a/modules/audio_processing/aec3/aec_state_unittest.cc b/modules/audio_processing/aec3/aec_state_unittest.cc index 05530ca6d1..8413413ce2 100644 --- a/modules/audio_processing/aec3/aec_state_unittest.cc +++ b/modules/audio_processing/aec3/aec_state_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_framer.cc b/modules/audio_processing/aec3/block_framer.cc index 80ac83645e..3160624515 100644 --- a/modules/audio_processing/aec3/block_framer.cc +++ b/modules/audio_processing/aec3/block_framer.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/block_framer.h" +#include "modules/audio_processing/aec3/block_framer.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_framer.h b/modules/audio_processing/aec3/block_framer.h index de7c79a459..923e4cfb53 100644 --- a/modules/audio_processing/aec3/block_framer.h +++ b/modules/audio_processing/aec3/block_framer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -44,4 +44,4 @@ class BlockFramer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_ diff --git a/modules/audio_processing/aec3/block_framer_unittest.cc b/modules/audio_processing/aec3/block_framer_unittest.cc index b6419f7c60..16d3944e13 100644 --- a/modules/audio_processing/aec3/block_framer_unittest.cc +++ b/modules/audio_processing/aec3/block_framer_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/block_framer.h" +#include "modules/audio_processing/aec3/block_framer.h" #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc index 7bb9e15129..1d4d46a194 100644 --- a/modules/audio_processing/aec3/block_processor.cc +++ b/modules/audio_processing/aec3/block_processor.cc @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/block_processor.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_processor_metrics.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor_metrics.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/block_processor.h b/modules/audio_processing/aec3/block_processor.h index 92359314a1..5f95e0024f 100644 --- a/modules/audio_processing/aec3/block_processor.h +++ b/modules/audio_processing/aec3/block_processor.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ #include #include -#include "webrtc/modules/audio_processing/aec3/echo_remover.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_controller.h" +#include "modules/audio_processing/aec3/echo_remover.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" namespace webrtc { @@ -57,4 +57,4 @@ class BlockProcessor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ diff --git a/modules/audio_processing/aec3/block_processor_metrics.cc b/modules/audio_processing/aec3/block_processor_metrics.cc index 3eeafa2e45..c8bdda7389 100644 --- a/modules/audio_processing/aec3/block_processor_metrics.cc +++ b/modules/audio_processing/aec3/block_processor_metrics.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/block_processor_metrics.h" +#include "modules/audio_processing/aec3/block_processor_metrics.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor_metrics.h b/modules/audio_processing/aec3/block_processor_metrics.h index 1cff2a8d3e..9b437c0d13 100644 --- a/modules/audio_processing/aec3/block_processor_metrics.h +++ b/modules/audio_processing/aec3/block_processor_metrics.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -44,4 +44,4 @@ class BlockProcessorMetrics { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ diff --git a/modules/audio_processing/aec3/block_processor_metrics_unittest.cc b/modules/audio_processing/aec3/block_processor_metrics_unittest.cc index 8ab1048556..7ce8573efa 100644 --- a/modules/audio_processing/aec3/block_processor_metrics_unittest.cc +++ b/modules/audio_processing/aec3/block_processor_metrics_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_processor_metrics.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor_metrics.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor_unittest.cc b/modules/audio_processing/aec3/block_processor_unittest.cc index 9f402ed846..57cd430cb4 100644 --- a/modules/audio_processing/aec3/block_processor_unittest.cc +++ b/modules/audio_processing/aec3/block_processor_unittest.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/block_processor.h" #include #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h" -#include "webrtc/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h" -#include "webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/mock/mock_echo_remover.h" +#include "modules/audio_processing/aec3/mock/mock_render_delay_buffer.h" +#include "modules/audio_processing/aec3/mock/mock_render_delay_controller.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/checks.h" +#include "rtc_base/random.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.cc b/modules/audio_processing/aec3/cascaded_biquad_filter.cc index 3ac86c0029..9a472f516f 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter.cc +++ b/modules/audio_processing/aec3/cascaded_biquad_filter.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.h b/modules/audio_processing/aec3/cascaded_biquad_filter.h index 997e6ea5f9..aea889ab53 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter.h +++ b/modules/audio_processing/aec3/cascaded_biquad_filter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -55,4 +55,4 @@ class CascadedBiQuadFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc b/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc index 7628a8814e..fcb77e1f6e 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc +++ b/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/comfort_noise_generator.cc b/modules/audio_processing/aec3/comfort_noise_generator.cc index b8d7f28df6..a4cfa9e094 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.cc +++ b/modules/audio_processing/aec3/comfort_noise_generator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/comfort_noise_generator.h" +#include "modules/audio_processing/aec3/comfort_noise_generator.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif @@ -20,7 +20,7 @@ #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h index 3684f48fee..2d998beb94 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.h +++ b/modules/audio_processing/aec3/comfort_noise_generator.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace aec3 { @@ -65,4 +65,4 @@ class ComfortNoiseGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ diff --git a/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc b/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc index 7cb0aa1e67..d8998eab72 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc +++ b/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/comfort_noise_generator.h" +#include "modules/audio_processing/aec3/comfort_noise_generator.h" #include #include -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/decimator_by_4.cc b/modules/audio_processing/aec3/decimator_by_4.cc index 94d11d26f3..0db3b8f842 100644 --- a/modules/audio_processing/aec3/decimator_by_4.cc +++ b/modules/audio_processing/aec3/decimator_by_4.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/decimator_by_4.h b/modules/audio_processing/aec3/decimator_by_4.h index cafe82c99a..023d6d22e2 100644 --- a/modules/audio_processing/aec3/decimator_by_4.h +++ b/modules/audio_processing/aec3/decimator_by_4.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -35,4 +35,4 @@ class DecimatorBy4 { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_BY_4_H_ diff --git a/modules/audio_processing/aec3/decimator_by_4_unittest.cc b/modules/audio_processing/aec3/decimator_by_4_unittest.cc index 0d3d183537..1ae2c5b95c 100644 --- a/modules/audio_processing/aec3/decimator_by_4_unittest.cc +++ b/modules/audio_processing/aec3/decimator_by_4_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" #include #include @@ -18,8 +18,8 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/downsampled_render_buffer.cc b/modules/audio_processing/aec3/downsampled_render_buffer.cc index 195853a40d..cc65b3f354 100644 --- a/modules/audio_processing/aec3/downsampled_render_buffer.cc +++ b/modules/audio_processing/aec3/downsampled_render_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/downsampled_render_buffer.h b/modules/audio_processing/aec3/downsampled_render_buffer.h index e639ea8b68..499eac7f99 100644 --- a/modules/audio_processing/aec3/downsampled_render_buffer.h +++ b/modules/audio_processing/aec3/downsampled_render_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_common.h" namespace webrtc { @@ -27,4 +27,4 @@ struct DownsampledRenderBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc index 143f1b9d2a..de399ee28e 100644 --- a/modules/audio_processing/aec3/echo_canceller3.cc +++ b/modules/audio_processing/aec3/echo_canceller3.cc @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_canceller3.h" +#include "modules/audio_processing/aec3/echo_canceller3.h" #include -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_canceller3.h b/modules/audio_processing/aec3/echo_canceller3.h index f3b69e5e3c..742fd1bccf 100644 --- a/modules/audio_processing/aec3/echo_canceller3.h +++ b/modules/audio_processing/aec3/echo_canceller3.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ -#include "webrtc/modules/audio_processing/aec3/block_framer.h" -#include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "webrtc/modules/audio_processing/aec3/frame_blocker.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/swap_queue.h" +#include "modules/audio_processing/aec3/block_framer.h" +#include "modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "modules/audio_processing/aec3/frame_blocker.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/swap_queue.h" namespace webrtc { @@ -135,4 +135,4 @@ class EchoCanceller3 { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ diff --git a/modules/audio_processing/aec3/echo_canceller3_unittest.cc b/modules/audio_processing/aec3/echo_canceller3_unittest.cc index ac3f7091b3..fbe65593b1 100644 --- a/modules/audio_processing/aec3/echo_canceller3_unittest.cc +++ b/modules/audio_processing/aec3/echo_canceller3_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_canceller3.h" +#include "modules/audio_processing/aec3/echo_canceller3.h" #include #include @@ -17,13 +17,13 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/modules/audio_processing/aec3/frame_blocker.h" -#include "webrtc/modules/audio_processing/aec3/mock/mock_block_processor.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/frame_blocker.h" +#include "modules/audio_processing/aec3/mock/mock_block_processor.h" +#include "modules/audio_processing/audio_buffer.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.cc b/modules/audio_processing/aec3/echo_path_delay_estimator.cc index 3c182f3952..2e0658898d 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator.cc +++ b/modules/audio_processing/aec3/echo_path_delay_estimator.cc @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h" +#include "modules/audio_processing/aec3/echo_path_delay_estimator.h" #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.h b/modules/audio_processing/aec3/echo_path_delay_estimator.h index 7ff1cb33a5..34c7ad4c83 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator.h +++ b/modules/audio_processing/aec3/echo_path_delay_estimator.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/matched_filter.h" -#include "webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/matched_filter.h" +#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -50,4 +50,4 @@ class EchoPathDelayEstimator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc b/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc index 89b49cae40..97abdc08a1 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc +++ b/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h" +#include "modules/audio_processing/aec3/echo_path_delay_estimator.h" #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/echo_path_variability.cc b/modules/audio_processing/aec3/echo_path_variability.cc index 514659205c..f63a83006e 100644 --- a/modules/audio_processing/aec3/echo_path_variability.cc +++ b/modules/audio_processing/aec3/echo_path_variability.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_path_variability.h b/modules/audio_processing/aec3/echo_path_variability.h index 7755362787..55915d5b68 100644 --- a/modules/audio_processing/aec3/echo_path_variability.h +++ b/modules/audio_processing/aec3/echo_path_variability.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ namespace webrtc { @@ -23,4 +23,4 @@ struct EchoPathVariability { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_ diff --git a/modules/audio_processing/aec3/echo_path_variability_unittest.cc b/modules/audio_processing/aec3/echo_path_variability_unittest.cc index e2e82d1f97..9a1df78885 100644 --- a/modules/audio_processing/aec3/echo_path_variability_unittest.cc +++ b/modules/audio_processing/aec3/echo_path_variability_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc index bac370471c..2f14585df8 100644 --- a/modules/audio_processing/aec3/echo_remover.cc +++ b/modules/audio_processing/aec3/echo_remover.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_remover.h" +#include "modules/audio_processing/aec3/echo_remover.h" #include #include @@ -15,23 +15,23 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/comfort_noise_generator.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/aec3/echo_remover_metrics.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/modules/audio_processing/aec3/output_selector.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/aec3/residual_echo_estimator.h" -#include "webrtc/modules/audio_processing/aec3/subtractor.h" -#include "webrtc/modules/audio_processing/aec3/suppression_filter.h" -#include "webrtc/modules/audio_processing/aec3/suppression_gain.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/comfort_noise_generator.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/echo_remover_metrics.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/output_selector.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/residual_echo_estimator.h" +#include "modules/audio_processing/aec3/subtractor.h" +#include "modules/audio_processing/aec3/suppression_filter.h" +#include "modules/audio_processing/aec3/suppression_gain.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_remover.h b/modules/audio_processing/aec3/echo_remover.h index 8a28729ba6..83e869e2ad 100644 --- a/modules/audio_processing/aec3/echo_remover.h +++ b/modules/audio_processing/aec3/echo_remover.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" namespace webrtc { @@ -45,4 +45,4 @@ class EchoRemover { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_ diff --git a/modules/audio_processing/aec3/echo_remover_metrics.cc b/modules/audio_processing/aec3/echo_remover_metrics.cc index d70e4a121f..8ec4bcfa62 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_remover_metrics.h" +#include "modules/audio_processing/aec3/echo_remover_metrics.h" #include #include #include -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/safe_minmax.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_remover_metrics.h b/modules/audio_processing/aec3/echo_remover_metrics.h index 57e123ed87..6548ae8aa2 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.h +++ b/modules/audio_processing/aec3/echo_remover_metrics.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -74,4 +74,4 @@ int TransformDbMetricForReporting(bool negate, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ diff --git a/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc b/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc index 094508effa..baab10f6f1 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_remover_metrics.h" +#include "modules/audio_processing/aec3/echo_remover_metrics.h" #include -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_remover_unittest.cc b/modules/audio_processing/aec3/echo_remover_unittest.cc index f2f895d549..4638f90c8f 100644 --- a/modules/audio_processing/aec3/echo_remover_unittest.cc +++ b/modules/audio_processing/aec3/echo_remover_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/echo_remover.h" +#include "modules/audio_processing/aec3/echo_remover.h" #include #include @@ -16,13 +16,13 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/erl_estimator.cc b/modules/audio_processing/aec3/erl_estimator.cc index 6990ea3cec..7923c0da50 100644 --- a/modules/audio_processing/aec3/erl_estimator.cc +++ b/modules/audio_processing/aec3/erl_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/erl_estimator.h" +#include "modules/audio_processing/aec3/erl_estimator.h" #include diff --git a/modules/audio_processing/aec3/erl_estimator.h b/modules/audio_processing/aec3/erl_estimator.h index bc81926209..1fe12fb6dd 100644 --- a/modules/audio_processing/aec3/erl_estimator.h +++ b/modules/audio_processing/aec3/erl_estimator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -40,4 +40,4 @@ class ErlEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ diff --git a/modules/audio_processing/aec3/erl_estimator_unittest.cc b/modules/audio_processing/aec3/erl_estimator_unittest.cc index bf803820de..3fbaec0e98 100644 --- a/modules/audio_processing/aec3/erl_estimator_unittest.cc +++ b/modules/audio_processing/aec3/erl_estimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/erl_estimator.h" +#include "modules/audio_processing/aec3/erl_estimator.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/erle_estimator.cc b/modules/audio_processing/aec3/erle_estimator.cc index da0e421c00..2b669c93d8 100644 --- a/modules/audio_processing/aec3/erle_estimator.cc +++ b/modules/audio_processing/aec3/erle_estimator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/erle_estimator.h" +#include "modules/audio_processing/aec3/erle_estimator.h" #include -#include "webrtc/rtc_base/safe_minmax.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/erle_estimator.h b/modules/audio_processing/aec3/erle_estimator.h index 91a8c6ceb8..80c0387981 100644 --- a/modules/audio_processing/aec3/erle_estimator.h +++ b/modules/audio_processing/aec3/erle_estimator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -44,4 +44,4 @@ class ErleEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ diff --git a/modules/audio_processing/aec3/erle_estimator_unittest.cc b/modules/audio_processing/aec3/erle_estimator_unittest.cc index be435c0a41..bc5ac193c5 100644 --- a/modules/audio_processing/aec3/erle_estimator_unittest.cc +++ b/modules/audio_processing/aec3/erle_estimator_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/erle_estimator.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/erle_estimator.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/fft_data.h b/modules/audio_processing/aec3/fft_data.h index bfd182b62a..e79ff65d83 100644 --- a/modules/audio_processing/aec3/fft_data.h +++ b/modules/audio_processing/aec3/fft_data.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" namespace webrtc { @@ -95,4 +95,4 @@ struct FftData { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ diff --git a/modules/audio_processing/aec3/fft_data_unittest.cc b/modules/audio_processing/aec3/fft_data_unittest.cc index e5881cff77..83d8252528 100644 --- a/modules/audio_processing/aec3/fft_data_unittest.cc +++ b/modules/audio_processing/aec3/fft_data_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/fft_data.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/frame_blocker.cc b/modules/audio_processing/aec3/frame_blocker.cc index a8b04d909d..0a0c0e2fae 100644 --- a/modules/audio_processing/aec3/frame_blocker.cc +++ b/modules/audio_processing/aec3/frame_blocker.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/frame_blocker.h" +#include "modules/audio_processing/aec3/frame_blocker.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/frame_blocker.h b/modules/audio_processing/aec3/frame_blocker.h index d7cfd09b27..08e1e1dd23 100644 --- a/modules/audio_processing/aec3/frame_blocker.h +++ b/modules/audio_processing/aec3/frame_blocker.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -45,4 +45,4 @@ class FrameBlocker { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_ diff --git a/modules/audio_processing/aec3/frame_blocker_unittest.cc b/modules/audio_processing/aec3/frame_blocker_unittest.cc index 217615c798..6e73d4bc8f 100644 --- a/modules/audio_processing/aec3/frame_blocker_unittest.cc +++ b/modules/audio_processing/aec3/frame_blocker_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/frame_blocker.h" +#include "modules/audio_processing/aec3/frame_blocker.h" #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_framer.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_framer.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/main_filter_update_gain.cc b/modules/audio_processing/aec3/main_filter_update_gain.cc index 3d5154d73f..1dd2a20b27 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.cc +++ b/modules/audio_processing/aec3/main_filter_update_gain.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h" +#include "modules/audio_processing/aec3/main_filter_update_gain.h" #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/main_filter_update_gain.h b/modules/audio_processing/aec3/main_filter_update_gain.h index 5818a106ba..756a5d0e5d 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.h +++ b/modules/audio_processing/aec3/main_filter_update_gain.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ #include #include -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" -#include "webrtc/modules/audio_processing/aec3/subtractor_output.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/subtractor_output.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -53,4 +53,4 @@ class MainFilterUpdateGain { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ diff --git a/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc index cbd62b58ad..6d0423faaf 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h" +#include "modules/audio_processing/aec3/main_filter_update_gain.h" #include #include #include -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" -#include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" -#include "webrtc/modules/audio_processing/aec3/subtractor_output.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/shadow_filter_update_gain.h" +#include "modules/audio_processing/aec3/subtractor_output.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "rtc_base/safe_minmax.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/matched_filter.cc b/modules/audio_processing/aec3/matched_filter.cc index 5414cfcb31..009b9b7a1b 100644 --- a/modules/audio_processing/aec3/matched_filter.cc +++ b/modules/audio_processing/aec3/matched_filter.cc @@ -7,20 +7,20 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/matched_filter.h" +#include "modules/audio_processing/aec3/matched_filter.h" #if defined(WEBRTC_HAS_NEON) #include #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h index a200af1261..37e219fa68 100644 --- a/modules/audio_processing/aec3/matched_filter.h +++ b/modules/audio_processing/aec3/matched_filter.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace aec3 { @@ -116,4 +116,4 @@ class MatchedFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc index 4a0a935620..75d5797bed 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h" +#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h index d490f0d45d..c58112abc6 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/matched_filter.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/matched_filter.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -46,4 +46,4 @@ class MatchedFilterLagAggregator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_ diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc index 0144bf46c9..0f88707e4e 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h" +#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/matched_filter_unittest.cc b/modules/audio_processing/aec3/matched_filter_unittest.cc index 47ff353be8..96d53e8c0a 100644 --- a/modules/audio_processing/aec3/matched_filter_unittest.cc +++ b/modules/audio_processing/aec3/matched_filter_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/matched_filter.h" +#include "modules/audio_processing/aec3/matched_filter.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif @@ -18,14 +18,14 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/mock/mock_block_processor.h b/modules/audio_processing/aec3/mock/mock_block_processor.h index 63ed75566e..89adc8e522 100644 --- a/modules/audio_processing/aec3/mock/mock_block_processor.h +++ b/modules/audio_processing/aec3/mock/mock_block_processor.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ #include -#include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/aec3/block_processor.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -35,4 +35,4 @@ class MockBlockProcessor : public BlockProcessor { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_ diff --git a/modules/audio_processing/aec3/mock/mock_echo_remover.h b/modules/audio_processing/aec3/mock/mock_echo_remover.h index 8d2aca992d..06f6b8797d 100644 --- a/modules/audio_processing/aec3/mock/mock_echo_remover.h +++ b/modules/audio_processing/aec3/mock/mock_echo_remover.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/aec3/echo_remover.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/test/gmock.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/echo_remover.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -39,4 +39,4 @@ class MockEchoRemover : public EchoRemover { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_ diff --git a/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h b/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h index 06503e9136..7e6de8bc3a 100644 --- a/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h +++ b/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -61,4 +61,4 @@ class MockRenderDelayBuffer : public RenderDelayBuffer { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_ diff --git a/modules/audio_processing/aec3/mock/mock_render_delay_controller.h b/modules/audio_processing/aec3/mock/mock_render_delay_controller.h index 64daef5a45..b1f1cbe6cf 100644 --- a/modules/audio_processing/aec3/mock/mock_render_delay_controller.h +++ b/modules/audio_processing/aec3/mock/mock_render_delay_controller.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_controller.h" -#include "webrtc/test/gmock.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -35,4 +35,4 @@ class MockRenderDelayController : public RenderDelayController { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ diff --git a/modules/audio_processing/aec3/output_selector.cc b/modules/audio_processing/aec3/output_selector.cc index 21e24e527b..4f547d98d9 100644 --- a/modules/audio_processing/aec3/output_selector.cc +++ b/modules/audio_processing/aec3/output_selector.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/output_selector.h" +#include "modules/audio_processing/aec3/output_selector.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/output_selector.h b/modules/audio_processing/aec3/output_selector.h index 920280a8c1..a406c61745 100644 --- a/modules/audio_processing/aec3/output_selector.h +++ b/modules/audio_processing/aec3/output_selector.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -38,4 +38,4 @@ class OutputSelector { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ diff --git a/modules/audio_processing/aec3/output_selector_unittest.cc b/modules/audio_processing/aec3/output_selector_unittest.cc index 717f631bae..c7add1c838 100644 --- a/modules/audio_processing/aec3/output_selector_unittest.cc +++ b/modules/audio_processing/aec3/output_selector_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/output_selector.h" +#include "modules/audio_processing/aec3/output_selector.h" #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_buffer.cc b/modules/audio_processing/aec3/render_buffer.cc index 2bedfcb639..fa86ea6b36 100644 --- a/modules/audio_processing/aec3/render_buffer.cc +++ b/modules/audio_processing/aec3/render_buffer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_buffer.h" #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h index bc88767b93..3288ff36ad 100644 --- a/modules/audio_processing/aec3/render_buffer.h +++ b/modules/audio_processing/aec3/render_buffer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -78,4 +78,4 @@ class RenderBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ diff --git a/modules/audio_processing/aec3/render_buffer_unittest.cc b/modules/audio_processing/aec3/render_buffer_unittest.cc index 2751003146..1498f4ea25 100644 --- a/modules/audio_processing/aec3/render_buffer_unittest.cc +++ b/modules/audio_processing/aec3/render_buffer_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_buffer.h" #include #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc index 73dadadac6..785b837ddb 100644 --- a/modules/audio_processing/aec3/render_delay_buffer.cc +++ b/modules/audio_processing/aec3/render_delay_buffer.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/render_delay_buffer.h b/modules/audio_processing/aec3/render_delay_buffer.h index 865a00dc0e..1678fc79c0 100644 --- a/modules/audio_processing/aec3/render_delay_buffer.h +++ b/modules/audio_processing/aec3/render_delay_buffer.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/render_buffer.h" namespace webrtc { @@ -56,4 +56,4 @@ class RenderDelayBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ diff --git a/modules/audio_processing/aec3/render_delay_buffer_unittest.cc b/modules/audio_processing/aec3/render_delay_buffer_unittest.cc index 120ddb2f8d..5a8f4b2401 100644 --- a/modules/audio_processing/aec3/render_delay_buffer_unittest.cc +++ b/modules/audio_processing/aec3/render_delay_buffer_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/render_delay_controller.cc b/modules/audio_processing/aec3/render_delay_controller.cc index 565bf43f0b..e651da9f76 100644 --- a/modules/audio_processing/aec3/render_delay_controller.cc +++ b/modules/audio_processing/aec3/render_delay_controller.cc @@ -7,19 +7,19 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_controller.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" #include #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/echo_path_delay_estimator.h" +#include "modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller.h b/modules/audio_processing/aec3/render_delay_controller.h index e840178cb6..a3d8d12aae 100644 --- a/modules/audio_processing/aec3/render_delay_controller.h +++ b/modules/audio_processing/aec3/render_delay_controller.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { @@ -43,4 +43,4 @@ class RenderDelayController { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.cc b/modules/audio_processing/aec3/render_delay_controller_metrics.cc index d0330cbd24..696ac29a73 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics.cc +++ b/modules/audio_processing/aec3/render_delay_controller_metrics.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "modules/audio_processing/aec3/render_delay_controller_metrics.h" #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.h b/modules/audio_processing/aec3/render_delay_controller_metrics.h index 625f30f04a..a93f0764ed 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics.h +++ b/modules/audio_processing/aec3/render_delay_controller_metrics.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -44,4 +44,4 @@ class RenderDelayControllerMetrics { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc b/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc index bb39e77471..974d75dce9 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc +++ b/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller_unittest.cc b/modules/audio_processing/aec3/render_delay_controller_unittest.cc index 45d00f9fd7..3f1d00e40c 100644 --- a/modules/audio_processing/aec3/render_delay_controller_unittest.cc +++ b/modules/audio_processing/aec3/render_delay_controller_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_delay_controller.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" #include #include @@ -16,14 +16,14 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor.h" +#include "modules/audio_processing/aec3/decimator_by_4.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/render_signal_analyzer.cc b/modules/audio_processing/aec3/render_signal_analyzer.cc index ce1c2f42e1..5e29542391 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_signal_analyzer.h b/modules/audio_processing/aec3/render_signal_analyzer.h index 48ce81e9fc..64d74f4e3f 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.h +++ b/modules/audio_processing/aec3/render_signal_analyzer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -55,4 +55,4 @@ class RenderSignalAnalyzer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ diff --git a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc index e1f1e0f661..dca9a04c53 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/residual_echo_estimator.cc b/modules/audio_processing/aec3/residual_echo_estimator.cc index 0dfec66cb2..a261891967 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.cc +++ b/modules/audio_processing/aec3/residual_echo_estimator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/residual_echo_estimator.h" +#include "modules/audio_processing/aec3/residual_echo_estimator.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/residual_echo_estimator.h b/modules/audio_processing/aec3/residual_echo_estimator.h index 0e86ac11c3..91d630d500 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.h +++ b/modules/audio_processing/aec3/residual_echo_estimator.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -78,4 +78,4 @@ class ResidualEchoEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ diff --git a/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc b/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc index 6abb155734..4bd2881145 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc +++ b/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/residual_echo_estimator.h" +#include "modules/audio_processing/aec3/residual_echo_estimator.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/shadow_filter_update_gain.cc b/modules/audio_processing/aec3/shadow_filter_update_gain.cc index 6287110e09..db393a78b2 100644 --- a/modules/audio_processing/aec3/shadow_filter_update_gain.cc +++ b/modules/audio_processing/aec3/shadow_filter_update_gain.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" +#include "modules/audio_processing/aec3/shadow_filter_update_gain.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/shadow_filter_update_gain.h b/modules/audio_processing/aec3/shadow_filter_update_gain.h index be1102d12e..8c72cf487b 100644 --- a/modules/audio_processing/aec3/shadow_filter_update_gain.h +++ b/modules/audio_processing/aec3/shadow_filter_update_gain.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -41,4 +41,4 @@ class ShadowFilterUpdateGain { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ diff --git a/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc index 99e3f25795..a1249e0c8b 100644 --- a/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" +#include "modules/audio_processing/aec3/shadow_filter_update_gain.h" #include #include #include #include -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "rtc_base/safe_minmax.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/subtractor.cc b/modules/audio_processing/aec3/subtractor.cc index f63505f7fc..c64e5a4ef9 100644 --- a/modules/audio_processing/aec3/subtractor.cc +++ b/modules/audio_processing/aec3/subtractor.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/subtractor.h" +#include "modules/audio_processing/aec3/subtractor.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "api/array_view.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/subtractor.h b/modules/audio_processing/aec3/subtractor.h index 777e4ff350..e76155494c 100644 --- a/modules/audio_processing/aec3/subtractor.h +++ b/modules/audio_processing/aec3/subtractor.h @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ #include #include #include -#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" -#include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h" -#include "webrtc/modules/audio_processing/aec3/render_buffer.h" -#include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" -#include "webrtc/modules/audio_processing/aec3/subtractor_output.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/main_filter_update_gain.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/shadow_filter_update_gain.h" +#include "modules/audio_processing/aec3/subtractor_output.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -71,4 +71,4 @@ class Subtractor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ diff --git a/modules/audio_processing/aec3/subtractor_output.h b/modules/audio_processing/aec3/subtractor_output.h index 8755047581..8655665b35 100644 --- a/modules/audio_processing/aec3/subtractor_output.h +++ b/modules/audio_processing/aec3/subtractor_output.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/fft_data.h" namespace webrtc { @@ -40,4 +40,4 @@ struct SubtractorOutput { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_ diff --git a/modules/audio_processing/aec3/subtractor_unittest.cc b/modules/audio_processing/aec3/subtractor_unittest.cc index 07b121337a..ea28c4e663 100644 --- a/modules/audio_processing/aec3/subtractor_unittest.cc +++ b/modules/audio_processing/aec3/subtractor_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/subtractor.h" +#include "modules/audio_processing/aec3/subtractor.h" #include #include #include -#include "webrtc/modules/audio_processing/aec3/aec_state.h" -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/suppression_filter.cc b/modules/audio_processing/aec3/suppression_filter.cc index 5ad491151d..ab78b33cd5 100644 --- a/modules/audio_processing/aec3/suppression_filter.cc +++ b/modules/audio_processing/aec3/suppression_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/suppression_filter.h" +#include "modules/audio_processing/aec3/suppression_filter.h" #include #include @@ -16,8 +16,8 @@ #include #include -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/suppression_filter.h b/modules/audio_processing/aec3/suppression_filter.h index 44ce6beeab..5f91dea28f 100644 --- a/modules/audio_processing/aec3/suppression_filter.h +++ b/modules/audio_processing/aec3/suppression_filter.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_fft.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -41,4 +41,4 @@ class SuppressionFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_ diff --git a/modules/audio_processing/aec3/suppression_filter_unittest.cc b/modules/audio_processing/aec3/suppression_filter_unittest.cc index 312391b0e9..51b3f91f2a 100644 --- a/modules/audio_processing/aec3/suppression_filter_unittest.cc +++ b/modules/audio_processing/aec3/suppression_filter_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/suppression_filter.h" +#include "modules/audio_processing/aec3/suppression_filter.h" #include #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc index 8e78967e5c..44dd278636 100644 --- a/modules/audio_processing/aec3/suppression_gain.cc +++ b/modules/audio_processing/aec3/suppression_gain.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/suppression_gain.h" +#include "modules/audio_processing/aec3/suppression_gain.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif @@ -19,8 +19,8 @@ #include #include -#include "webrtc/modules/audio_processing/aec3/vector_math.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec3/vector_math.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h index 2d618c3ddd..128d78ad69 100644 --- a/modules/audio_processing/aec3/suppression_gain.h +++ b/modules/audio_processing/aec3/suppression_gain.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ #include #include -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -66,4 +66,4 @@ class SuppressionGain { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ diff --git a/modules/audio_processing/aec3/suppression_gain_unittest.cc b/modules/audio_processing/aec3/suppression_gain_unittest.cc index cde3c94a32..7b5ec32dee 100644 --- a/modules/audio_processing/aec3/suppression_gain_unittest.cc +++ b/modules/audio_processing/aec3/suppression_gain_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/suppression_gain.h" +#include "modules/audio_processing/aec3/suppression_gain.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/vector_math.h b/modules/audio_processing/aec3/vector_math.h index d1a7e518ab..f273e830b0 100644 --- a/modules/audio_processing/aec3/vector_math.h +++ b/modules/audio_processing/aec3/vector_math.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ +#define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_HAS_NEON) #include #endif @@ -23,9 +23,9 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" -#include "webrtc/rtc_base/checks.h" +#include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/checks.h" namespace webrtc { namespace aec3 { @@ -209,4 +209,4 @@ class VectorMath { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ diff --git a/modules/audio_processing/aec3/vector_math_unittest.cc b/modules/audio_processing/aec3/vector_math_unittest.cc index 924ce31e88..6aeb3066b5 100644 --- a/modules/audio_processing/aec3/vector_math_unittest.cc +++ b/modules/audio_processing/aec3/vector_math_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec3/vector_math.h" +#include "modules/audio_processing/aec3/vector_math.h" #include -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/aec_dump_factory.h b/modules/audio_processing/aec_dump/aec_dump_factory.h index f868572c02..e3f00f67a2 100644 --- a/modules/audio_processing/aec_dump/aec_dump_factory.h +++ b/modules/audio_processing/aec_dump/aec_dump_factory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ +#define MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ #include #include -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/rtc_base/platform_file.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "rtc_base/platform_file.h" namespace rtc { class TaskQueue; @@ -44,4 +44,4 @@ class AecDumpFactory { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_FACTORY_H_ diff --git a/modules/audio_processing/aec_dump/aec_dump_impl.cc b/modules/audio_processing/aec_dump/aec_dump_impl.cc index 497a12e974..8fe7b74587 100644 --- a/modules/audio_processing/aec_dump/aec_dump_impl.cc +++ b/modules/audio_processing/aec_dump/aec_dump_impl.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h" +#include "modules/audio_processing/aec_dump/aec_dump_impl.h" -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/aec_dump_impl.h b/modules/audio_processing/aec_dump/aec_dump_impl.h index 2109cf5855..5be876b6b7 100644 --- a/modules/audio_processing/aec_dump/aec_dump_impl.h +++ b/modules/audio_processing/aec_dump/aec_dump_impl.h @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ #include #include #include -#include "webrtc/modules/audio_processing/aec_dump/capture_stream_info.h" -#include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/audio_processing/aec_dump/capture_stream_info.h" +#include "modules/audio_processing/aec_dump/write_to_file_task.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/file_wrapper.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" #endif RTC_POP_IGNORING_WUNDEF() @@ -77,4 +77,4 @@ class AecDumpImpl : public AecDump { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_DUMP_AEC_DUMP_IMPL_H_ diff --git a/modules/audio_processing/aec_dump/aec_dump_integration_test.cc b/modules/audio_processing/aec_dump/aec_dump_integration_test.cc index c77cf91923..720e4f5c34 100644 --- a/modules/audio_processing/aec_dump/aec_dump_integration_test.cc +++ b/modules/audio_processing/aec_dump/aec_dump_integration_test.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_processing/aec_dump/mock_aec_dump.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/audio_processing/aec_dump/mock_aec_dump.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/ptr_util.h" using testing::_; using testing::AtLeast; diff --git a/modules/audio_processing/aec_dump/aec_dump_unittest.cc b/modules/audio_processing/aec_dump/aec_dump_unittest.cc index d6f361789f..965ac03bd7 100644 --- a/modules/audio_processing/aec_dump/aec_dump_unittest.cc +++ b/modules/audio_processing/aec_dump/aec_dump_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/task_queue.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" TEST(AecDumper, APICallsDoNotCrash) { // Note order of initialization: Task queue has to be initialized diff --git a/modules/audio_processing/aec_dump/capture_stream_info.cc b/modules/audio_processing/aec_dump/capture_stream_info.cc index 5a49685494..e3284d8822 100644 --- a/modules/audio_processing/aec_dump/capture_stream_info.cc +++ b/modules/audio_processing/aec_dump/capture_stream_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec_dump/capture_stream_info.h" +#include "modules/audio_processing/aec_dump/capture_stream_info.h" namespace webrtc { CaptureStreamInfo::CaptureStreamInfo(std::unique_ptr task) diff --git a/modules/audio_processing/aec_dump/capture_stream_info.h b/modules/audio_processing/aec_dump/capture_stream_info.h index cd870206bd..9999c3fbd0 100644 --- a/modules/audio_processing/aec_dump/capture_stream_info.h +++ b/modules/audio_processing/aec_dump/capture_stream_info.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ +#define MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ #include #include #include -#include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_processing/aec_dump/write_to_file_task.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/logging.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" #endif RTC_POP_IGNORING_WUNDEF() @@ -63,4 +63,4 @@ class CaptureStreamInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_DUMP_CAPTURE_STREAM_INFO_H_ diff --git a/modules/audio_processing/aec_dump/mock_aec_dump.cc b/modules/audio_processing/aec_dump/mock_aec_dump.cc index 58e00c7212..aa89e45fe8 100644 --- a/modules/audio_processing/aec_dump/mock_aec_dump.cc +++ b/modules/audio_processing/aec_dump/mock_aec_dump.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec_dump/mock_aec_dump.h" +#include "modules/audio_processing/aec_dump/mock_aec_dump.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/mock_aec_dump.h b/modules/audio_processing/aec_dump/mock_aec_dump.h index 4661203b89..6df6f2849c 100644 --- a/modules/audio_processing/aec_dump/mock_aec_dump.h +++ b/modules/audio_processing/aec_dump/mock_aec_dump.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ +#define MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ #include -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "modules/include/module_common_types.h" +#include "test/gmock.h" namespace webrtc { @@ -47,4 +47,4 @@ class MockAecDump : public AecDump { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_DUMP_MOCK_AEC_DUMP_H_ diff --git a/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/modules/audio_processing/aec_dump/null_aec_dump_factory.cc index 7da3d5a53b..5623e24aa5 100644 --- a/modules/audio_processing/aec_dump/null_aec_dump_factory.cc +++ b/modules/audio_processing/aec_dump/null_aec_dump_factory.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/audio_processing/include/aec_dump.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/include/aec_dump.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/write_to_file_task.cc b/modules/audio_processing/aec_dump/write_to_file_task.cc index f94f57bf5f..5fdfd4ec82 100644 --- a/modules/audio_processing/aec_dump/write_to_file_task.cc +++ b/modules/audio_processing/aec_dump/write_to_file_task.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" +#include "modules/audio_processing/aec_dump/write_to_file_task.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/write_to_file_task.h b/modules/audio_processing/aec_dump/write_to_file_task.h index 5f20ed8243..7301473247 100644 --- a/modules/audio_processing/aec_dump/write_to_file_task.h +++ b/modules/audio_processing/aec_dump/write_to_file_task.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ +#ifndef MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ +#define MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/task_queue.h" +#include "system_wrappers/include/file_wrapper.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" #endif RTC_POP_IGNORING_WUNDEF() @@ -55,4 +55,4 @@ class WriteToFileTask : public rtc::QueuedTask { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ +#endif // MODULES_AUDIO_PROCESSING_AEC_DUMP_WRITE_TO_FILE_TASK_H_ diff --git a/modules/audio_processing/aecm/aecm_core.cc b/modules/audio_processing/aecm/aecm_core.cc index 580915483d..780870d545 100644 --- a/modules/audio_processing/aecm/aecm_core.cc +++ b/modules/audio_processing/aecm/aecm_core.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "modules/audio_processing/aecm/aecm_core.h" #include #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/common_audio/signal_processing/include/real_fft.h" +#include "common_audio/ring_buffer.h" +#include "common_audio/signal_processing/include/real_fft.h" } -#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "modules/audio_processing/aecm/echo_control_mobile.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" extern "C" { -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/cpu_features_wrapper.h" } -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" +#include "typedefs.h" #ifdef AEC_DEBUG FILE *dfile; diff --git a/modules/audio_processing/aecm/aecm_core.h b/modules/audio_processing/aecm/aecm_core.h index 33d80889aa..9c75db3e10 100644 --- a/modules/audio_processing/aecm/aecm_core.h +++ b/modules/audio_processing/aecm/aecm_core.h @@ -10,15 +10,15 @@ // Performs echo control (suppression) with fft routines in fixed-point. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ +#ifndef MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ +#define MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_ extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/ring_buffer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aecm/aecm_defines.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/aecm/aecm_defines.h" +#include "typedefs.h" #ifdef _MSC_VER // visual c++ #define ALIGN8_BEG __declspec(align(8)) diff --git a/modules/audio_processing/aecm/aecm_core_c.cc b/modules/audio_processing/aecm/aecm_core_c.cc index bf26277e38..897a85f3b6 100644 --- a/modules/audio_processing/aecm/aecm_core_c.cc +++ b/modules/audio_processing/aecm/aecm_core_c.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "modules/audio_processing/aecm/aecm_core.h" #include #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/common_audio/signal_processing/include/real_fft.h" +#include "common_audio/ring_buffer.h" +#include "common_audio/signal_processing/include/real_fft.h" } -#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "modules/audio_processing/aecm/echo_control_mobile.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" extern "C" { -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/cpu_features_wrapper.h" } -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sanitizer.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "rtc_base/sanitizer.h" +#include "typedefs.h" // Square root of Hanning window in Q14. static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { diff --git a/modules/audio_processing/aecm/aecm_core_mips.cc b/modules/audio_processing/aecm/aecm_core_mips.cc index fcd659fee2..f2bd8da651 100644 --- a/modules/audio_processing/aecm/aecm_core_mips.cc +++ b/modules/audio_processing/aecm/aecm_core_mips.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "modules/audio_processing/aecm/aecm_core.h" -#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aecm/echo_control_mobile.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "rtc_base/checks.h" static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { 0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172, diff --git a/modules/audio_processing/aecm/aecm_core_neon.cc b/modules/audio_processing/aecm/aecm_core_neon.cc index ccf1985d64..ca7211f738 100644 --- a/modules/audio_processing/aecm/aecm_core_neon.cc +++ b/modules/audio_processing/aecm/aecm_core_neon.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "modules/audio_processing/aecm/aecm_core.h" #include -#include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/signal_processing/include/real_fft.h" +#include "rtc_base/checks.h" // TODO(kma): Re-write the corresponding assembly file, the offset // generating script and makefile, to replace these C functions. diff --git a/modules/audio_processing/aecm/aecm_defines.h b/modules/audio_processing/aecm/aecm_defines.h index 6d63990b9c..ae2d2bc03a 100644 --- a/modules/audio_processing/aecm/aecm_defines.h +++ b/modules/audio_processing/aecm/aecm_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_ +#ifndef MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_ +#define MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_ #define AECM_DYNAMIC_Q /* Turn on/off dynamic Q-domain. */ diff --git a/modules/audio_processing/aecm/echo_control_mobile.cc b/modules/audio_processing/aecm/echo_control_mobile.cc index 027ed14cf7..880f0aa65a 100644 --- a/modules/audio_processing/aecm/echo_control_mobile.cc +++ b/modules/audio_processing/aecm/echo_control_mobile.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" +#include "modules/audio_processing/aecm/echo_control_mobile.h" #ifdef AEC_DEBUG #include @@ -16,10 +16,10 @@ #include extern "C" { -#include "webrtc/common_audio/ring_buffer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "common_audio/ring_buffer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" } -#include "webrtc/modules/audio_processing/aecm/aecm_core.h" +#include "modules/audio_processing/aecm/aecm_core.h" #define BUF_SIZE_FRAMES 50 // buffer size (frames) // Maximum length of resampled signal. Must be an integer multiple of frames diff --git a/modules/audio_processing/aecm/echo_control_mobile.h b/modules/audio_processing/aecm/echo_control_mobile.h index b45ff59907..e63140797e 100644 --- a/modules/audio_processing/aecm/echo_control_mobile.h +++ b/modules/audio_processing/aecm/echo_control_mobile.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ +#ifndef MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ +#define MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" enum { AecmFalse = 0, @@ -206,4 +206,4 @@ size_t WebRtcAecm_echo_path_size_bytes(); #ifdef __cplusplus } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ +#endif // MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ diff --git a/modules/audio_processing/agc/agc.cc b/modules/audio_processing/agc/agc.cc index 1370d38cc3..0c6478e803 100644 --- a/modules/audio_processing/agc/agc.cc +++ b/modules/audio_processing/agc/agc.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc/agc.h" +#include "modules/audio_processing/agc/agc.h" #include #include @@ -16,10 +16,10 @@ #include #include -#include "webrtc/modules/audio_processing/agc/loudness_histogram.h" -#include "webrtc/modules/audio_processing/agc/utility.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/agc/loudness_histogram.h" +#include "modules/audio_processing/agc/utility.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/agc/agc.h b/modules/audio_processing/agc/agc.h index e681e376de..fdba9ca3cd 100644 --- a/modules/audio_processing/agc/agc.h +++ b/modules/audio_processing/agc/agc.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_AGC_H_ +#define MODULES_AUDIO_PROCESSING_AGC_AGC_H_ #include -#include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/vad/voice_activity_detector.h" +#include "typedefs.h" namespace webrtc { @@ -53,4 +53,4 @@ class Agc { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_AGC_H_ diff --git a/modules/audio_processing/agc/agc_manager_direct.cc b/modules/audio_processing/agc/agc_manager_direct.cc index 0bf5ec8ffc..7d93d7d2ca 100644 --- a/modules/audio_processing/agc/agc_manager_direct.cc +++ b/modules/audio_processing/agc/agc_manager_direct.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" +#include "modules/audio_processing/agc/agc_manager_direct.h" #include @@ -16,13 +16,13 @@ #include #endif -#include "webrtc/modules/audio_processing/agc/gain_map_internal.h" -#include "webrtc/modules/audio_processing/gain_control_impl.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_processing/agc/gain_map_internal.h" +#include "modules/audio_processing/gain_control_impl.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/agc/agc_manager_direct.h b/modules/audio_processing/agc/agc_manager_direct.h index 7a2e3ef77e..03d2607f85 100644 --- a/modules/audio_processing/agc/agc_manager_direct.h +++ b/modules/audio_processing/agc/agc_manager_direct.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ +#define MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ #include -#include "webrtc/modules/audio_processing/agc/agc.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/agc/agc.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -110,4 +110,4 @@ class AgcManagerDirect final { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_ diff --git a/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/modules/audio_processing/agc/agc_manager_direct_unittest.cc index 141e99cd62..1026656bb5 100644 --- a/modules/audio_processing/agc/agc_manager_direct_unittest.cc +++ b/modules/audio_processing/agc/agc_manager_direct_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" +#include "modules/audio_processing/agc/agc_manager_direct.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_processing/agc/mock_agc.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "common_types.h" +#include "modules/audio_processing/agc/mock_agc.h" +#include "modules/audio_processing/include/mock_audio_processing.h" +#include "system_wrappers/include/trace.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/trace_to_stderr.h" using ::testing::_; using ::testing::DoAll; diff --git a/modules/audio_processing/agc/gain_map_internal.h b/modules/audio_processing/agc/gain_map_internal.h index 53c71c1148..f09c748b59 100644 --- a/modules/audio_processing/agc/gain_map_internal.h +++ b/modules/audio_processing/agc/gain_map_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ +#define MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ static const int kGainMapSize = 256; // Uses parameters: si = 2, sf = 0.25, D = 8/256 @@ -272,4 +272,4 @@ static const int kGainMap[kGainMapSize] = { 64 }; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_ diff --git a/modules/audio_processing/agc/legacy/analog_agc.c b/modules/audio_processing/agc/legacy/analog_agc.c index 92b3e00ee0..662e88b6e7 100644 --- a/modules/audio_processing/agc/legacy/analog_agc.c +++ b/modules/audio_processing/agc/legacy/analog_agc.c @@ -17,14 +17,14 @@ * */ -#include "webrtc/modules/audio_processing/agc/legacy/analog_agc.h" +#include "modules/audio_processing/agc/legacy/analog_agc.h" #include #ifdef WEBRTC_AGC_DEBUG_DUMP #include #endif -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" /* The slope of in Q13*/ static const int16_t kSlope1[8] = {21793, 12517, 7189, 4129, diff --git a/modules/audio_processing/agc/legacy/analog_agc.h b/modules/audio_processing/agc/legacy/analog_agc.h index 235fd14309..7c395f45fd 100644 --- a/modules/audio_processing/agc/legacy/analog_agc.h +++ b/modules/audio_processing/agc/legacy/analog_agc.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ +#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ //#define MIC_LEVEL_FEEDBACK #ifdef WEBRTC_AGC_DEBUG_DUMP #include #endif -#include "webrtc/modules/audio_processing/agc/legacy/digital_agc.h" -#include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/agc/legacy/digital_agc.h" +#include "modules/audio_processing/agc/legacy/gain_control.h" +#include "typedefs.h" /* Analog Automatic Gain Control variables: * Constant declarations (inner limits inside which no changes are done) @@ -129,4 +129,4 @@ typedef struct { int16_t lowLevelSignal; } LegacyAgc; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_ diff --git a/modules/audio_processing/agc/legacy/digital_agc.c b/modules/audio_processing/agc/legacy/digital_agc.c index 7f59785bda..8353f85f67 100644 --- a/modules/audio_processing/agc/legacy/digital_agc.c +++ b/modules/audio_processing/agc/legacy/digital_agc.c @@ -12,15 +12,15 @@ * */ -#include "webrtc/modules/audio_processing/agc/legacy/digital_agc.h" +#include "modules/audio_processing/agc/legacy/digital_agc.h" #include #ifdef WEBRTC_AGC_DEBUG_DUMP #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" +#include "rtc_base/checks.h" +#include "modules/audio_processing/agc/legacy/gain_control.h" // To generate the gaintable, copy&paste the following lines to a Matlab window: // MaxGain = 6; MinGain = 0; CompRatio = 3; Knee = 1; diff --git a/modules/audio_processing/agc/legacy/digital_agc.h b/modules/audio_processing/agc/legacy/digital_agc.h index 4664b59dc8..2f1a2aca98 100644 --- a/modules/audio_processing/agc/legacy/digital_agc.h +++ b/modules/audio_processing/agc/legacy/digital_agc.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ +#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ #ifdef WEBRTC_AGC_DEBUG_DUMP #include #endif -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "typedefs.h" // the 32 most significant bits of A(19) * B(26) >> 13 #define AGC_MUL32(A, B) (((B) >> 13) * (A) + (((0x00001FFF & (B)) * (A)) >> 13)) @@ -76,4 +76,4 @@ int32_t WebRtcAgc_CalculateGainTable(int32_t* gainTable, // Q16 uint8_t limiterEnable, int16_t analogTarget); -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_ diff --git a/modules/audio_processing/agc/legacy/gain_control.h b/modules/audio_processing/agc/legacy/gain_control.h index c3157500cf..35d8fab9d4 100644 --- a/modules/audio_processing/agc/legacy/gain_control.h +++ b/modules/audio_processing/agc/legacy/gain_control.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ +#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // Errors #define AGC_UNSPECIFIED_ERROR 18000 @@ -244,4 +244,4 @@ int WebRtcAgc_Init(void* agcInst, } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ diff --git a/modules/audio_processing/agc/loudness_histogram.cc b/modules/audio_processing/agc/loudness_histogram.cc index cc21f2ae3d..63d5f7cad0 100644 --- a/modules/audio_processing/agc/loudness_histogram.cc +++ b/modules/audio_processing/agc/loudness_histogram.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc/loudness_histogram.h" +#include "modules/audio_processing/agc/loudness_histogram.h" #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/agc/loudness_histogram.h b/modules/audio_processing/agc/loudness_histogram.h index b079299a09..cc98f0f505 100644 --- a/modules/audio_processing/agc/loudness_histogram.h +++ b/modules/audio_processing/agc/loudness_histogram.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ +#define MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ #include #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -89,4 +89,4 @@ class LoudnessHistogram { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ diff --git a/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc index 089c05a023..8c617107ff 100644 --- a/modules/audio_processing/agc/loudness_histogram_unittest.cc +++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc @@ -10,16 +10,16 @@ // Use CreateHistUnittestFile.m to generate the input file. -#include "webrtc/modules/audio_processing/agc/loudness_histogram.h" +#include "modules/audio_processing/agc/loudness_histogram.h" #include #include #include #include -#include "webrtc/modules/audio_processing/agc/utility.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_processing/agc/utility.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/agc/mock_agc.h b/modules/audio_processing/agc/mock_agc.h index 3b9c22fb75..36901af50c 100644 --- a/modules/audio_processing/agc/mock_agc.h +++ b/modules/audio_processing/agc/mock_agc.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ +#define MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ -#include "webrtc/modules/audio_processing/agc/agc.h" +#include "modules/audio_processing/agc/agc.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gmock.h" +#include "modules/include/module_common_types.h" +#include "test/gmock.h" namespace webrtc { @@ -33,4 +33,4 @@ class MockAgc : public Agc { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_ diff --git a/modules/audio_processing/agc/utility.cc b/modules/audio_processing/agc/utility.cc index 48458adfb5..554a8377aa 100644 --- a/modules/audio_processing/agc/utility.cc +++ b/modules/audio_processing/agc/utility.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc/utility.h" +#include "modules/audio_processing/agc/utility.h" #include diff --git a/modules/audio_processing/agc/utility.h b/modules/audio_processing/agc/utility.h index df85c2e129..8ba87b6d55 100644 --- a/modules/audio_processing/agc/utility.h +++ b/modules/audio_processing/agc/utility.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ +#define MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ // TODO(turajs): Add description of function. double Loudness2Db(double loudness); @@ -20,4 +20,4 @@ double Db2Loudness(double db); double Dbfs2Loudness(double dbfs); -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_ diff --git a/modules/audio_processing/agc2/digital_gain_applier.cc b/modules/audio_processing/agc2/digital_gain_applier.cc index d8b8c98197..ec706eca98 100644 --- a/modules/audio_processing/agc2/digital_gain_applier.cc +++ b/modules/audio_processing/agc2/digital_gain_applier.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc2/digital_gain_applier.h" +#include "modules/audio_processing/agc2/digital_gain_applier.h" #include diff --git a/modules/audio_processing/agc2/digital_gain_applier.h b/modules/audio_processing/agc2/digital_gain_applier.h index d74ba33e4a..6e9be8eca6 100644 --- a/modules/audio_processing/agc2/digital_gain_applier.h +++ b/modules/audio_processing/agc2/digital_gain_applier.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ +#define MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" namespace webrtc { @@ -29,4 +29,4 @@ class DigitalGainApplier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ diff --git a/modules/audio_processing/agc2/gain_controller2.cc b/modules/audio_processing/agc2/gain_controller2.cc index 20680f64a8..6c1ce45e70 100644 --- a/modules/audio_processing/agc2/gain_controller2.cc +++ b/modules/audio_processing/agc2/gain_controller2.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" +#include "modules/audio_processing/agc2/gain_controller2.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/gain_controller2.h b/modules/audio_processing/agc2/gain_controller2.h index 1a8bb7f39c..9ab8656a3a 100644 --- a/modules/audio_processing/agc2/gain_controller2.h +++ b/modules/audio_processing/agc2/gain_controller2.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ +#define MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ #include #include -#include "webrtc/modules/audio_processing/agc2/digital_gain_applier.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/agc2/digital_gain_applier.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -53,4 +53,4 @@ class GainController2 { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ diff --git a/modules/audio_processing/agc2/gain_controller2_unittest.cc b/modules/audio_processing/agc2/gain_controller2_unittest.cc index 7668d23298..7c9acc6d3a 100644 --- a/modules/audio_processing/agc2/gain_controller2_unittest.cc +++ b/modules/audio_processing/agc2/gain_controller2_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/agc2/digital_gain_applier.h" -#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/agc2/digital_gain_applier.h" +#include "modules/audio_processing/agc2/gain_controller2.h" +#include "modules/audio_processing/audio_buffer.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/audio_buffer.cc b/modules/audio_processing/audio_buffer.cc index 6c8ddd6255..16f11742e3 100644 --- a/modules/audio_processing/audio_buffer.cc +++ b/modules/audio_processing/audio_buffer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/audio_buffer.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/common.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/common.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/audio_buffer.h b/modules/audio_processing/audio_buffer.h index da75dbf1b8..51aba6ad4e 100644 --- a/modules/audio_processing/audio_buffer.h +++ b/modules/audio_processing/audio_buffer.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ #include #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/splitting_filter.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "common_audio/channel_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/splitting_filter.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -163,4 +163,4 @@ class AudioBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ diff --git a/modules/audio_processing/audio_buffer_unittest.cc b/modules/audio_processing/audio_buffer_unittest.cc index c89770cd4d..4cbb98eb50 100644 --- a/modules/audio_processing/audio_buffer_unittest.cc +++ b/modules/audio_processing/audio_buffer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/audio_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 9b80318e90..feea33d179 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -8,44 +8,44 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_processing_impl.h" +#include "modules/audio_processing/audio_processing_impl.h" #include #include #include -#include "webrtc/common_audio/audio_converter.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/modules/audio_processing/aec3/echo_canceller3.h" -#include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" -#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" -#include "webrtc/modules/audio_processing/common.h" -#include "webrtc/modules/audio_processing/echo_cancellation_impl.h" -#include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" -#include "webrtc/modules/audio_processing/gain_control_for_experimental_agc.h" -#include "webrtc/modules/audio_processing/gain_control_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/trace_event.h" +#include "common_audio/audio_converter.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec3/echo_canceller3.h" +#include "modules/audio_processing/agc/agc_manager_direct.h" +#include "modules/audio_processing/agc2/gain_controller2.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/beamformer/nonlinear_beamformer.h" +#include "modules/audio_processing/common.h" +#include "modules/audio_processing/echo_cancellation_impl.h" +#include "modules/audio_processing/echo_control_mobile_impl.h" +#include "modules/audio_processing/gain_control_for_experimental_agc.h" +#include "modules/audio_processing/gain_control_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/trace_event.h" #if WEBRTC_INTELLIGIBILITY_ENHANCER -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" +#include "modules/audio_processing/intelligibility/intelligibility_enhancer.h" #endif -#include "webrtc/modules/audio_processing/level_controller/level_controller.h" -#include "webrtc/modules/audio_processing/level_estimator_impl.h" -#include "webrtc/modules/audio_processing/low_cut_filter.h" -#include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/modules/audio_processing/residual_echo_detector.h" -#include "webrtc/modules/audio_processing/transient/transient_suppressor.h" -#include "webrtc/modules/audio_processing/voice_detection_impl.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_processing/level_controller/level_controller.h" +#include "modules/audio_processing/level_estimator_impl.h" +#include "modules/audio_processing/low_cut_filter.h" +#include "modules/audio_processing/noise_suppression_impl.h" +#include "modules/audio_processing/residual_echo_detector.h" +#include "modules/audio_processing/transient/transient_suppressor.h" +#include "modules/audio_processing/voice_detection_impl.h" +#include "modules/include/module_common_types.h" +#include "system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/metrics.h" // Check to verify that the define for the intelligibility enhancer is properly // set. diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h index 56c1afc8d6..4ad9f7fbed 100644 --- a/modules/audio_processing/audio_processing_impl.h +++ b/modules/audio_processing/audio_processing_impl.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ #include #include #include -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/render_queue_item_verifier.h" -#include "webrtc/modules/audio_processing/rms_level.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_base/gtest_prod_util.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/rtc_base/swap_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/render_queue_item_verifier.h" +#include "modules/audio_processing/rms_level.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/function_view.h" +#include "rtc_base/gtest_prod_util.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" +#include "rtc_base/swap_queue.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/file_wrapper.h" namespace webrtc { @@ -415,4 +415,4 @@ class AudioProcessingImpl : public AudioProcessing { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ diff --git a/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc index 76c74fc45e..6c3bad57e6 100644 --- a/modules/audio_processing/audio_processing_impl_locking_unittest.cc +++ b/modules/audio_processing/audio_processing_impl_locking_unittest.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_processing_impl.h" +#include "modules/audio_processing/audio_processing_impl.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/test/test_utils.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc index bb895b589b..107d905642 100644 --- a/modules/audio_processing/audio_processing_impl_unittest.cc +++ b/modules/audio_processing/audio_processing_impl_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_processing_impl.h" +#include "modules/audio_processing/audio_processing_impl.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/test/test_utils.h" +#include "modules/include/module_common_types.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::Invoke; diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc index 2f641de3fc..5418e56713 100644 --- a/modules/audio_processing/audio_processing_performance_unittest.cc +++ b/modules/audio_processing/audio_processing_performance_unittest.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/audio_processing_impl.h" +#include "modules/audio_processing/audio_processing_impl.h" #include @@ -15,17 +15,17 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "api/array_view.h" +#include "modules/audio_processing/test/test_utils.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/random.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" // Check to verify that the define for the intelligibility enhancer is properly // set. diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index de070f3ef9..b6e56c5fad 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -15,37 +15,37 @@ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/audio_processing/audio_processing_impl.h" -#include "webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h" -#include "webrtc/modules/audio_processing/common.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" -#include "webrtc/modules/audio_processing/test/protobuf_utils.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gtest_prod_util.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "common_audio/resampler/push_sinc_resampler.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/audio_processing_impl.h" +#include "modules/audio_processing/beamformer/mock_nonlinear_beamformer.h" +#include "modules/audio_processing/common.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/level_controller_constants.h" +#include "modules/audio_processing/test/protobuf_utils.h" +#include "modules/audio_processing/test/test_utils.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/gtest_prod_util.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h" #else -#include "webrtc/modules/audio_processing/test/unittest.pb.h" +#include "modules/audio_processing/test/unittest.pb.h" #endif RTC_POP_IGNORING_WUNDEF() diff --git a/modules/audio_processing/beamformer/array_util.cc b/modules/audio_processing/beamformer/array_util.cc index e42a98e632..f5862bb754 100644 --- a/modules/audio_processing/beamformer/array_util.cc +++ b/modules/audio_processing/beamformer/array_util.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/beamformer/array_util.h" +#include "modules/audio_processing/beamformer/array_util.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/beamformer/array_util.h b/modules/audio_processing/beamformer/array_util.h index aa18e71931..f234929693 100644 --- a/modules/audio_processing/beamformer/array_util.h +++ b/modules/audio_processing/beamformer/array_util.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -114,4 +114,4 @@ T RadiansToDegrees(T angle_radians) { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_ARRAY_UTIL_H_ diff --git a/modules/audio_processing/beamformer/array_util_unittest.cc b/modules/audio_processing/beamformer/array_util_unittest.cc index 0ec9e7b738..a5c075ab05 100644 --- a/modules/audio_processing/beamformer/array_util_unittest.cc +++ b/modules/audio_processing/beamformer/array_util_unittest.cc @@ -11,12 +11,12 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/beamformer/array_util.h" +#include "modules/audio_processing/beamformer/array_util.h" #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/beamformer/complex_matrix.h b/modules/audio_processing/beamformer/complex_matrix.h index 1080f18bb4..9960e1dd87 100644 --- a/modules/audio_processing/beamformer/complex_matrix.h +++ b/modules/audio_processing/beamformer/complex_matrix.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ #include -#include "webrtc/modules/audio_processing/beamformer/matrix.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/beamformer/matrix.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -93,4 +93,4 @@ class ComplexMatrix : public Matrix > { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_COMPLEX_MATRIX_H_ diff --git a/modules/audio_processing/beamformer/complex_matrix_unittest.cc b/modules/audio_processing/beamformer/complex_matrix_unittest.cc index 100d2e6eae..e11dfd2b5c 100644 --- a/modules/audio_processing/beamformer/complex_matrix_unittest.cc +++ b/modules/audio_processing/beamformer/complex_matrix_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" -#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/beamformer/complex_matrix.h" +#include "modules/audio_processing/beamformer/matrix_test_helpers.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/beamformer/covariance_matrix_generator.cc b/modules/audio_processing/beamformer/covariance_matrix_generator.cc index ae69073a89..df36d5974f 100644 --- a/modules/audio_processing/beamformer/covariance_matrix_generator.cc +++ b/modules/audio_processing/beamformer/covariance_matrix_generator.cc @@ -10,7 +10,7 @@ #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h" +#include "modules/audio_processing/beamformer/covariance_matrix_generator.h" #include diff --git a/modules/audio_processing/beamformer/covariance_matrix_generator.h b/modules/audio_processing/beamformer/covariance_matrix_generator.h index 5375518e8a..6a5841f631 100644 --- a/modules/audio_processing/beamformer/covariance_matrix_generator.h +++ b/modules/audio_processing/beamformer/covariance_matrix_generator.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_COVARIANCE_MATRIX_GENERATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_COVARIANCE_MATRIX_GENERATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_COVARIANCE_MATRIX_GENERATOR_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_COVARIANCE_MATRIX_GENERATOR_H_ -#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" -#include "webrtc/modules/audio_processing/beamformer/array_util.h" +#include "modules/audio_processing/beamformer/complex_matrix.h" +#include "modules/audio_processing/beamformer/array_util.h" namespace webrtc { @@ -51,4 +51,4 @@ class CovarianceMatrixGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_BF_HELPERS_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_BF_HELPERS_H_ diff --git a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc index 1dd65c1dd5..a6518e5d95 100644 --- a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc +++ b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc @@ -10,12 +10,12 @@ #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h" +#include "modules/audio_processing/beamformer/covariance_matrix_generator.h" #include -#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/beamformer/matrix_test_helpers.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/beamformer/matrix.h b/modules/audio_processing/beamformer/matrix.h index d0e41ca9b0..bf94c25df0 100644 --- a/modules/audio_processing/beamformer/matrix.h +++ b/modules/audio_processing/beamformer/matrix.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace { @@ -366,4 +366,4 @@ class Matrix { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_H_ diff --git a/modules/audio_processing/beamformer/matrix_test_helpers.h b/modules/audio_processing/beamformer/matrix_test_helpers.h index 57bd82ed23..62b47082e3 100644 --- a/modules/audio_processing/beamformer/matrix_test_helpers.h +++ b/modules/audio_processing/beamformer/matrix_test_helpers.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ -#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" -#include "webrtc/modules/audio_processing/beamformer/matrix.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/beamformer/complex_matrix.h" +#include "modules/audio_processing/beamformer/matrix.h" +#include "test/gtest.h" namespace { const float kTolerance = 0.001f; @@ -99,4 +99,4 @@ class MatrixTestHelpers { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ diff --git a/modules/audio_processing/beamformer/matrix_unittest.cc b/modules/audio_processing/beamformer/matrix_unittest.cc index 939404c7cd..4badfd07ed 100644 --- a/modules/audio_processing/beamformer/matrix_unittest.cc +++ b/modules/audio_processing/beamformer/matrix_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_processing/beamformer/matrix.h" -#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/beamformer/matrix.h" +#include "modules/audio_processing/beamformer/matrix_test_helpers.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h index 7493dcbbb2..c4c7358b63 100644 --- a/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h +++ b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ #include -#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/beamformer/nonlinear_beamformer.h" +#include "test/gmock.h" namespace webrtc { @@ -36,4 +36,4 @@ class MockNonlinearBeamformer : public NonlinearBeamformer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_MOCK_BEAMFORMER_H_ diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer.cc b/modules/audio_processing/beamformer/nonlinear_beamformer.cc index b7d23f59f2..12f6d2f465 100644 --- a/modules/audio_processing/beamformer/nonlinear_beamformer.cc +++ b/modules/audio_processing/beamformer/nonlinear_beamformer.cc @@ -10,16 +10,16 @@ #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" +#include "modules/audio_processing/beamformer/nonlinear_beamformer.h" #include #include #include #include -#include "webrtc/common_audio/window_generator.h" -#include "webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h" -#include "webrtc/rtc_base/arraysize.h" +#include "common_audio/window_generator.h" +#include "modules/audio_processing/beamformer/covariance_matrix_generator.h" +#include "rtc_base/arraysize.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer.h b/modules/audio_processing/beamformer/nonlinear_beamformer.h index 9b45c8b000..76556e7a45 100644 --- a/modules/audio_processing/beamformer/nonlinear_beamformer.h +++ b/modules/audio_processing/beamformer/nonlinear_beamformer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ +#ifndef MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ +#define MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES @@ -19,10 +19,10 @@ #include #include -#include "webrtc/common_audio/lapped_transform.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/beamformer/array_util.h" -#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" +#include "common_audio/lapped_transform.h" +#include "common_audio/channel_buffer.h" +#include "modules/audio_processing/beamformer/array_util.h" +#include "modules/audio_processing/beamformer/complex_matrix.h" namespace webrtc { @@ -225,4 +225,4 @@ class NonlinearBeamformer : public LappedTransform::Callback { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ +#endif // MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc index 11b172ab28..296cd6d4ae 100644 --- a/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc +++ b/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/format_macros.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/beamformer/nonlinear_beamformer.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/format_macros.h" DEFINE_string(i, "", "The name of the input file to read from."); DEFINE_string(o, "out.wav", "Name of the output file to write to."); diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc index bb1f0ef17b..78b2f0a68e 100644 --- a/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc +++ b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc @@ -11,15 +11,15 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" +#include "modules/audio_processing/beamformer/nonlinear_beamformer.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/common.h b/modules/audio_processing/common.h index 30cee9403a..d8532c5749 100644 --- a/modules/audio_processing/common.h +++ b/modules/audio_processing/common.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_COMMON_H_ -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -31,4 +31,4 @@ static inline size_t ChannelsFromLayout(AudioProcessing::ChannelLayout layout) { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_COMMON_H_ diff --git a/modules/audio_processing/config_unittest.cc b/modules/audio_processing/config_unittest.cc index 33f4ed152c..8776ee3391 100644 --- a/modules/audio_processing/config_unittest.cc +++ b/modules/audio_processing/config_unittest.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/config.h" +#include "modules/audio_processing/include/config.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc index c4cd768b1d..857cb1c825 100644 --- a/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc +++ b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/echo_cancellation_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/echo_cancellation_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_cancellation_impl.cc b/modules/audio_processing/echo_cancellation_impl.cc index b1ea486df1..878d84f42a 100644 --- a/modules/audio_processing/echo_cancellation_impl.cc +++ b/modules/audio_processing/echo_cancellation_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_cancellation_impl.h" +#include "modules/audio_processing/echo_cancellation_impl.h" #include -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/modules/audio_processing/aec/echo_cancellation.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/aec/echo_cancellation.h" +#include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/echo_cancellation_impl.h b/modules/audio_processing/echo_cancellation_impl.h index 301bd53a9f..d410a11578 100644 --- a/modules/audio_processing/echo_cancellation_impl.h +++ b/modules/audio_processing/echo_cancellation_impl.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -113,4 +113,4 @@ class EchoCancellationImpl : public EchoCancellation { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ diff --git a/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc index 0aa1cf3a4c..2b9e5c5626 100644 --- a/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/aec/aec_core.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc index 4104a7f259..ad3c731e73 100644 --- a/modules/audio_processing/echo_control_mobile_impl.cc +++ b/modules/audio_processing/echo_control_mobile_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" +#include "modules/audio_processing/echo_control_mobile_impl.h" #include -#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/audio_processing/aecm/echo_control_mobile.h" +#include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_impl.h b/modules/audio_processing/echo_control_mobile_impl.h index b3e1577793..a03ab4d486 100644 --- a/modules/audio_processing/echo_control_mobile_impl.h +++ b/modules/audio_processing/echo_control_mobile_impl.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/render_queue_item_verifier.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/swap_queue.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/render_queue_item_verifier.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/swap_queue.h" namespace webrtc { @@ -81,4 +81,4 @@ class EchoControlMobileImpl : public EchoControlMobile { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ diff --git a/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc index 9941ecae34..fb58a5b870 100644 --- a/modules/audio_processing/echo_control_mobile_unittest.cc +++ b/modules/audio_processing/echo_control_mobile_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/echo_control_mobile_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_detector/circular_buffer.cc b/modules/audio_processing/echo_detector/circular_buffer.cc index a24fc3e67a..dc4fd93605 100644 --- a/modules/audio_processing/echo_detector/circular_buffer.cc +++ b/modules/audio_processing/echo_detector/circular_buffer.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/circular_buffer.h" +#include "modules/audio_processing/echo_detector/circular_buffer.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/echo_detector/circular_buffer.h b/modules/audio_processing/echo_detector/circular_buffer.h index cf58e33840..53d4afb6d5 100644 --- a/modules/audio_processing/echo_detector/circular_buffer.h +++ b/modules/audio_processing/echo_detector/circular_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -39,4 +39,4 @@ struct CircularBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ diff --git a/modules/audio_processing/echo_detector/circular_buffer_unittest.cc b/modules/audio_processing/echo_detector/circular_buffer_unittest.cc index 88f55a8ee7..41f276b96c 100644 --- a/modules/audio_processing/echo_detector/circular_buffer_unittest.cc +++ b/modules/audio_processing/echo_detector/circular_buffer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/circular_buffer.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/echo_detector/circular_buffer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/echo_detector/mean_variance_estimator.cc b/modules/audio_processing/echo_detector/mean_variance_estimator.cc index e6e29e5ddb..a85740387b 100644 --- a/modules/audio_processing/echo_detector/mean_variance_estimator.cc +++ b/modules/audio_processing/echo_detector/mean_variance_estimator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h" +#include "modules/audio_processing/echo_detector/mean_variance_estimator.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_detector/mean_variance_estimator.h b/modules/audio_processing/echo_detector/mean_variance_estimator.h index 3c0700fad0..7f793df1e8 100644 --- a/modules/audio_processing/echo_detector/mean_variance_estimator.h +++ b/modules/audio_processing/echo_detector/mean_variance_estimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ namespace webrtc { @@ -30,4 +30,4 @@ class MeanVarianceEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_ diff --git a/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc b/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc index ba45745606..f8efc3a799 100644 --- a/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc +++ b/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc @@ -9,8 +9,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/echo_detector/mean_variance_estimator.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/echo_detector/moving_max.cc b/modules/audio_processing/echo_detector/moving_max.cc index 9c37ab63ff..3054e98bd3 100644 --- a/modules/audio_processing/echo_detector/moving_max.cc +++ b/modules/audio_processing/echo_detector/moving_max.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/moving_max.h" +#include "modules/audio_processing/echo_detector/moving_max.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_detector/moving_max.h b/modules/audio_processing/echo_detector/moving_max.h index 556facfad4..f7d8ee8137 100644 --- a/modules/audio_processing/echo_detector/moving_max.h +++ b/modules/audio_processing/echo_detector/moving_max.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ #include @@ -33,4 +33,4 @@ class MovingMax { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_ diff --git a/modules/audio_processing/echo_detector/moving_max_unittest.cc b/modules/audio_processing/echo_detector/moving_max_unittest.cc index 720010d002..b67b86ffc3 100644 --- a/modules/audio_processing/echo_detector/moving_max_unittest.cc +++ b/modules/audio_processing/echo_detector/moving_max_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/moving_max.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/echo_detector/moving_max.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc b/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc index 24e1810197..8ec9fe9f0b 100644 --- a/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc +++ b/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h" +#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/echo_detector/normalized_covariance_estimator.h b/modules/audio_processing/echo_detector/normalized_covariance_estimator.h index da5ff34f2f..e3c36d88ba 100644 --- a/modules/audio_processing/echo_detector/normalized_covariance_estimator.h +++ b/modules/audio_processing/echo_detector/normalized_covariance_estimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ namespace webrtc { @@ -40,4 +40,4 @@ class NormalizedCovarianceEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_ diff --git a/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc b/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc index 04b3a92fb5..7e0512ee58 100644 --- a/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc +++ b/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc @@ -9,8 +9,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_for_experimental_agc.cc b/modules/audio_processing/gain_control_for_experimental_agc.cc index 308ee1224e..d5d978c2e0 100644 --- a/modules/audio_processing/gain_control_for_experimental_agc.cc +++ b/modules/audio_processing/gain_control_for_experimental_agc.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/gain_control_for_experimental_agc.h" +#include "modules/audio_processing/gain_control_for_experimental_agc.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_for_experimental_agc.h b/modules/audio_processing/gain_control_for_experimental_agc.h index 977685bb1b..0894a0e30e 100644 --- a/modules/audio_processing/gain_control_for_experimental_agc.h +++ b/modules/audio_processing/gain_control_for_experimental_agc.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ +#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ +#define MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ -#include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/audio_processing/agc/agc_manager_direct.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -74,4 +74,4 @@ class GainControlForExperimentalAgc : public GainControl, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ +#endif // MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ diff --git a/modules/audio_processing/gain_control_impl.cc b/modules/audio_processing/gain_control_impl.cc index f882d10cd6..eeab1e038d 100644 --- a/modules/audio_processing/gain_control_impl.cc +++ b/modules/audio_processing/gain_control_impl.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/gain_control_impl.h" +#include "modules/audio_processing/gain_control_impl.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/agc/legacy/gain_control.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_impl.h b/modules/audio_processing/gain_control_impl.h index 8fca699694..26745065cf 100644 --- a/modules/audio_processing/gain_control_impl.h +++ b/modules/audio_processing/gain_control_impl.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/render_queue_item_verifier.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/swap_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/render_queue_item_verifier.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/swap_queue.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -94,4 +94,4 @@ class GainControlImpl : public GainControl { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ diff --git a/modules/audio_processing/gain_control_unittest.cc b/modules/audio_processing/gain_control_unittest.cc index c0c5269be4..62908c7aec 100644 --- a/modules/audio_processing/gain_control_unittest.cc +++ b/modules/audio_processing/gain_control_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/gain_control_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/gain_control_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/include/aec_dump.cc b/modules/audio_processing/include/aec_dump.cc index f048badf73..365d01510e 100644 --- a/modules/audio_processing/include/aec_dump.cc +++ b/modules/audio_processing/include/aec_dump.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/aec_dump.h" +#include "modules/audio_processing/include/aec_dump.h" namespace webrtc { InternalAPMConfig::InternalAPMConfig() = default; diff --git a/modules/audio_processing/include/aec_dump.h b/modules/audio_processing/include/aec_dump.h index cec1aa354b..0c8d2271cc 100644 --- a/modules/audio_processing/include/aec_dump.h +++ b/modules/audio_processing/include/aec_dump.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ +#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ +#define MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ #include #include #include -#include "webrtc/api/array_view.h" +#include "api/array_view.h" namespace webrtc { @@ -138,4 +138,4 @@ class AecDump { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ +#endif // MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ diff --git a/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc index 2c4b61f914..8410a3dfbb 100644 --- a/modules/audio_processing/include/audio_processing.cc +++ b/modules/audio_processing/include/audio_processing.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 03bd8c85b0..d530376766 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ +#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ +#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES @@ -20,12 +20,12 @@ #include #include -#include "webrtc/modules/audio_processing/beamformer/array_util.h" -#include "webrtc/modules/audio_processing/include/config.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/beamformer/array_util.h" +#include "modules/audio_processing/include/config.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/refcount.h" +#include "typedefs.h" namespace webrtc { @@ -1138,4 +1138,4 @@ class VoiceDetection { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ +#endif // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ diff --git a/modules/audio_processing/include/config.cc b/modules/audio_processing/include/config.cc index bbbc4520a8..14240db305 100644 --- a/modules/audio_processing/include/config.cc +++ b/modules/audio_processing/include/config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/config.h" +#include "modules/audio_processing/include/config.h" namespace webrtc { diff --git a/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h index 35836e8636..7c34de8ccc 100644 --- a/modules/audio_processing/include/config.h +++ b/modules/audio_processing/include/config.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ +#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ +#define MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -130,4 +130,4 @@ void Config::Set(T* value) { } } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ +#endif // MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_ diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h index 2ed7ca22cb..7a1d447d9c 100644 --- a/modules/audio_processing/include/mock_audio_processing.h +++ b/modules/audio_processing/include/mock_audio_processing.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ +#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ +#define MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ #include -#include "webrtc/modules/audio_processing/include/aec_dump.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/include/aec_dump.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gmock.h" namespace webrtc { @@ -218,4 +218,4 @@ class MockAudioProcessing : public AudioProcessing { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ +#endif // MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_ diff --git a/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer.cc index 817d9ddff4..65cad19d9d 100644 --- a/modules/audio_processing/intelligibility/intelligibility_enhancer.cc +++ b/modules/audio_processing/intelligibility/intelligibility_enhancer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" +#include "modules/audio_processing/intelligibility/intelligibility_enhancer.h" #include #include @@ -16,11 +16,11 @@ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/window_generator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/window_generator.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/intelligibility/intelligibility_enhancer.h b/modules/audio_processing/intelligibility/intelligibility_enhancer.h index 8faf919920..3e0e269c58 100644 --- a/modules/audio_processing/intelligibility/intelligibility_enhancer.h +++ b/modules/audio_processing/intelligibility/intelligibility_enhancer.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ +#ifndef MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ +#define MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ #include #include #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/lapped_transform.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" -#include "webrtc/modules/audio_processing/render_queue_item_verifier.h" -#include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" -#include "webrtc/rtc_base/swap_queue.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/lapped_transform.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/intelligibility/intelligibility_utils.h" +#include "modules/audio_processing/render_queue_item_verifier.h" +#include "modules/audio_processing/vad/voice_activity_detector.h" +#include "rtc_base/swap_queue.h" namespace webrtc { @@ -134,4 +134,4 @@ class IntelligibilityEnhancer : public LappedTransform::Callback { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ +#endif // MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_ENHANCER_H_ diff --git a/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc index 756b3038e4..98a8dae469 100644 --- a/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc +++ b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc @@ -15,15 +15,15 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" -#include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/intelligibility/intelligibility_enhancer.h" +#include "modules/audio_processing/noise_suppression_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/intelligibility/intelligibility_utils.cc b/modules/audio_processing/intelligibility/intelligibility_utils.cc index 3e6c93e192..159eada9b7 100644 --- a/modules/audio_processing/intelligibility/intelligibility_utils.cc +++ b/modules/audio_processing/intelligibility/intelligibility_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" +#include "modules/audio_processing/intelligibility/intelligibility_utils.h" #include #include @@ -16,7 +16,7 @@ #include #include -#include "webrtc/rtc_base/safe_minmax.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/intelligibility/intelligibility_utils.h b/modules/audio_processing/intelligibility/intelligibility_utils.h index 2566616f85..4dc17d50b5 100644 --- a/modules/audio_processing/intelligibility/intelligibility_utils.h +++ b/modules/audio_processing/intelligibility/intelligibility_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ +#ifndef MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ +#define MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ #include #include @@ -83,4 +83,4 @@ class DelayBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ +#endif // MODULES_AUDIO_PROCESSING_INTELLIGIBILITY_INTELLIGIBILITY_UTILS_H_ diff --git a/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc index 4687c924d8..fea394c338 100644 --- a/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc +++ b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc @@ -12,9 +12,9 @@ #include #include -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/intelligibility/intelligibility_utils.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc index 6045e9fd15..b90449caa3 100644 --- a/modules/audio_processing/intelligibility/test/intelligibility_proc.cc +++ b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" -#include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/flags.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/intelligibility/intelligibility_enhancer.h" +#include "modules/audio_processing/noise_suppression_impl.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/flags.h" using std::complex; diff --git a/modules/audio_processing/level_controller/biquad_filter.cc b/modules/audio_processing/level_controller/biquad_filter.cc index 9c4a4d2e6c..5a4ddc891e 100644 --- a/modules/audio_processing/level_controller/biquad_filter.cc +++ b/modules/audio_processing/level_controller/biquad_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/biquad_filter.h" +#include "modules/audio_processing/level_controller/biquad_filter.h" namespace webrtc { diff --git a/modules/audio_processing/level_controller/biquad_filter.h b/modules/audio_processing/level_controller/biquad_filter.h index 3a052a2c3d..dad104d43f 100644 --- a/modules/audio_processing/level_controller/biquad_filter.h +++ b/modules/audio_processing/level_controller/biquad_filter.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -55,4 +55,4 @@ class BiQuadFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_BIQUAD_FILTER_H_ diff --git a/modules/audio_processing/level_controller/down_sampler.cc b/modules/audio_processing/level_controller/down_sampler.cc index 09da95bfbc..a1702f432c 100644 --- a/modules/audio_processing/level_controller/down_sampler.cc +++ b/modules/audio_processing/level_controller/down_sampler.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/down_sampler.h" +#include "modules/audio_processing/level_controller/down_sampler.h" #include #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/biquad_filter.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/biquad_filter.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/down_sampler.h b/modules/audio_processing/level_controller/down_sampler.h index 5469a092a2..d6502425a1 100644 --- a/modules/audio_processing/level_controller/down_sampler.h +++ b/modules/audio_processing/level_controller/down_sampler.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/level_controller/biquad_filter.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/level_controller/biquad_filter.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -37,4 +37,4 @@ class DownSampler { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ diff --git a/modules/audio_processing/level_controller/gain_applier.cc b/modules/audio_processing/level_controller/gain_applier.cc index 54bcc5bae9..018f809e01 100644 --- a/modules/audio_processing/level_controller/gain_applier.cc +++ b/modules/audio_processing/level_controller/gain_applier.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/gain_applier.h" +#include "modules/audio_processing/level_controller/gain_applier.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/checks.h" +#include "api/array_view.h" +#include "rtc_base/checks.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/gain_applier.h b/modules/audio_processing/level_controller/gain_applier.h index 33e26c1e0a..5669f45bf7 100644 --- a/modules/audio_processing/level_controller/gain_applier.h +++ b/modules/audio_processing/level_controller/gain_applier.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -39,4 +39,4 @@ class GainApplier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ diff --git a/modules/audio_processing/level_controller/gain_selector.cc b/modules/audio_processing/level_controller/gain_selector.cc index 844b8de02e..3ab75b1ce6 100644 --- a/modules/audio_processing/level_controller/gain_selector.cc +++ b/modules/audio_processing/level_controller/gain_selector.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/gain_selector.h" +#include "modules/audio_processing/level_controller/gain_selector.h" #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/level_controller_constants.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/level_controller/gain_selector.h b/modules/audio_processing/level_controller/gain_selector.h index 690d49bace..7966c438d7 100644 --- a/modules/audio_processing/level_controller/gain_selector.h +++ b/modules/audio_processing/level_controller/gain_selector.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" namespace webrtc { @@ -37,4 +37,4 @@ class GainSelector { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ diff --git a/modules/audio_processing/level_controller/level_controller.cc b/modules/audio_processing/level_controller/level_controller.cc index 6edae5c38a..a600ac7bf8 100644 --- a/modules/audio_processing/level_controller/level_controller.cc +++ b/modules/audio_processing/level_controller/level_controller.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/level_controller.h" +#include "modules/audio_processing/level_controller/level_controller.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/level_controller/gain_applier.h" -#include "webrtc/modules/audio_processing/level_controller/gain_selector.h" -#include "webrtc/modules/audio_processing/level_controller/noise_level_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/peak_level_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/level_controller/gain_applier.h" +#include "modules/audio_processing/level_controller/gain_selector.h" +#include "modules/audio_processing/level_controller/noise_level_estimator.h" +#include "modules/audio_processing/level_controller/peak_level_estimator.h" +#include "modules/audio_processing/level_controller/saturating_gain_estimator.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/level_controller.h b/modules/audio_processing/level_controller/level_controller.h index 9aa50852df..224b886abd 100644 --- a/modules/audio_processing/level_controller/level_controller.h +++ b/modules/audio_processing/level_controller/level_controller.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/gain_applier.h" -#include "webrtc/modules/audio_processing/level_controller/gain_selector.h" -#include "webrtc/modules/audio_processing/level_controller/noise_level_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/peak_level_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h" -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/gain_applier.h" +#include "modules/audio_processing/level_controller/gain_selector.h" +#include "modules/audio_processing/level_controller/noise_level_estimator.h" +#include "modules/audio_processing/level_controller/peak_level_estimator.h" +#include "modules/audio_processing/level_controller/saturating_gain_estimator.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -92,4 +92,4 @@ class LevelController { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_H_ diff --git a/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc index 62859ee751..9aa10deb88 100644 --- a/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc +++ b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc @@ -11,18 +11,18 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/level_controller.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/modules/audio_processing/test/performance_timer.h" -#include "webrtc/modules/audio_processing/test/simulator_buffers.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/level_controller.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "modules/audio_processing/test/performance_timer.h" +#include "modules/audio_processing/test/simulator_buffers.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/level_controller_constants.h b/modules/audio_processing/level_controller/level_controller_constants.h index 7b962d37d9..6cf2cd4c7e 100644 --- a/modules/audio_processing/level_controller/level_controller_constants.h +++ b/modules/audio_processing/level_controller/level_controller_constants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ namespace webrtc { @@ -20,4 +20,4 @@ const float kTargetLcPeakLeveldBFS = -6.0206f; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_LEVEL_CONTROLLER_CONSTANTS_H_ diff --git a/modules/audio_processing/level_controller/level_controller_unittest.cc b/modules/audio_processing/level_controller/level_controller_unittest.cc index d37b58011b..a36f12c5f3 100644 --- a/modules/audio_processing/level_controller/level_controller_unittest.cc +++ b/modules/audio_processing/level_controller/level_controller_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/level_controller/level_controller.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/level_controller/level_controller.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/noise_level_estimator.cc b/modules/audio_processing/level_controller/noise_level_estimator.cc index 08015f9092..abf4ea2cb1 100644 --- a/modules/audio_processing/level_controller/noise_level_estimator.cc +++ b/modules/audio_processing/level_controller/noise_level_estimator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/noise_level_estimator.h" +#include "modules/audio_processing/level_controller/noise_level_estimator.h" #include -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { diff --git a/modules/audio_processing/level_controller/noise_level_estimator.h b/modules/audio_processing/level_controller/noise_level_estimator.h index 017ecc2cd6..94ef6737e7 100644 --- a/modules/audio_processing/level_controller/noise_level_estimator.h +++ b/modules/audio_processing/level_controller/noise_level_estimator.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -34,4 +34,4 @@ class NoiseLevelEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ diff --git a/modules/audio_processing/level_controller/noise_spectrum_estimator.cc b/modules/audio_processing/level_controller/noise_spectrum_estimator.cc index f7b1e194a3..6e921c24d1 100644 --- a/modules/audio_processing/level_controller/noise_spectrum_estimator.cc +++ b/modules/audio_processing/level_controller/noise_spectrum_estimator.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h" +#include "modules/audio_processing/level_controller/noise_spectrum_estimator.h" #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/arraysize.h" +#include "api/array_view.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/arraysize.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/noise_spectrum_estimator.h b/modules/audio_processing/level_controller/noise_spectrum_estimator.h index 196f0560a4..f10933ec96 100644 --- a/modules/audio_processing/level_controller/noise_spectrum_estimator.h +++ b/modules/audio_processing/level_controller/noise_spectrum_estimator.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -37,4 +37,4 @@ class NoiseSpectrumEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ diff --git a/modules/audio_processing/level_controller/peak_level_estimator.cc b/modules/audio_processing/level_controller/peak_level_estimator.cc index 37046fdceb..e78d74f514 100644 --- a/modules/audio_processing/level_controller/peak_level_estimator.cc +++ b/modules/audio_processing/level_controller/peak_level_estimator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/peak_level_estimator.h" +#include "modules/audio_processing/level_controller/peak_level_estimator.h" #include -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/peak_level_estimator.h b/modules/audio_processing/level_controller/peak_level_estimator.h index 23c10060a8..0aa55d2d55 100644 --- a/modules/audio_processing/level_controller/peak_level_estimator.h +++ b/modules/audio_processing/level_controller/peak_level_estimator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ -#include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/level_controller/level_controller_constants.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -34,4 +34,4 @@ class PeakLevelEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ diff --git a/modules/audio_processing/level_controller/saturating_gain_estimator.cc b/modules/audio_processing/level_controller/saturating_gain_estimator.cc index b9db974631..60110c684b 100644 --- a/modules/audio_processing/level_controller/saturating_gain_estimator.cc +++ b/modules/audio_processing/level_controller/saturating_gain_estimator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h" +#include "modules/audio_processing/level_controller/saturating_gain_estimator.h" #include #include -#include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/level_controller/level_controller_constants.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { diff --git a/modules/audio_processing/level_controller/saturating_gain_estimator.h b/modules/audio_processing/level_controller/saturating_gain_estimator.h index 35275f32d7..8980f4ef97 100644 --- a/modules/audio_processing/level_controller/saturating_gain_estimator.h +++ b/modules/audio_processing/level_controller/saturating_gain_estimator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -34,4 +34,4 @@ class SaturatingGainEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ diff --git a/modules/audio_processing/level_controller/signal_classifier.cc b/modules/audio_processing/level_controller/signal_classifier.cc index f557730ee3..d2d5917387 100644 --- a/modules/audio_processing/level_controller/signal_classifier.cc +++ b/modules/audio_processing/level_controller/signal_classifier.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" +#include "modules/audio_processing/level_controller/signal_classifier.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/level_controller/down_sampler.h" -#include "webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/level_controller/down_sampler.h" +#include "modules/audio_processing/level_controller/noise_spectrum_estimator.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/level_controller/signal_classifier.h b/modules/audio_processing/level_controller/signal_classifier.h index 1ec1951ab6..2be13fef7a 100644 --- a/modules/audio_processing/level_controller/signal_classifier.h +++ b/modules/audio_processing/level_controller/signal_classifier.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/level_controller/down_sampler.h" -#include "webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/level_controller/down_sampler.h" +#include "modules/audio_processing/level_controller/noise_spectrum_estimator.h" +#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -64,4 +64,4 @@ class SignalClassifier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SIGNAL_CLASSIFIER_H_ diff --git a/modules/audio_processing/level_estimator_impl.cc b/modules/audio_processing/level_estimator_impl.cc index 27a61377fa..c937f84525 100644 --- a/modules/audio_processing/level_estimator_impl.cc +++ b/modules/audio_processing/level_estimator_impl.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/level_estimator_impl.h" +#include "modules/audio_processing/level_estimator_impl.h" -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/rms_level.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/rms_level.h" namespace webrtc { diff --git a/modules/audio_processing/level_estimator_impl.h b/modules/audio_processing/level_estimator_impl.h index 68b1932116..901ae4cf58 100644 --- a/modules/audio_processing/level_estimator_impl.h +++ b/modules/audio_processing/level_estimator_impl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -44,4 +44,4 @@ class LevelEstimatorImpl : public LevelEstimator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ diff --git a/modules/audio_processing/level_estimator_unittest.cc b/modules/audio_processing/level_estimator_unittest.cc index a1ba5a2ce7..94b84bbdc3 100644 --- a/modules/audio_processing/level_estimator_unittest.cc +++ b/modules/audio_processing/level_estimator_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/level_estimator_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/level_estimator_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/logging/apm_data_dumper.cc b/modules/audio_processing/logging/apm_data_dumper.cc index 719dd050af..2f6a6d6a80 100644 --- a/modules/audio_processing/logging/apm_data_dumper.cc +++ b/modules/audio_processing/logging/apm_data_dumper.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/stringutils.h" // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ diff --git a/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h index 34213a79f2..d045027b35 100644 --- a/modules/audio_processing/logging/apm_data_dumper.h +++ b/modules/audio_processing/logging/apm_data_dumper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ +#define MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ #include @@ -17,9 +17,9 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "common_audio/wav_file.h" +#include "rtc_base/constructormagic.h" // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ @@ -209,4 +209,4 @@ class ApmDataDumper { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ +#endif // MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ diff --git a/modules/audio_processing/low_cut_filter.cc b/modules/audio_processing/low_cut_filter.cc index b111259a62..5245c68d02 100644 --- a/modules/audio_processing/low_cut_filter.cc +++ b/modules/audio_processing/low_cut_filter.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/low_cut_filter.h" +#include "modules/audio_processing/low_cut_filter.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/audio_buffer.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/low_cut_filter.h b/modules/audio_processing/low_cut_filter.h index 047bcac1ac..fd4c6f19cb 100644 --- a/modules/audio_processing/low_cut_filter.h +++ b/modules/audio_processing/low_cut_filter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -33,4 +33,4 @@ class LowCutFilter { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_ diff --git a/modules/audio_processing/low_cut_filter_unittest.cc b/modules/audio_processing/low_cut_filter_unittest.cc index d1081a4fa1..d98d665d37 100644 --- a/modules/audio_processing/low_cut_filter_unittest.cc +++ b/modules/audio_processing/low_cut_filter_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/low_cut_filter.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/low_cut_filter.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc index 37af1032ab..8dd713f4e5 100644 --- a/modules/audio_processing/noise_suppression_impl.cc +++ b/modules/audio_processing/noise_suppression_impl.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/noise_suppression_impl.h" +#include "modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/constructormagic.h" #if defined(WEBRTC_NS_FLOAT) -#include "webrtc/modules/audio_processing/ns/noise_suppression.h" +#include "modules/audio_processing/ns/noise_suppression.h" #define NS_CREATE WebRtcNs_Create #define NS_FREE WebRtcNs_Free #define NS_INIT WebRtcNs_Init #define NS_SET_POLICY WebRtcNs_set_policy typedef NsHandle NsState; #elif defined(WEBRTC_NS_FIXED) -#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" +#include "modules/audio_processing/ns/noise_suppression_x.h" #define NS_CREATE WebRtcNsx_Create #define NS_FREE WebRtcNsx_Free #define NS_INIT WebRtcNsx_Init diff --git a/modules/audio_processing/noise_suppression_impl.h b/modules/audio_processing/noise_suppression_impl.h index 1c8cbb0e60..fba716e253 100644 --- a/modules/audio_processing/noise_suppression_impl.h +++ b/modules/audio_processing/noise_suppression_impl.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -53,4 +53,4 @@ class NoiseSuppressionImpl : public NoiseSuppression { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ diff --git a/modules/audio_processing/noise_suppression_unittest.cc b/modules/audio_processing/noise_suppression_unittest.cc index 3595413029..0b734fdd3f 100644 --- a/modules/audio_processing/noise_suppression_unittest.cc +++ b/modules/audio_processing/noise_suppression_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/noise_suppression_impl.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/ns/defines.h b/modules/audio_processing/ns/defines.h index 8271332ce2..66b45a9565 100644 --- a/modules/audio_processing/ns/defines.h +++ b/modules/audio_processing/ns/defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ +#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ #define BLOCKL_MAX 160 // max processing block length: 160 #define ANAL_BLOCKL_MAX 256 // max analysis block length: 256 @@ -46,4 +46,4 @@ #define GAMMA_PAUSE (float)0.05 // update for conservative noise estimate // #define B_LIM (float)0.5 // threshold in final energy gain factor calculation -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_ diff --git a/modules/audio_processing/ns/noise_suppression.c b/modules/audio_processing/ns/noise_suppression.c index 8b6f45fce8..e21416f956 100644 --- a/modules/audio_processing/ns/noise_suppression.c +++ b/modules/audio_processing/ns/noise_suppression.c @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/noise_suppression.h" +#include "modules/audio_processing/ns/noise_suppression.h" #include #include -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/ns/defines.h" -#include "webrtc/modules/audio_processing/ns/ns_core.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/ns/defines.h" +#include "modules/audio_processing/ns/ns_core.h" NsHandle* WebRtcNs_Create() { NoiseSuppressionC* self = malloc(sizeof(NoiseSuppressionC)); diff --git a/modules/audio_processing/ns/noise_suppression.h b/modules/audio_processing/ns/noise_suppression.h index 41cad4ed1c..097b3541f0 100644 --- a/modules/audio_processing/ns/noise_suppression.h +++ b/modules/audio_processing/ns/noise_suppression.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ +#define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" typedef struct NsHandleT NsHandle; @@ -132,4 +132,4 @@ size_t WebRtcNs_num_freq(); } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ diff --git a/modules/audio_processing/ns/noise_suppression_x.c b/modules/audio_processing/ns/noise_suppression_x.c index 28a07e8c1d..1fd3ebc67e 100644 --- a/modules/audio_processing/ns/noise_suppression_x.c +++ b/modules/audio_processing/ns/noise_suppression_x.c @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" +#include "modules/audio_processing/ns/noise_suppression_x.h" #include -#include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/modules/audio_processing/ns/nsx_core.h" -#include "webrtc/modules/audio_processing/ns/nsx_defines.h" +#include "common_audio/signal_processing/include/real_fft.h" +#include "modules/audio_processing/ns/nsx_core.h" +#include "modules/audio_processing/ns/nsx_defines.h" NsxHandle* WebRtcNsx_Create() { NoiseSuppressionFixedC* self = malloc(sizeof(NoiseSuppressionFixedC)); diff --git a/modules/audio_processing/ns/noise_suppression_x.h b/modules/audio_processing/ns/noise_suppression_x.h index 79a5fc626f..bcb69ddd7b 100644 --- a/modules/audio_processing/ns/noise_suppression_x.h +++ b/modules/audio_processing/ns/noise_suppression_x.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ +#define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" typedef struct NsxHandleT NsxHandle; @@ -110,4 +110,4 @@ size_t WebRtcNsx_num_freq(); } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ diff --git a/modules/audio_processing/ns/ns_core.c b/modules/audio_processing/ns/ns_core.c index a187c437ce..a06ec5fb6c 100644 --- a/modules/audio_processing/ns/ns_core.c +++ b/modules/audio_processing/ns/ns_core.c @@ -12,12 +12,12 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/fft4g.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/ns/noise_suppression.h" -#include "webrtc/modules/audio_processing/ns/ns_core.h" -#include "webrtc/modules/audio_processing/ns/windows_private.h" +#include "rtc_base/checks.h" +#include "common_audio/fft4g.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/ns/noise_suppression.h" +#include "modules/audio_processing/ns/ns_core.h" +#include "modules/audio_processing/ns/windows_private.h" // Set Feature Extraction Parameters. static void set_feature_extraction_parameters(NoiseSuppressionC* self) { diff --git a/modules/audio_processing/ns/ns_core.h b/modules/audio_processing/ns/ns_core.h index aba1c468ed..97f76baf0d 100644 --- a/modules/audio_processing/ns/ns_core.h +++ b/modules/audio_processing/ns/ns_core.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ +#define MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ -#include "webrtc/modules/audio_processing/ns/defines.h" +#include "modules/audio_processing/ns/defines.h" typedef struct NSParaExtract_ { // Bin size of histogram. @@ -187,4 +187,4 @@ void WebRtcNs_ProcessCore(NoiseSuppressionC* self, #ifdef __cplusplus } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_ diff --git a/modules/audio_processing/ns/nsx_core.c b/modules/audio_processing/ns/nsx_core.c index 3d403bbd08..8043656029 100644 --- a/modules/audio_processing/ns/nsx_core.c +++ b/modules/audio_processing/ns/nsx_core.c @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" +#include "modules/audio_processing/ns/noise_suppression_x.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/common_audio/signal_processing/include/real_fft.h" -#include "webrtc/modules/audio_processing/ns/nsx_core.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "rtc_base/checks.h" +#include "common_audio/signal_processing/include/real_fft.h" +#include "modules/audio_processing/ns/nsx_core.h" +#include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_HAS_NEON) /* Tables are defined in ARM assembly files. */ diff --git a/modules/audio_processing/ns/nsx_core.h b/modules/audio_processing/ns/nsx_core.h index d1754f31ea..9b1d5baead 100644 --- a/modules/audio_processing/ns/nsx_core.h +++ b/modules/audio_processing/ns/nsx_core.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ +#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ #ifdef NS_FILEDEBUG #include #endif -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/ns/nsx_defines.h" -#include "webrtc/typedefs.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/ns/nsx_defines.h" +#include "typedefs.h" typedef struct NoiseSuppressionFixedC_ { uint32_t fs; @@ -260,4 +260,4 @@ void WebRtcNsx_Denormalize_mips(NoiseSuppressionFixedC* inst, } #endif -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_ diff --git a/modules/audio_processing/ns/nsx_core_c.c b/modules/audio_processing/ns/nsx_core_c.c index 5142be89ba..162fb1990a 100644 --- a/modules/audio_processing/ns/nsx_core_c.c +++ b/modules/audio_processing/ns/nsx_core_c.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" -#include "webrtc/modules/audio_processing/ns/nsx_core.h" -#include "webrtc/modules/audio_processing/ns/nsx_defines.h" +#include "rtc_base/checks.h" +#include "modules/audio_processing/ns/noise_suppression_x.h" +#include "modules/audio_processing/ns/nsx_core.h" +#include "modules/audio_processing/ns/nsx_defines.h" static const int16_t kIndicatorTable[17] = { 0, 2017, 3809, 5227, 6258, 6963, 7424, 7718, diff --git a/modules/audio_processing/ns/nsx_core_mips.c b/modules/audio_processing/ns/nsx_core_mips.c index 308effc190..d58a9b2347 100644 --- a/modules/audio_processing/ns/nsx_core_mips.c +++ b/modules/audio_processing/ns/nsx_core_mips.c @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/modules/audio_processing/ns/noise_suppression_x.h" -#include "webrtc/modules/audio_processing/ns/nsx_core.h" +#include "rtc_base/checks.h" +#include "modules/audio_processing/ns/noise_suppression_x.h" +#include "modules/audio_processing/ns/nsx_core.h" static const int16_t kIndicatorTable[17] = { 0, 2017, 3809, 5227, 6258, 6963, 7424, 7718, diff --git a/modules/audio_processing/ns/nsx_core_neon.c b/modules/audio_processing/ns/nsx_core_neon.c index 10c6b25c7c..64ce99c32c 100644 --- a/modules/audio_processing/ns/nsx_core_neon.c +++ b/modules/audio_processing/ns/nsx_core_neon.c @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/ns/nsx_core.h" +#include "modules/audio_processing/ns/nsx_core.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // Constants to compensate for shifting signal log(2^shifts). const int16_t WebRtcNsx_kLogTable[9] = { diff --git a/modules/audio_processing/ns/nsx_defines.h b/modules/audio_processing/ns/nsx_defines.h index 862dc3cab5..12869b3cf5 100644 --- a/modules/audio_processing/ns/nsx_defines.h +++ b/modules/audio_processing/ns/nsx_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ +#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ #define ANAL_BLOCKL_MAX 256 /* Max analysis block length */ #define HALF_ANAL_BLOCKL 129 /* Half max analysis block length + 1 */ @@ -61,4 +61,4 @@ #define ONE_MINUS_GAMMA_PAUSE_Q8 13 /* ~= Q8(0.05) Update for conservative noise estimate */ #define GAMMA_NOISE_TRANS_AND_SPEECH_Q8 3 /* ~= Q8(0.01) Update for transition and noise region */ -#endif /* WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ */ +#endif /* MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ */ diff --git a/modules/audio_processing/ns/windows_private.h b/modules/audio_processing/ns/windows_private.h index 44c2e846bd..2ffd693d8d 100644 --- a/modules/audio_processing/ns/windows_private.h +++ b/modules/audio_processing/ns/windows_private.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ +#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ +#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ // Hanning window for 4ms 16kHz static const float kHanning64w128[128] = { @@ -571,4 +571,4 @@ static const float kBlocks480w1024[1024] = { (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000 }; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ +#endif // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_ diff --git a/modules/audio_processing/render_queue_item_verifier.h b/modules/audio_processing/render_queue_item_verifier.h index a7fbbb42db..b8aff4a107 100644 --- a/modules/audio_processing/render_queue_item_verifier.h +++ b/modules/audio_processing/render_queue_item_verifier.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_ +#ifndef MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_ +#define MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_ #include @@ -33,4 +33,4 @@ class RenderQueueItemVerifier { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H__ +#endif // MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H__ diff --git a/modules/audio_processing/residual_echo_detector.cc b/modules/audio_processing/residual_echo_detector.cc index 290af43a5f..0f030460eb 100644 --- a/modules/audio_processing/residual_echo_detector.cc +++ b/modules/audio_processing/residual_echo_detector.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/residual_echo_detector.h" +#include "modules/audio_processing/residual_echo_detector.h" #include #include -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace { diff --git a/modules/audio_processing/residual_echo_detector.h b/modules/audio_processing/residual_echo_detector.h index 44bc081829..de1b989110 100644 --- a/modules/audio_processing/residual_echo_detector.h +++ b/modules/audio_processing/residual_echo_detector.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ +#define MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/echo_detector/circular_buffer.h" -#include "webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h" -#include "webrtc/modules/audio_processing/echo_detector/moving_max.h" -#include "webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h" +#include "api/array_view.h" +#include "modules/audio_processing/echo_detector/circular_buffer.h" +#include "modules/audio_processing/echo_detector/mean_variance_estimator.h" +#include "modules/audio_processing/echo_detector/moving_max.h" +#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h" namespace webrtc { @@ -91,4 +91,4 @@ class ResidualEchoDetector { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_ diff --git a/modules/audio_processing/residual_echo_detector_complexity_unittest.cc b/modules/audio_processing/residual_echo_detector_complexity_unittest.cc index 5d854c418f..991b9ff47a 100644 --- a/modules/audio_processing/residual_echo_detector_complexity_unittest.cc +++ b/modules/audio_processing/residual_echo_detector_complexity_unittest.cc @@ -11,17 +11,17 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/residual_echo_detector.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/performance_timer.h" -#include "webrtc/modules/audio_processing/test/simulator_buffers.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/residual_echo_detector.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/performance_timer.h" +#include "modules/audio_processing/test/simulator_buffers.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/testsupport/perf_test.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/residual_echo_detector_unittest.cc b/modules/audio_processing/residual_echo_detector_unittest.cc index 0784a4f9f7..baf83ba4aa 100644 --- a/modules/audio_processing/residual_echo_detector_unittest.cc +++ b/modules/audio_processing/residual_echo_detector_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_processing/residual_echo_detector.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/residual_echo_detector.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/rms_level.cc b/modules/audio_processing/rms_level.cc index 391843cb6f..1470267f7b 100644 --- a/modules/audio_processing/rms_level.cc +++ b/modules/audio_processing/rms_level.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/rms_level.h" +#include "modules/audio_processing/rms_level.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/rms_level.h b/modules/audio_processing/rms_level.h index e0df754f56..3b18b66389 100644 --- a/modules/audio_processing/rms_level.h +++ b/modules/audio_processing/rms_level.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ +#ifndef MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ +#define MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/api/optional.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "api/optional.h" +#include "typedefs.h" namespace webrtc { @@ -71,5 +71,5 @@ class RmsLevel { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ +#endif // MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ diff --git a/modules/audio_processing/rms_level_unittest.cc b/modules/audio_processing/rms_level_unittest.cc index 9d1f205308..093c8e70dc 100644 --- a/modules/audio_processing/rms_level_unittest.cc +++ b/modules/audio_processing/rms_level_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/rms_level.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/mathutils.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/rms_level.h" +#include "rtc_base/checks.h" +#include "rtc_base/mathutils.h" +#include "rtc_base/safe_conversions.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/splitting_filter.cc b/modules/audio_processing/splitting_filter.cc index 203201ebe3..e2b8f82c36 100644 --- a/modules/audio_processing/splitting_filter.cc +++ b/modules/audio_processing/splitting_filter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/splitting_filter.h" +#include "modules/audio_processing/splitting_filter.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/splitting_filter.h b/modules/audio_processing/splitting_filter.h index 2d3750ae60..7d60c82ff6 100644 --- a/modules/audio_processing/splitting_filter.h +++ b/modules/audio_processing/splitting_filter.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ #include #include #include -#include "webrtc/modules/audio_processing/three_band_filter_bank.h" +#include "modules/audio_processing/three_band_filter_bank.h" namespace webrtc { @@ -66,4 +66,4 @@ class SplittingFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_ diff --git a/modules/audio_processing/splitting_filter_unittest.cc b/modules/audio_processing/splitting_filter_unittest.cc index ce070312e7..3e0dbb9b9c 100644 --- a/modules/audio_processing/splitting_filter_unittest.cc +++ b/modules/audio_processing/splitting_filter_unittest.cc @@ -13,9 +13,9 @@ #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/splitting_filter.h" -#include "webrtc/test/gtest.h" +#include "common_audio/channel_buffer.h" +#include "modules/audio_processing/splitting_filter.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc index 40df9aa120..8dda70dfb8 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/audio_processing/test/aec_dump_based_simulator.h" +#include "modules/audio_processing/test/aec_dump_based_simulator.h" -#include "webrtc/modules/audio_processing/test/protobuf_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "modules/audio_processing/test/protobuf_utils.h" +#include "rtc_base/checks.h" +#include "test/testsupport/trace_to_stderr.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/aec_dump_based_simulator.h b/modules/audio_processing/test/aec_dump_based_simulator.h index 3fb1d5528f..3bdd00630d 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/modules/audio_processing/test/aec_dump_based_simulator.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ +#define MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ -#include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" +#include "modules/audio_processing/test/audio_processing_simulator.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" #endif RTC_POP_IGNORING_WUNDEF() @@ -65,4 +65,4 @@ class AecDumpBasedSimulator final : public AudioProcessingSimulator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_AEC_DUMP_BASED_SIMULATOR_H_ diff --git a/modules/audio_processing/test/audio_buffer_tools.cc b/modules/audio_processing/test/audio_buffer_tools.cc index 46ee61d71d..0f0e5cd520 100644 --- a/modules/audio_processing/test/audio_buffer_tools.cc +++ b/modules/audio_processing/test/audio_buffer_tools.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" #include diff --git a/modules/audio_processing/test/audio_buffer_tools.h b/modules/audio_processing/test/audio_buffer_tools.h index 96ccad07e5..dc53e4f6a2 100644 --- a/modules/audio_processing/test/audio_buffer_tools.h +++ b/modules/audio_processing/test/audio_buffer_tools.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" namespace webrtc { namespace test { @@ -32,4 +32,4 @@ void ExtractVectorFromAudioBuffer(const StreamConfig& stream_config, } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc index 3360a672ec..55d82c65f0 100644 --- a/modules/audio_processing/test/audio_processing_simulator.cc +++ b/modules/audio_processing/test/audio_processing_simulator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" +#include "modules/audio_processing/test/audio_processing_simulator.h" #include #include @@ -16,11 +16,11 @@ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stringutils.h" +#include "common_audio/include/audio_util.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" +#include "rtc_base/stringutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h index 8a2295f0cd..8d780b8cee 100644 --- a/modules/audio_processing/test/audio_processing_simulator.h +++ b/modules/audio_processing/test/audio_processing_simulator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ +#define MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ #include #include @@ -17,13 +17,13 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/optional.h" +#include "common_audio/channel_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" namespace webrtc { namespace test { @@ -186,4 +186,4 @@ class AudioProcessingSimulator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_AUDIO_PROCESSING_SIMULATOR_H_ diff --git a/modules/audio_processing/test/audioproc_float.cc b/modules/audio_processing/test/audioproc_float.cc index d0c813f151..41bd5fbf24 100644 --- a/modules/audio_processing/test/audioproc_float.cc +++ b/modules/audio_processing/test/audioproc_float.cc @@ -13,11 +13,11 @@ #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/audio_processing/test/aec_dump_based_simulator.h" -#include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" -#include "webrtc/modules/audio_processing/test/wav_based_simulator.h" -#include "webrtc/rtc_base/flags.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/test/aec_dump_based_simulator.h" +#include "modules/audio_processing/test/audio_processing_simulator.h" +#include "modules/audio_processing/test/wav_based_simulator.h" +#include "rtc_base/flags.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/bitexactness_tools.cc b/modules/audio_processing/test/bitexactness_tools.cc index c5e4d38dae..c49bb5099f 100644 --- a/modules/audio_processing/test/bitexactness_tools.cc +++ b/modules/audio_processing/test/bitexactness_tools.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/array_view.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/bitexactness_tools.h b/modules/audio_processing/test/bitexactness_tools.h index 3a1722ac1a..eb5ee081c3 100644 --- a/modules/audio_processing/test/bitexactness_tools.h +++ b/modules/audio_processing/test/bitexactness_tools.h @@ -9,14 +9,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_coding/neteq/tools/input_audio_file.h" +#include "test/gtest.h" namespace webrtc { namespace test { @@ -53,4 +53,4 @@ void ReadFloatSamplesFromStereoFile(size_t samples_per_channel, } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_BITEXACTNESS_TOOLS_H_ diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn index 1d492bf644..c7263301b6 100644 --- a/modules/audio_processing/test/conversational_speech/BUILD.gn +++ b/modules/audio_processing/test/conversational_speech/BUILD.gn @@ -6,7 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. -import("../../../../../webrtc/webrtc.gni") +import("../../../../webrtc.gni") group("conversational_speech") { testonly = true diff --git a/modules/audio_processing/test/conversational_speech/config.cc b/modules/audio_processing/test/conversational_speech/config.cc index 5a0a32267d..76d3de8108 100644 --- a/modules/audio_processing/test/conversational_speech/config.cc +++ b/modules/audio_processing/test/conversational_speech/config.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/config.h" +#include "modules/audio_processing/test/conversational_speech/config.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/config.h b/modules/audio_processing/test/conversational_speech/config.h index bad1145e98..f219a65f60 100644 --- a/modules/audio_processing/test/conversational_speech/config.h +++ b/modules/audio_processing/test/conversational_speech/config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ #include @@ -38,4 +38,4 @@ struct Config { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_CONFIG_H_ diff --git a/modules/audio_processing/test/conversational_speech/generator.cc b/modules/audio_processing/test/conversational_speech/generator.cc index 53f7217c26..ee3f81a9a2 100644 --- a/modules/audio_processing/test/conversational_speech/generator.cc +++ b/modules/audio_processing/test/conversational_speech/generator.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/modules/audio_processing/test/conversational_speech/config.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/simulator.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_processing/test/conversational_speech/config.h" +#include "modules/audio_processing/test/conversational_speech/multiend_call.h" +#include "modules/audio_processing/test/conversational_speech/simulator.h" +#include "modules/audio_processing/test/conversational_speech/timing.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_factory.h" +#include "rtc_base/flags.h" +#include "rtc_base/ptr_util.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/modules/audio_processing/test/conversational_speech/generator_unittest.cc index e0aa43de23..7e874b06b6 100644 --- a/modules/audio_processing/test/conversational_speech/generator_unittest.cc +++ b/modules/audio_processing/test/conversational_speech/generator_unittest.cc @@ -42,19 +42,19 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/config.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/simulator.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/optional.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/test/conversational_speech/config.h" +#include "modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" +#include "modules/audio_processing/test/conversational_speech/multiend_call.h" +#include "modules/audio_processing/test/conversational_speech/simulator.h" +#include "modules/audio_processing/test/conversational_speech/timing.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_factory.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/mock_wavreader.cc b/modules/audio_processing/test/conversational_speech/mock_wavreader.cc index 6b92339adc..103483d83e 100644 --- a/modules/audio_processing/test/conversational_speech/mock_wavreader.cc +++ b/modules/audio_processing/test/conversational_speech/mock_wavreader.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h" +#include "modules/audio_processing/test/conversational_speech/mock_wavreader.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/mock_wavreader.h b/modules/audio_processing/test/conversational_speech/mock_wavreader.h index 8e86f4dd04..3356e8e1d7 100644 --- a/modules/audio_processing/test/conversational_speech/mock_wavreader.h +++ b/modules/audio_processing/test/conversational_speech/mock_wavreader.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -46,4 +46,4 @@ class MockWavReader : public WavReaderInterface { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_H_ diff --git a/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc index 0483a33cec..d2c107aca8 100644 --- a/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc +++ b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" +#include "modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/test/conversational_speech/mock_wavreader.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "test/gmock.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h index d22856e80c..4c055cf3ae 100644 --- a/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h +++ b/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ #include #include #include -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "webrtc/test/gmock.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -53,4 +53,4 @@ class MockWavReaderFactory : public WavReaderAbstractFactory { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_ diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.cc b/modules/audio_processing/test/conversational_speech/multiend_call.cc index dffbfcbe1e..7c4244296b 100644 --- a/modules/audio_processing/test/conversational_speech/multiend_call.cc +++ b/modules/audio_processing/test/conversational_speech/multiend_call.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" +#include "modules/audio_processing/test/conversational_speech/multiend_call.h" #include #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.h b/modules/audio_processing/test/conversational_speech/multiend_call.h index 38cc0e2f0a..e4cee7ac96 100644 --- a/modules/audio_processing/test/conversational_speech/multiend_call.h +++ b/modules/audio_processing/test/conversational_speech/multiend_call.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ #include #include @@ -19,11 +19,11 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/array_view.h" +#include "modules/audio_processing/test/conversational_speech/timing.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -90,4 +90,4 @@ class MultiEndCall { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MULTIEND_CALL_H_ diff --git a/modules/audio_processing/test/conversational_speech/simulator.cc b/modules/audio_processing/test/conversational_speech/simulator.cc index 709dec3a3e..4f3091aaae 100644 --- a/modules/audio_processing/test/conversational_speech/simulator.cc +++ b/modules/audio_processing/test/conversational_speech/simulator.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/simulator.h" +#include "modules/audio_processing/test/conversational_speech/simulator.h" #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "api/array_view.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/ptr_util.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/simulator.h b/modules/audio_processing/test/conversational_speech/simulator.h index 6882cca124..671c3b9c73 100644 --- a/modules/audio_processing/test/conversational_speech/simulator.h +++ b/modules/audio_processing/test/conversational_speech/simulator.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ #include #include #include #include -#include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/audio_processing/test/conversational_speech/multiend_call.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -41,4 +41,4 @@ std::unique_ptr> } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_SIMULATOR_H_ diff --git a/modules/audio_processing/test/conversational_speech/timing.cc b/modules/audio_processing/test/conversational_speech/timing.cc index 59ca867f25..773a42ebd7 100644 --- a/modules/audio_processing/test/conversational_speech/timing.cc +++ b/modules/audio_processing/test/conversational_speech/timing.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" +#include "modules/audio_processing/test/conversational_speech/timing.h" #include #include -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/timing.h b/modules/audio_processing/test/conversational_speech/timing.h index 62ed1cb83e..dc43361815 100644 --- a/modules/audio_processing/test/conversational_speech/timing.h +++ b/modules/audio_processing/test/conversational_speech/timing.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ #include #include -#include "webrtc/api/array_view.h" +#include "api/array_view.h" namespace webrtc { namespace test { @@ -43,4 +43,4 @@ void SaveTiming(const std::string& timing_filepath, } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_TIMING_H_ diff --git a/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h b/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h index b48245b1ba..83fda0d45c 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h +++ b/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ #include #include -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" namespace webrtc { namespace test { @@ -31,4 +31,4 @@ class WavReaderAbstractFactory { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ABSTRACT_FACTORY_H_ diff --git a/modules/audio_processing/test/conversational_speech/wavreader_factory.cc b/modules/audio_processing/test/conversational_speech/wavreader_factory.cc index c2f87a820f..f1444999db 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_factory.cc +++ b/modules/audio_processing/test/conversational_speech/wavreader_factory.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_factory.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "common_audio/wav_file.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/wavreader_factory.h b/modules/audio_processing/test/conversational_speech/wavreader_factory.h index 5c46af025a..e168d0d71f 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_factory.h +++ b/modules/audio_processing/test/conversational_speech/wavreader_factory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ #include #include -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" +#include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" namespace webrtc { namespace test { @@ -33,4 +33,4 @@ class WavReaderFactory : public WavReaderAbstractFactory { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_FACTORY_H_ diff --git a/modules/audio_processing/test/conversational_speech/wavreader_interface.h b/modules/audio_processing/test/conversational_speech/wavreader_interface.h index 74dae400b6..946969ccdd 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_interface.h +++ b/modules/audio_processing/test/conversational_speech/wavreader_interface.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ +#define MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -38,4 +38,4 @@ class WavReaderInterface { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_INTERFACE_H_ diff --git a/modules/audio_processing/test/debug_dump_replayer.cc b/modules/audio_processing/test/debug_dump_replayer.cc index b88692cee3..a3c4d63f23 100644 --- a/modules/audio_processing/test/debug_dump_replayer.cc +++ b/modules/audio_processing/test/debug_dump_replayer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/debug_dump_replayer.h" +#include "modules/audio_processing/test/debug_dump_replayer.h" -#include "webrtc/modules/audio_processing/test/protobuf_utils.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/test/protobuf_utils.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/debug_dump_replayer.h b/modules/audio_processing/test/debug_dump_replayer.h index 9ee4a6349e..4cd961dd7f 100644 --- a/modules/audio_processing/test/debug_dump_replayer.h +++ b/modules/audio_processing/test/debug_dump_replayer.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ +#define MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ #include #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/ignore_wundef.h" +#include "common_audio/channel_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" RTC_POP_IGNORING_WUNDEF() namespace webrtc { @@ -74,4 +74,4 @@ class DebugDumpReplayer { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_DEBUG_DUMP_REPLAYER_H_ diff --git a/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc index d496b755e8..c31f3a471a 100644 --- a/modules/audio_processing/test/debug_dump_test.cc +++ b/modules/audio_processing/test/debug_dump_test.cc @@ -14,13 +14,13 @@ #include #include -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/modules/audio_processing/test/debug_dump_replayer.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "modules/audio_processing/test/debug_dump_replayer.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/task_queue.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/echo_canceller_test_tools.cc b/modules/audio_processing/test/echo_canceller_test_tools.cc index b3cacf83f7..eba852d4b5 100644 --- a/modules/audio_processing/test/echo_canceller_test_tools.cc +++ b/modules/audio_processing/test/echo_canceller_test_tools.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/test/echo_canceller_test_tools.h b/modules/audio_processing/test/echo_canceller_test_tools.h index 1acfeaccbb..1cb5b7e762 100644 --- a/modules/audio_processing/test/echo_canceller_test_tools.h +++ b/modules/audio_processing/test/echo_canceller_test_tools.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/random.h" +#include "api/array_view.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/random.h" namespace webrtc { @@ -41,4 +41,4 @@ class DelayBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_ECHO_CANCELLER_TEST_TOOLS_H_ diff --git a/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc b/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc index 0f28327a1e..4d5a4fb34b 100644 --- a/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc +++ b/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "modules/audio_processing/test/echo_canceller_test_tools.h" #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "rtc_base/checks.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/test/performance_timer.cc b/modules/audio_processing/test/performance_timer.cc index 1e9c68ccb8..c59aeed405 100644 --- a/modules/audio_processing/test/performance_timer.cc +++ b/modules/audio_processing/test/performance_timer.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/performance_timer.h" +#include "modules/audio_processing/test/performance_timer.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/performance_timer.h b/modules/audio_processing/test/performance_timer.h index 9377f4ae77..1c862dc78e 100644 --- a/modules/audio_processing/test/performance_timer.h +++ b/modules/audio_processing/test/performance_timer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ +#define MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/optional.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { @@ -44,4 +44,4 @@ class PerformanceTimer { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_PERFORMANCE_TIMER_H_ diff --git a/modules/audio_processing/test/protobuf_utils.cc b/modules/audio_processing/test/protobuf_utils.cc index cb8adf92ff..6d2d8d4e40 100644 --- a/modules/audio_processing/test/protobuf_utils.cc +++ b/modules/audio_processing/test/protobuf_utils.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/protobuf_utils.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/test/protobuf_utils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/test/protobuf_utils.h b/modules/audio_processing/test/protobuf_utils.h index 13ae0cf674..dded9b4ca7 100644 --- a/modules/audio_processing/test/protobuf_utils.h +++ b/modules/audio_processing/test/protobuf_utils.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ #include -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/protobuf_utils.h" RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" RTC_POP_IGNORING_WUNDEF() namespace webrtc { @@ -31,4 +31,4 @@ bool ReadMessageFromFile(FILE* file, MessageLite* msg); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ diff --git a/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn index cf39d72b4a..3c0ac0e622 100644 --- a/modules/audio_processing/test/py_quality_assessment/BUILD.gn +++ b/modules/audio_processing/test/py_quality_assessment/BUILD.gn @@ -34,7 +34,7 @@ copy("scripts") { ":lib", ":output", "../..:audioproc_f", - "../../../../../resources/audio_processing/test/py_quality_assessment:probing_signals", + "../../../../resources/audio_processing/test/py_quality_assessment:probing_signals", ] } @@ -77,7 +77,7 @@ copy("lib") { "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}", ] deps = [ - "../../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks", + "../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks", ] } diff --git a/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py index 338c38c106..5b567fc643 100755 --- a/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py +++ b/modules/audio_processing/test/py_quality_assessment/apm_quality_assessment_gencfgs.py @@ -26,7 +26,7 @@ def _GenerateDefaultOverridden(config_override): writes a new APM configuration file. The default settings are loaded via "-all_default". - Check "src/webrtc/modules/audio_processing/test/audioproc_float.cc" and search + Check "src/modules/audio_processing/test/audioproc_float.cc" and search for "if (FLAG_all_default) {". For instance, in 55eb6d621489730084927868fed195d3645a9ec9 the default is this: diff --git a/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc b/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc index 9345a87baa..62d8ebb84d 100644 --- a/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc +++ b/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/simulator_buffers.cc b/modules/audio_processing/test/simulator_buffers.cc index cecee71ac4..90c6d5ea72 100644 --- a/modules/audio_processing/test/simulator_buffers.cc +++ b/modules/audio_processing/test/simulator_buffers.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/simulator_buffers.h" +#include "modules/audio_processing/test/simulator_buffers.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/simulator_buffers.h b/modules/audio_processing/test/simulator_buffers.h index 5e6689751a..36dcf301a2 100644 --- a/modules/audio_processing/test/simulator_buffers.h +++ b/modules/audio_processing/test/simulator_buffers.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ #include #include -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/random.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/random.h" namespace webrtc { namespace test { @@ -63,4 +63,4 @@ struct SimulatorBuffers { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_SIMULATOR_BUFFERS_H_ diff --git a/modules/audio_processing/test/test_utils.cc b/modules/audio_processing/test/test_utils.cc index 7c354d0348..42ba7ebb5a 100644 --- a/modules/audio_processing/test/test_utils.cc +++ b/modules/audio_processing/test/test_utils.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/test/test_utils.h b/modules/audio_processing/test/test_utils.h index e6c7259c47..57dc7b3797 100644 --- a/modules/audio_processing/test/test_utils.h +++ b/modules/audio_processing/test/test_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ +#define MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ #include #include @@ -18,11 +18,11 @@ #include #include -#include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_audio/channel_buffer.h" +#include "common_audio/wav_file.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -155,4 +155,4 @@ std::vector ParseArrayGeometry(const std::string& mic_positions); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_TEST_UTILS_H_ diff --git a/modules/audio_processing/test/unpack.cc b/modules/audio_processing/test/unpack.cc index 13be279811..af85c641c7 100644 --- a/modules/audio_processing/test/unpack.cc +++ b/modules/audio_processing/test/unpack.cc @@ -17,15 +17,15 @@ #include -#include "webrtc/modules/audio_processing/test/protobuf_utils.h" -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/test/protobuf_utils.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/flags.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/ignore_wundef.h" +#include "typedefs.h" RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "modules/audio_processing/debug.pb.h" RTC_POP_IGNORING_WUNDEF() // TODO(andrew): unpack more of the data. diff --git a/modules/audio_processing/test/wav_based_simulator.cc b/modules/audio_processing/test/wav_based_simulator.cc index 40253964b1..a80ad4d460 100644 --- a/modules/audio_processing/test/wav_based_simulator.cc +++ b/modules/audio_processing/test/wav_based_simulator.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/test/wav_based_simulator.h" +#include "modules/audio_processing/test/wav_based_simulator.h" #include #include -#include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "modules/audio_processing/test/test_utils.h" +#include "rtc_base/checks.h" +#include "test/testsupport/trace_to_stderr.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/wav_based_simulator.h b/modules/audio_processing/test/wav_based_simulator.h index 245367e237..0ea278cf89 100644 --- a/modules/audio_processing/test/wav_based_simulator.h +++ b/modules/audio_processing/test/wav_based_simulator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ +#define MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ #include -#include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" +#include "modules/audio_processing/test/audio_processing_simulator.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { @@ -53,4 +53,4 @@ class WavBasedSimulator final : public AudioProcessingSimulator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TEST_WAV_BASED_SIMULATOR_H_ diff --git a/modules/audio_processing/three_band_filter_bank.cc b/modules/audio_processing/three_band_filter_bank.cc index 4c62e7ec83..f5a319bc54 100644 --- a/modules/audio_processing/three_band_filter_bank.cc +++ b/modules/audio_processing/three_band_filter_bank.cc @@ -33,11 +33,11 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include "webrtc/modules/audio_processing/three_band_filter_bank.h" +#include "modules/audio_processing/three_band_filter_bank.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/three_band_filter_bank.h b/modules/audio_processing/three_band_filter_bank.h index 24e7831d73..ccbf2ddf97 100644 --- a/modules/audio_processing/three_band_filter_bank.h +++ b/modules/audio_processing/three_band_filter_bank.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ +#ifndef MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ +#define MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ #include #include #include -#include "webrtc/common_audio/sparse_fir_filter.h" +#include "common_audio/sparse_fir_filter.h" namespace webrtc { @@ -66,4 +66,4 @@ class ThreeBandFilterBank final { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ +#endif // MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_ diff --git a/modules/audio_processing/transient/click_annotate.cc b/modules/audio_processing/transient/click_annotate.cc index b03a714c28..a8b4a307e1 100644 --- a/modules/audio_processing/transient/click_annotate.cc +++ b/modules/audio_processing/transient/click_annotate.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/modules/audio_processing/transient/transient_detector.h" -#include "webrtc/modules/audio_processing/transient/file_utils.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/audio_processing/transient/transient_detector.h" +#include "modules/audio_processing/transient/file_utils.h" +#include "system_wrappers/include/file_wrapper.h" using webrtc::FileWrapper; using webrtc::TransientDetector; diff --git a/modules/audio_processing/transient/common.h b/modules/audio_processing/transient/common.h index 92194e97e6..69546fc57b 100644 --- a/modules/audio_processing/transient/common.h +++ b/modules/audio_processing/transient/common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ namespace webrtc { namespace ts { @@ -24,4 +24,4 @@ enum { } // namespace ts } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_ diff --git a/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h b/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h index b1236ac732..4de24e0fcb 100644 --- a/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h +++ b/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h @@ -10,8 +10,8 @@ // This header file defines the coefficients of the FIR based approximation of // the Meyer Wavelet -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ // Decomposition coefficients Daubechies 8. @@ -60,4 +60,4 @@ const float kDaubechies8LowPassCoefficients[kDaubechies8CoefficientsLength] = { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_ diff --git a/modules/audio_processing/transient/dyadic_decimator.h b/modules/audio_processing/transient/dyadic_decimator.h index c1046f2293..00ff10f2a8 100644 --- a/modules/audio_processing/transient/dyadic_decimator.h +++ b/modules/audio_processing/transient/dyadic_decimator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" // Provides a set of static methods to perform dyadic decimations. @@ -67,4 +67,4 @@ static size_t DyadicDecimate(const T* in, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_ diff --git a/modules/audio_processing/transient/dyadic_decimator_unittest.cc b/modules/audio_processing/transient/dyadic_decimator_unittest.cc index 7f5bb03e71..c407f47ffb 100644 --- a/modules/audio_processing/transient/dyadic_decimator_unittest.cc +++ b/modules/audio_processing/transient/dyadic_decimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" +#include "modules/audio_processing/transient/dyadic_decimator.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/transient/file_utils.cc b/modules/audio_processing/transient/file_utils.cc index e69bf79353..ef9d8e609e 100644 --- a/modules/audio_processing/transient/file_utils.cc +++ b/modules/audio_processing/transient/file_utils.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/file_utils.h" +#include "modules/audio_processing/transient/file_utils.h" #include -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/file_wrapper.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/transient/file_utils.h b/modules/audio_processing/transient/file_utils.h index cc76953215..0e794f4b01 100644 --- a/modules/audio_processing/transient/file_utils.h +++ b/modules/audio_processing/transient/file_utils.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ #include -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/file_wrapper.h" +#include "typedefs.h" namespace webrtc { @@ -115,4 +115,4 @@ size_t WriteDoubleBufferToFile(FileWrapper* file, } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ diff --git a/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc index 2909ac397a..c2b9790ae7 100644 --- a/modules/audio_processing/transient/file_utils_unittest.cc +++ b/modules/audio_processing/transient/file_utils_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/file_utils.h" +#include "modules/audio_processing/transient/file_utils.h" #include #include #include #include -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/file_wrapper.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/transient/moving_moments.cc b/modules/audio_processing/transient/moving_moments.cc index bca987feb7..46b16b82bc 100644 --- a/modules/audio_processing/transient/moving_moments.cc +++ b/modules/audio_processing/transient/moving_moments.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/moving_moments.h" +#include "modules/audio_processing/transient/moving_moments.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/transient/moving_moments.h b/modules/audio_processing/transient/moving_moments.h index 9e22a92fe0..f1b3e38cc0 100644 --- a/modules/audio_processing/transient/moving_moments.h +++ b/modules/audio_processing/transient/moving_moments.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ #include @@ -49,4 +49,4 @@ class MovingMoments { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_ diff --git a/modules/audio_processing/transient/moving_moments_unittest.cc b/modules/audio_processing/transient/moving_moments_unittest.cc index eb645eecfa..057bc454e0 100644 --- a/modules/audio_processing/transient/moving_moments_unittest.cc +++ b/modules/audio_processing/transient/moving_moments_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/moving_moments.h" +#include "modules/audio_processing/transient/moving_moments.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_detector.cc b/modules/audio_processing/transient/transient_detector.cc index 65fdc738eb..1bb6f9f10a 100644 --- a/modules/audio_processing/transient/transient_detector.cc +++ b/modules/audio_processing/transient/transient_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/transient_detector.h" +#include "modules/audio_processing/transient/transient_detector.h" #include #include @@ -16,11 +16,11 @@ #include -#include "webrtc/modules/audio_processing/transient/common.h" -#include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" -#include "webrtc/modules/audio_processing/transient/moving_moments.h" -#include "webrtc/modules/audio_processing/transient/wpd_tree.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/transient/common.h" +#include "modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" +#include "modules/audio_processing/transient/moving_moments.h" +#include "modules/audio_processing/transient/wpd_tree.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_detector.h b/modules/audio_processing/transient/transient_detector.h index dbd2ba5d68..3267b3a6cd 100644 --- a/modules/audio_processing/transient/transient_detector.h +++ b/modules/audio_processing/transient/transient_detector.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ #include #include -#include "webrtc/modules/audio_processing/transient/moving_moments.h" -#include "webrtc/modules/audio_processing/transient/wpd_tree.h" +#include "modules/audio_processing/transient/moving_moments.h" +#include "modules/audio_processing/transient/wpd_tree.h" namespace webrtc { @@ -84,4 +84,4 @@ class TransientDetector { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc index 7f9b74e4d7..68677ae022 100644 --- a/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/modules/audio_processing/transient/transient_detector_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/transient_detector.h" +#include "modules/audio_processing/transient/transient_detector.h" #include #include #include -#include "webrtc/modules/audio_processing/transient/common.h" -#include "webrtc/modules/audio_processing/transient/file_utils.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/transient/common.h" +#include "modules/audio_processing/transient/file_utils.h" +#include "system_wrappers/include/file_wrapper.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc index ea894bc12d..fe88838908 100644 --- a/modules/audio_processing/transient/transient_suppression_test.cc +++ b/modules/audio_processing/transient/transient_suppression_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/transient_suppressor.h" +#include "modules/audio_processing/transient/transient_suppressor.h" #include #include @@ -17,13 +17,13 @@ #include #include -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/modules/audio_processing/agc/agc.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/typedefs.h" +#include "common_audio/include/audio_util.h" +#include "modules/audio_processing/agc/agc.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/flags.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "typedefs.h" DEFINE_string(in_file_name, "", "PCM file that contains the signal."); DEFINE_string(detection_file_name, diff --git a/modules/audio_processing/transient/transient_suppressor.cc b/modules/audio_processing/transient/transient_suppressor.cc index 1b05d265b6..e679c02b90 100644 --- a/modules/audio_processing/transient/transient_suppressor.cc +++ b/modules/audio_processing/transient/transient_suppressor.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/transient_suppressor.h" +#include "modules/audio_processing/transient/transient_suppressor.h" #include #include @@ -17,15 +17,15 @@ #include #include -#include "webrtc/common_audio/fft4g.h" -#include "webrtc/common_audio/include/audio_util.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_processing/ns/windows_private.h" -#include "webrtc/modules/audio_processing/transient/common.h" -#include "webrtc/modules/audio_processing/transient/transient_detector.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/typedefs.h" +#include "common_audio/fft4g.h" +#include "common_audio/include/audio_util.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/ns/windows_private.h" +#include "modules/audio_processing/transient/common.h" +#include "modules/audio_processing/transient/transient_detector.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_suppressor.h b/modules/audio_processing/transient/transient_suppressor.h index 74decea7e2..1b71148cb2 100644 --- a/modules/audio_processing/transient/transient_suppressor.h +++ b/modules/audio_processing/transient/transient_suppressor.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ #include #include #include -#include "webrtc/rtc_base/gtest_prod_util.h" -#include "webrtc/typedefs.h" +#include "rtc_base/gtest_prod_util.h" +#include "typedefs.h" namespace webrtc { @@ -117,4 +117,4 @@ class TransientSuppressor { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ diff --git a/modules/audio_processing/transient/transient_suppressor_unittest.cc b/modules/audio_processing/transient/transient_suppressor_unittest.cc index ff0105512a..32d9858c64 100644 --- a/modules/audio_processing/transient/transient_suppressor_unittest.cc +++ b/modules/audio_processing/transient/transient_suppressor_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/transient_suppressor.h" +#include "modules/audio_processing/transient/transient_suppressor.h" -#include "webrtc/modules/audio_processing/transient/common.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/transient/common.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/transient/wpd_node.cc b/modules/audio_processing/transient/wpd_node.cc index 88ad24d740..630c9f3b8b 100644 --- a/modules/audio_processing/transient/wpd_node.cc +++ b/modules/audio_processing/transient/wpd_node.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/wpd_node.h" +#include "modules/audio_processing/transient/wpd_node.h" #include #include -#include "webrtc/common_audio/fir_filter.h" -#include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/fir_filter.h" +#include "modules/audio_processing/transient/dyadic_decimator.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/transient/wpd_node.h b/modules/audio_processing/transient/wpd_node.h index 99521fd32e..b9d74ffcab 100644 --- a/modules/audio_processing/transient/wpd_node.h +++ b/modules/audio_processing/transient/wpd_node.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -44,4 +44,4 @@ class WPDNode { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_ diff --git a/modules/audio_processing/transient/wpd_node_unittest.cc b/modules/audio_processing/transient/wpd_node_unittest.cc index 3a9cb759f2..1929361055 100644 --- a/modules/audio_processing/transient/wpd_node_unittest.cc +++ b/modules/audio_processing/transient/wpd_node_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/wpd_node.h" +#include "modules/audio_processing/transient/wpd_node.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/transient/wpd_tree.cc b/modules/audio_processing/transient/wpd_tree.cc index 187a8cd0ff..a01b816daf 100644 --- a/modules/audio_processing/transient/wpd_tree.cc +++ b/modules/audio_processing/transient/wpd_tree.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/wpd_tree.h" +#include "modules/audio_processing/transient/wpd_tree.h" #include #include -#include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" -#include "webrtc/modules/audio_processing/transient/wpd_node.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/transient/dyadic_decimator.h" +#include "modules/audio_processing/transient/wpd_node.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/transient/wpd_tree.h b/modules/audio_processing/transient/wpd_tree.h index a64055e7de..53fc06b294 100644 --- a/modules/audio_processing/transient/wpd_tree.h +++ b/modules/audio_processing/transient/wpd_tree.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ #include -#include "webrtc/modules/audio_processing/transient/wpd_node.h" +#include "modules/audio_processing/transient/wpd_node.h" namespace webrtc { @@ -89,4 +89,4 @@ class WPDTree { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ diff --git a/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc index 983d05dca1..a90af7766b 100644 --- a/modules/audio_processing/transient/wpd_tree_unittest.cc +++ b/modules/audio_processing/transient/wpd_tree_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/transient/wpd_tree.h" +#include "modules/audio_processing/transient/wpd_tree.h" #include #include #include -#include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" -#include "webrtc/modules/audio_processing/transient/file_utils.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" +#include "modules/audio_processing/transient/file_utils.h" +#include "system_wrappers/include/file_wrapper.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/typing_detection.cc b/modules/audio_processing/typing_detection.cc index 5f5ce0abaf..6e18124aad 100644 --- a/modules/audio_processing/typing_detection.cc +++ b/modules/audio_processing/typing_detection.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/typing_detection.h" +#include "modules/audio_processing/typing_detection.h" namespace webrtc { diff --git a/modules/audio_processing/typing_detection.h b/modules/audio_processing/typing_detection.h index 40608f885d..4e9a2b2cc1 100644 --- a/modules/audio_processing/typing_detection.h +++ b/modules/audio_processing/typing_detection.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ +#ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ +#define MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -90,4 +90,4 @@ class TypingDetection { } // namespace webrtc -#endif // #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ +#endif // #ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ diff --git a/modules/audio_processing/utility/block_mean_calculator.cc b/modules/audio_processing/utility/block_mean_calculator.cc index 37919f028a..3d766929c6 100644 --- a/modules/audio_processing/utility/block_mean_calculator.cc +++ b/modules/audio_processing/utility/block_mean_calculator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" +#include "modules/audio_processing/utility/block_mean_calculator.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/utility/block_mean_calculator.h b/modules/audio_processing/utility/block_mean_calculator.h index 3dd7d407af..cfa7cfbeba 100644 --- a/modules/audio_processing/utility/block_mean_calculator.h +++ b/modules/audio_processing/utility/block_mean_calculator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -49,4 +49,4 @@ class BlockMeanCalculator { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_ diff --git a/modules/audio_processing/utility/block_mean_calculator_unittest.cc b/modules/audio_processing/utility/block_mean_calculator_unittest.cc index 22e8f4997f..1f4ebf1b67 100644 --- a/modules/audio_processing/utility/block_mean_calculator_unittest.cc +++ b/modules/audio_processing/utility/block_mean_calculator_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/utility/block_mean_calculator.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/utility/delay_estimator.cc b/modules/audio_processing/utility/delay_estimator.cc index e01495ea69..871b541651 100644 --- a/modules/audio_processing/utility/delay_estimator.cc +++ b/modules/audio_processing/utility/delay_estimator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/delay_estimator.h" +#include "modules/audio_processing/utility/delay_estimator.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // Number of right shifts for scaling is linearly depending on number of bits in // the far-end binary spectrum. diff --git a/modules/audio_processing/utility/delay_estimator.h b/modules/audio_processing/utility/delay_estimator.h index 65c3f034ba..d283d09abf 100644 --- a/modules/audio_processing/utility/delay_estimator.h +++ b/modules/audio_processing/utility/delay_estimator.h @@ -11,10 +11,10 @@ // Performs delay estimation on binary converted spectra. // The return value is 0 - OK and -1 - Error, unless otherwise stated. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" static const int32_t kMaxBitCountsQ9 = (32 << 9); // 32 matching bits in Q9. @@ -248,4 +248,4 @@ void WebRtc_MeanEstimatorFix(int32_t new_value, int factor, int32_t* mean_value); -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ diff --git a/modules/audio_processing/utility/delay_estimator_internal.h b/modules/audio_processing/utility/delay_estimator_internal.h index fd11028fd6..7293d19496 100644 --- a/modules/audio_processing/utility/delay_estimator_internal.h +++ b/modules/audio_processing/utility/delay_estimator_internal.h @@ -10,11 +10,11 @@ // Header file including the delay estimator handle used for testing. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ -#include "webrtc/modules/audio_processing/utility/delay_estimator.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/utility/delay_estimator.h" +#include "typedefs.h" typedef union { float float_; @@ -45,4 +45,4 @@ typedef struct { BinaryDelayEstimator* binary_handle; } DelayEstimator; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ diff --git a/modules/audio_processing/utility/delay_estimator_unittest.cc b/modules/audio_processing/utility/delay_estimator_unittest.cc index f054b9c429..0ee14eca33 100644 --- a/modules/audio_processing/utility/delay_estimator_unittest.cc +++ b/modules/audio_processing/utility/delay_estimator_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/delay_estimator.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/utility/delay_estimator.h" +#include "modules/audio_processing/utility/delay_estimator_internal.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace { diff --git a/modules/audio_processing/utility/delay_estimator_wrapper.cc b/modules/audio_processing/utility/delay_estimator_wrapper.cc index afd07ac114..f907c80a35 100644 --- a/modules/audio_processing/utility/delay_estimator_wrapper.cc +++ b/modules/audio_processing/utility/delay_estimator_wrapper.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "modules/audio_processing/utility/delay_estimator_wrapper.h" #include #include -#include "webrtc/modules/audio_processing/utility/delay_estimator.h" -#include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/utility/delay_estimator.h" +#include "modules/audio_processing/utility/delay_estimator_internal.h" +#include "rtc_base/checks.h" // Only bit |kBandFirst| through bit |kBandLast| are processed and // |kBandFirst| - |kBandLast| must be < 32. diff --git a/modules/audio_processing/utility/delay_estimator_wrapper.h b/modules/audio_processing/utility/delay_estimator_wrapper.h index fdadebeb32..9598523cec 100644 --- a/modules/audio_processing/utility/delay_estimator_wrapper.h +++ b/modules/audio_processing/utility/delay_estimator_wrapper.h @@ -11,10 +11,10 @@ // Performs delay estimation on block by block basis. // The return value is 0 - OK and -1 - Error, unless otherwise stated. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // Releases the memory allocated by WebRtc_CreateDelayEstimatorFarend(...) void WebRtc_FreeDelayEstimatorFarend(void* handle); @@ -241,4 +241,4 @@ int WebRtc_last_delay(void* handle); // - delay_quality : >= 0 - Estimation quality of last calculated delay. float WebRtc_last_delay_quality(void* handle); -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ diff --git a/modules/audio_processing/utility/ooura_fft.cc b/modules/audio_processing/utility/ooura_fft.cc index 30f203480d..ff3e497582 100644 --- a/modules/audio_processing/utility/ooura_fft.cc +++ b/modules/audio_processing/utility/ooura_fft.cc @@ -21,13 +21,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing//utility/ooura_fft.h" +#include "modules/audio_processing//utility/ooura_fft.h" #include -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/utility/ooura_fft_tables_common.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft.h b/modules/audio_processing/utility/ooura_fft.h index a1b9f04f54..121809ae5e 100644 --- a/modules/audio_processing/utility/ooura_fft.h +++ b/modules/audio_processing/utility/ooura_fft.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -57,4 +57,4 @@ class OouraFft { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ diff --git a/modules/audio_processing/utility/ooura_fft_mips.cc b/modules/audio_processing/utility/ooura_fft_mips.cc index 3e9db6e7a1..2dc408844a 100644 --- a/modules/audio_processing/utility/ooura_fft_mips.cc +++ b/modules/audio_processing/utility/ooura_fft_mips.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/utility/ooura_fft.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/utility/ooura_fft_tables_common.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_neon.cc b/modules/audio_processing/utility/ooura_fft_neon.cc index 4ed043d518..401387a643 100644 --- a/modules/audio_processing/utility/ooura_fft_neon.cc +++ b/modules/audio_processing/utility/ooura_fft_neon.cc @@ -14,12 +14,12 @@ * Based on the sse2 version. */ -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/utility/ooura_fft.h" #include -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" +#include "modules/audio_processing/utility/ooura_fft_tables_common.h" +#include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_sse2.cc b/modules/audio_processing/utility/ooura_fft_sse2.cc index 03f6b31f0f..48a05c3bc2 100644 --- a/modules/audio_processing/utility/ooura_fft_sse2.cc +++ b/modules/audio_processing/utility/ooura_fft_sse2.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing//utility/ooura_fft.h" +#include "modules/audio_processing//utility/ooura_fft.h" #include -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_common.h" -#include "webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" +#include "modules/audio_processing/utility/ooura_fft_tables_common.h" +#include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_tables_common.h b/modules/audio_processing/utility/ooura_fft_tables_common.h index 548027cf22..47d076ea2a 100644 --- a/modules/audio_processing/utility/ooura_fft_tables_common.h +++ b/modules/audio_processing/utility/ooura_fft_tables_common.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/utility/ooura_fft.h" namespace webrtc { @@ -51,4 +51,4 @@ const float rdft_wk3ri_second[16] = { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_ diff --git a/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h b/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h index 1ed646d6f6..1c44ae7197 100644 --- a/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h +++ b/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ +#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ +#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ -#include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "modules/audio_processing/utility/ooura_fft.h" #ifdef _MSC_VER /* visual c++ */ #define ALIGN16_BEG __declspec(align(16)) @@ -91,4 +91,4 @@ ALIGN16_BEG const float ALIGN16_END cftmdl_wk1r[4] = { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ +#endif // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ diff --git a/modules/audio_processing/vad/common.h b/modules/audio_processing/vad/common.h index 4b7fb50f98..b5a5fb385b 100644 --- a/modules/audio_processing/vad/common.h +++ b/modules/audio_processing/vad/common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ +#define MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ #include @@ -26,4 +26,4 @@ struct AudioFeatures { bool silence; }; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_COMMON_H_ diff --git a/modules/audio_processing/vad/gmm.cc b/modules/audio_processing/vad/gmm.cc index 9651975913..8bfaec5d3f 100644 --- a/modules/audio_processing/vad/gmm.cc +++ b/modules/audio_processing/vad/gmm.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/gmm.h" +#include "modules/audio_processing/vad/gmm.h" #include #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/vad/gmm.h b/modules/audio_processing/vad/gmm.h index 9f3e578fef..93eb675c46 100644 --- a/modules/audio_processing/vad/gmm.h +++ b/modules/audio_processing/vad/gmm.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_GMM_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_GMM_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_GMM_H_ +#define MODULES_AUDIO_PROCESSING_VAD_GMM_H_ namespace webrtc { @@ -42,4 +42,4 @@ struct GmmParameters { double EvaluateGmm(const double* x, const GmmParameters& gmm_parameters); } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_GMM_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_GMM_H_ diff --git a/modules/audio_processing/vad/gmm_unittest.cc b/modules/audio_processing/vad/gmm_unittest.cc index 46785af12f..dfc8855a14 100644 --- a/modules/audio_processing/vad/gmm_unittest.cc +++ b/modules/audio_processing/vad/gmm_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/gmm.h" +#include "modules/audio_processing/vad/gmm.h" #include -#include "webrtc/modules/audio_processing/vad/noise_gmm_tables.h" -#include "webrtc/modules/audio_processing/vad/voice_gmm_tables.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/vad/noise_gmm_tables.h" +#include "modules/audio_processing/vad/voice_gmm_tables.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/vad/noise_gmm_tables.h b/modules/audio_processing/vad/noise_gmm_tables.h index 293af57a2a..c07dadebd5 100644 --- a/modules/audio_processing/vad/noise_gmm_tables.h +++ b/modules/audio_processing/vad/noise_gmm_tables.h @@ -10,8 +10,8 @@ // GMM tables for inactive segments. Generated by MakeGmmTables.m. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ +#define MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ static const int kNoiseGmmNumMixtures = 12; static const int kNoiseGmmDim = 3; @@ -82,4 +82,4 @@ static const double kNoiseGmmWeights[kNoiseGmmNumMixtures] = { -1.41311785780639e+01, -1.47171861448585e+01, -1.35963362781839e+01}; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_ diff --git a/modules/audio_processing/vad/pitch_based_vad.cc b/modules/audio_processing/vad/pitch_based_vad.cc index 6ef1e3946d..bca2552c35 100644 --- a/modules/audio_processing/vad/pitch_based_vad.cc +++ b/modules/audio_processing/vad/pitch_based_vad.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h" +#include "modules/audio_processing/vad/pitch_based_vad.h" #include #include -#include "webrtc/modules/audio_processing/vad/vad_circular_buffer.h" -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/audio_processing/vad/noise_gmm_tables.h" -#include "webrtc/modules/audio_processing/vad/voice_gmm_tables.h" -#include "webrtc/modules/include/module_common_types.h" +#include "modules/audio_processing/vad/vad_circular_buffer.h" +#include "modules/audio_processing/vad/common.h" +#include "modules/audio_processing/vad/noise_gmm_tables.h" +#include "modules/audio_processing/vad/voice_gmm_tables.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/audio_processing/vad/pitch_based_vad.h b/modules/audio_processing/vad/pitch_based_vad.h index 4fb0c55d62..7d71eceea8 100644 --- a/modules/audio_processing/vad/pitch_based_vad.h +++ b/modules/audio_processing/vad/pitch_based_vad.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ +#define MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ #include -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/audio_processing/vad/gmm.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/vad/common.h" +#include "modules/audio_processing/vad/gmm.h" +#include "typedefs.h" namespace webrtc { @@ -55,4 +55,4 @@ class PitchBasedVad { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ diff --git a/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/modules/audio_processing/vad/pitch_based_vad_unittest.cc index 5d82095135..fb6daa523e 100644 --- a/modules/audio_processing/vad/pitch_based_vad_unittest.cc +++ b/modules/audio_processing/vad/pitch_based_vad_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h" +#include "modules/audio_processing/vad/pitch_based_vad.h" #include #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/pitch_internal.cc b/modules/audio_processing/vad/pitch_internal.cc index 309b45acf5..7e6bd3e616 100644 --- a/modules/audio_processing/vad/pitch_internal.cc +++ b/modules/audio_processing/vad/pitch_internal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pitch_internal.h" +#include "modules/audio_processing/vad/pitch_internal.h" #include diff --git a/modules/audio_processing/vad/pitch_internal.h b/modules/audio_processing/vad/pitch_internal.h index b25b1a82a2..67e0522328 100644 --- a/modules/audio_processing/vad/pitch_internal.h +++ b/modules/audio_processing/vad/pitch_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ +#define MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ // TODO(turajs): Write a description of this function. Also be consistent with // usage of |sampling_rate_hz| vs |kSamplingFreqHz|. @@ -23,4 +23,4 @@ void GetSubframesPitchParameters(int sampling_rate_hz, double* log_pitch_gain, double* pitch_lag_hz); -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_ diff --git a/modules/audio_processing/vad/pitch_internal_unittest.cc b/modules/audio_processing/vad/pitch_internal_unittest.cc index 70124f85ac..c1fde10008 100644 --- a/modules/audio_processing/vad/pitch_internal_unittest.cc +++ b/modules/audio_processing/vad/pitch_internal_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pitch_internal.h" +#include "modules/audio_processing/vad/pitch_internal.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" TEST(PitchInternalTest, test) { const int kSamplingRateHz = 8000; diff --git a/modules/audio_processing/vad/pole_zero_filter.cc b/modules/audio_processing/vad/pole_zero_filter.cc index 9769515c57..fa56a3c15e 100644 --- a/modules/audio_processing/vad/pole_zero_filter.cc +++ b/modules/audio_processing/vad/pole_zero_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pole_zero_filter.h" +#include "modules/audio_processing/vad/pole_zero_filter.h" #include #include diff --git a/modules/audio_processing/vad/pole_zero_filter.h b/modules/audio_processing/vad/pole_zero_filter.h index bd13050a5c..1835e63c80 100644 --- a/modules/audio_processing/vad/pole_zero_filter.h +++ b/modules/audio_processing/vad/pole_zero_filter.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ +#define MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -49,4 +49,4 @@ class PoleZeroFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ diff --git a/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc index 71e7213434..aef07a6e44 100644 --- a/modules/audio_processing/vad/pole_zero_filter_unittest.cc +++ b/modules/audio_processing/vad/pole_zero_filter_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/pole_zero_filter.h" +#include "modules/audio_processing/vad/pole_zero_filter.h" #include #include #include -#include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_processing/vad/vad_audio_proc_internal.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad.cc b/modules/audio_processing/vad/standalone_vad.cc index 7848134215..9fcd55317e 100644 --- a/modules/audio_processing/vad/standalone_vad.cc +++ b/modules/audio_processing/vad/standalone_vad.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/standalone_vad.h" +#include "modules/audio_processing/vad/standalone_vad.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "audio/utility/audio_frame_operations.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad.h b/modules/audio_processing/vad/standalone_vad.h index 3cf1a42122..e8207e876d 100644 --- a/modules/audio_processing/vad/standalone_vad.h +++ b/modules/audio_processing/vad/standalone_vad.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ +#ifndef MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ +#define MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/vad/common.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "typedefs.h" namespace webrtc { @@ -66,4 +66,4 @@ class StandaloneVad { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ +#endif // MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ diff --git a/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc index 5ed39b8299..28d1349396 100644 --- a/modules/audio_processing/vad/standalone_vad_unittest.cc +++ b/modules/audio_processing/vad/standalone_vad_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/standalone_vad.h" +#include "modules/audio_processing/vad/standalone_vad.h" #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/vad_audio_proc.cc b/modules/audio_processing/vad/vad_audio_proc.cc index d5f6b3bcd7..b1841d0b21 100644 --- a/modules/audio_processing/vad/vad_audio_proc.cc +++ b/modules/audio_processing/vad/vad_audio_proc.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h" +#include "modules/audio_processing/vad/vad_audio_proc.h" #include #include -#include "webrtc/common_audio/fft4g.h" -#include "webrtc/modules/audio_processing/vad/pitch_internal.h" -#include "webrtc/modules/audio_processing/vad/pole_zero_filter.h" -#include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h" -#include "webrtc/rtc_base/checks.h" +#include "common_audio/fft4g.h" +#include "modules/audio_processing/vad/pitch_internal.h" +#include "modules/audio_processing/vad/pole_zero_filter.h" +#include "modules/audio_processing/vad/vad_audio_proc_internal.h" +#include "rtc_base/checks.h" extern "C" { -#include "webrtc/modules/audio_coding/codecs/isac/main/source/codec.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h" -#include "webrtc/modules/audio_coding/codecs/isac/main/source/structs.h" +#include "modules/audio_coding/codecs/isac/main/source/codec.h" +#include "modules/audio_coding/codecs/isac/main/source/lpc_analysis.h" +#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h" +#include "modules/audio_coding/codecs/isac/main/source/structs.h" } -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/audio_processing/vad/vad_audio_proc.h b/modules/audio_processing/vad/vad_audio_proc.h index 1f27b294e5..ea1ab64006 100644 --- a/modules/audio_processing/vad/vad_audio_proc.h +++ b/modules/audio_processing/vad/vad_audio_proc.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ +#define MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ #include -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/typedefs.h" +#include "modules/audio_processing/vad/common.h" +#include "typedefs.h" namespace webrtc { @@ -90,4 +90,4 @@ class VadAudioProc { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ diff --git a/modules/audio_processing/vad/vad_audio_proc_internal.h b/modules/audio_processing/vad/vad_audio_proc_internal.h index 45586b9be6..ab1e63651f 100644 --- a/modules/audio_processing/vad/vad_audio_proc_internal.h +++ b/modules/audio_processing/vad/vad_audio_proc_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_ +#define MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_ namespace webrtc { @@ -91,4 +91,4 @@ static_assert(kFilterOrder + 1 == } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROCESSING_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROCESSING_H_ diff --git a/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc index 65b516a7c5..c520257f8e 100644 --- a/modules/audio_processing/vad/vad_audio_proc_unittest.cc +++ b/modules/audio_processing/vad/vad_audio_proc_unittest.cc @@ -12,17 +12,17 @@ // routines. However, interpolation of pitch-gain and lags is in a separate // class and has its own unit-test. -#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h" +#include "modules/audio_processing/vad/vad_audio_proc.h" #include #include #include -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/audio_processing/vad/common.h" +#include "modules/include/module_common_types.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/vad_circular_buffer.cc b/modules/audio_processing/vad/vad_circular_buffer.cc index 22d5deadb2..3c4d5ad0e0 100644 --- a/modules/audio_processing/vad/vad_circular_buffer.cc +++ b/modules/audio_processing/vad/vad_circular_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/vad_circular_buffer.h" +#include "modules/audio_processing/vad/vad_circular_buffer.h" #include diff --git a/modules/audio_processing/vad/vad_circular_buffer.h b/modules/audio_processing/vad/vad_circular_buffer.h index cfa6977a76..46b03d49bf 100644 --- a/modules/audio_processing/vad/vad_circular_buffer.h +++ b/modules/audio_processing/vad/vad_circular_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ +#define MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ #include @@ -66,4 +66,4 @@ class VadCircularBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_ diff --git a/modules/audio_processing/vad/vad_circular_buffer_unittest.cc b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc index 5291ff8d8b..efbd70d9d9 100644 --- a/modules/audio_processing/vad/vad_circular_buffer_unittest.cc +++ b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/vad_circular_buffer.h" +#include "modules/audio_processing/vad/vad_circular_buffer.h" #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/vad/voice_activity_detector.cc b/modules/audio_processing/vad/voice_activity_detector.cc index 8942a03c3c..dfba73bce8 100644 --- a/modules/audio_processing/vad/voice_activity_detector.cc +++ b/modules/audio_processing/vad/voice_activity_detector.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" +#include "modules/audio_processing/vad/voice_activity_detector.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/vad/voice_activity_detector.h b/modules/audio_processing/vad/voice_activity_detector.h index 5fb5e59794..c937bbb5ff 100644 --- a/modules/audio_processing/vad/voice_activity_detector.h +++ b/modules/audio_processing/vad/voice_activity_detector.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ +#define MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ #include #include -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h" -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h" -#include "webrtc/modules/audio_processing/vad/standalone_vad.h" +#include "common_audio/resampler/include/resampler.h" +#include "modules/audio_processing/vad/vad_audio_proc.h" +#include "modules/audio_processing/vad/common.h" +#include "modules/audio_processing/vad/pitch_based_vad.h" +#include "modules/audio_processing/vad/standalone_vad.h" namespace webrtc { @@ -68,4 +68,4 @@ class VoiceActivityDetector { } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ diff --git a/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/modules/audio_processing/vad/voice_activity_detector_unittest.cc index d43b1352d7..62eda2bd3d 100644 --- a/modules/audio_processing/vad/voice_activity_detector_unittest.cc +++ b/modules/audio_processing/vad/voice_activity_detector_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" +#include "modules/audio_processing/vad/voice_activity_detector.h" #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/vad/voice_gmm_tables.h b/modules/audio_processing/vad/voice_gmm_tables.h index 2f247c3798..29cc7d6cb2 100644 --- a/modules/audio_processing/vad/voice_gmm_tables.h +++ b/modules/audio_processing/vad/voice_gmm_tables.h @@ -10,8 +10,8 @@ // GMM tables for active segments. Generated by MakeGmmTables.m. -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ +#ifndef MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ +#define MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ static const int kVoiceGmmNumMixtures = 12; static const int kVoiceGmmDim = 3; @@ -82,4 +82,4 @@ static const double kVoiceGmmWeights[kVoiceGmmNumMixtures] = { -1.83207938586818e+01, -1.31186044948288e+01, -9.52479998673554e+00}; -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ +#endif // MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_ diff --git a/modules/audio_processing/voice_detection_impl.cc b/modules/audio_processing/voice_detection_impl.cc index 9c9e0916d1..5ee0c7b9c2 100644 --- a/modules/audio_processing/voice_detection_impl.cc +++ b/modules/audio_processing/voice_detection_impl.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/voice_detection_impl.h" +#include "modules/audio_processing/voice_detection_impl.h" -#include "webrtc/common_audio/vad/include/webrtc_vad.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_audio/vad/include/webrtc_vad.h" +#include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class VoiceDetectionImpl::Vad { diff --git a/modules/audio_processing/voice_detection_impl.h b/modules/audio_processing/voice_detection_impl.h index 683c425a96..4b724bdd25 100644 --- a/modules/audio_processing/voice_detection_impl.h +++ b/modules/audio_processing/voice_detection_impl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ +#ifndef MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ +#define MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -55,4 +55,4 @@ class VoiceDetectionImpl : public VoiceDetection { }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ +#endif // MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ diff --git a/modules/audio_processing/voice_detection_unittest.cc b/modules/audio_processing/voice_detection_unittest.cc index c4ccd827cd..663913b638 100644 --- a/modules/audio_processing/voice_detection_unittest.cc +++ b/modules/audio_processing/voice_detection_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" -#include "webrtc/modules/audio_processing/test/bitexactness_tools.h" -#include "webrtc/modules/audio_processing/voice_detection_impl.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/test/audio_buffer_tools.h" +#include "modules/audio_processing/test/bitexactness_tools.h" +#include "modules/audio_processing/voice_detection_impl.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/bitrate_controller/DEPS b/modules/bitrate_controller/DEPS index f84eb8d531..01a45e7ba1 100644 --- a/modules/bitrate_controller/DEPS +++ b/modules/bitrate_controller/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+webrtc/call", - "+webrtc/logging/rtc_event_log", - "+webrtc/system_wrappers", + "+call", + "+logging/rtc_event_log", + "+system_wrappers", ] diff --git a/modules/bitrate_controller/bitrate_controller_impl.cc b/modules/bitrate_controller/bitrate_controller_impl.cc index dc8805f39e..1a51dece92 100644 --- a/modules/bitrate_controller/bitrate_controller_impl.cc +++ b/modules/bitrate_controller/bitrate_controller_impl.cc @@ -9,15 +9,15 @@ * */ -#include "webrtc/modules/bitrate_controller/bitrate_controller_impl.h" +#include "modules/bitrate_controller/bitrate_controller_impl.h" #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/bitrate_controller/bitrate_controller_impl.h b/modules/bitrate_controller/bitrate_controller_impl.h index 0934fa2d10..1bcb6ead0a 100644 --- a/modules/bitrate_controller/bitrate_controller_impl.h +++ b/modules/bitrate_controller/bitrate_controller_impl.h @@ -12,19 +12,19 @@ * and push the result to the encoder via VideoEncoderCallback. */ -#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ -#define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ +#ifndef MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ +#define MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" #include #include #include #include -#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -105,4 +105,4 @@ class BitrateControllerImpl : public BitrateController { RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl); }; } // namespace webrtc -#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ +#endif // MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ diff --git a/modules/bitrate_controller/bitrate_controller_unittest.cc b/modules/bitrate_controller/bitrate_controller_unittest.cc index a01299861b..ab9928fc84 100644 --- a/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/mock/mock_paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/pacing/mock/mock_paced_sender.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "test/field_trial.h" +#include "test/gtest.h" using ::testing::Exactly; using ::testing::Return; diff --git a/modules/bitrate_controller/include/bitrate_controller.h b/modules/bitrate_controller/include/bitrate_controller.h index f479e52d76..52347a3974 100644 --- a/modules/bitrate_controller/include/bitrate_controller.h +++ b/modules/bitrate_controller/include/bitrate_controller.h @@ -12,15 +12,15 @@ * and push the result to the encoders via BitrateObserver(s). */ -#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ -#define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ +#ifndef MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ +#define MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ #include -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/include/module.h" +#include "modules/pacing/paced_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { @@ -97,4 +97,4 @@ class BitrateController : public Module, public RtcpBandwidthObserver { int64_t* rtt) = 0; }; } // namespace webrtc -#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ +#endif // MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ diff --git a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h index d4a12ec6e7..4207b7498f 100644 --- a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h +++ b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ -#define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ +#ifndef MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ +#define MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/test/gmock.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -51,4 +51,4 @@ class MockBitrateController : public BitrateController { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ +#endif // MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc index 6def9ba480..5ce7a5ca8a 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" #include #include #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.h b/modules/bitrate_controller/send_side_bandwidth_estimation.h index 27df7e5a08..59d1c3280d 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.h +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.h @@ -10,14 +10,14 @@ * FEC and NACK added bitrate is handled outside class */ -#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ -#define WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ +#ifndef MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ +#define MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { @@ -104,4 +104,4 @@ class SendSideBandwidthEstimation { uint32_t bitrate_threshold_bps_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ +#endif // MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc index c4aa435669..e49d861215 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" -#include "webrtc/test/gtest.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/DEPS b/modules/congestion_controller/DEPS index 1bff84528f..2ed9952e22 100644 --- a/modules/congestion_controller/DEPS +++ b/modules/congestion_controller/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+webrtc/logging/rtc_event_log", - "+webrtc/system_wrappers", - "+webrtc/video", + "+logging/rtc_event_log", + "+system_wrappers", + "+video", ] diff --git a/modules/congestion_controller/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/acknowledged_bitrate_estimator.cc index b150734df1..223c4769e6 100644 --- a/modules/congestion_controller/acknowledged_bitrate_estimator.cc +++ b/modules/congestion_controller/acknowledged_bitrate_estimator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/congestion_controller/acknowledged_bitrate_estimator.h b/modules/congestion_controller/acknowledged_bitrate_estimator.h index 491acb67c3..72c1023044 100644 --- a/modules/congestion_controller/acknowledged_bitrate_estimator.h +++ b/modules/congestion_controller/acknowledged_bitrate_estimator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/congestion_controller/bitrate_estimator.h" +#include "api/optional.h" +#include "modules/congestion_controller/bitrate_estimator.h" namespace webrtc { @@ -41,4 +41,4 @@ class AcknowledgedBitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc index 70ce0c1d01..d7bf736781 100644 --- a/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::NiceMock; diff --git a/modules/congestion_controller/bitrate_estimator.cc b/modules/congestion_controller/bitrate_estimator.cc index 1627bf84be..482667d802 100644 --- a/modules/congestion_controller/bitrate_estimator.cc +++ b/modules/congestion_controller/bitrate_estimator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/bitrate_estimator.h" +#include "modules/congestion_controller/bitrate_estimator.h" #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { diff --git a/modules/congestion_controller/bitrate_estimator.h b/modules/congestion_controller/bitrate_estimator.h index ad7bef5fc2..2fa1515d19 100644 --- a/modules/congestion_controller/bitrate_estimator.h +++ b/modules/congestion_controller/bitrate_estimator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -43,4 +43,4 @@ class BitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/congestion_controller_unittests_helper.cc b/modules/congestion_controller/congestion_controller_unittests_helper.cc index 4fb1130f50..2ec54171c8 100644 --- a/modules/congestion_controller/congestion_controller_unittests_helper.cc +++ b/modules/congestion_controller/congestion_controller_unittests_helper.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" +#include "modules/congestion_controller/congestion_controller_unittests_helper.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { void ComparePacketFeedbackVectors(const std::vector& truth, diff --git a/modules/congestion_controller/congestion_controller_unittests_helper.h b/modules/congestion_controller/congestion_controller_unittests_helper.h index 474e9a7da6..37e3870d3e 100644 --- a/modules/congestion_controller/congestion_controller_unittests_helper.h +++ b/modules/congestion_controller/congestion_controller_unittests_helper.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ +#define MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { void ComparePacketFeedbackVectors(const std::vector& truth, const std::vector& input); } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_CONGESTION_CONTROLLER_UNITTESTS_HELPER_H_ diff --git a/modules/congestion_controller/delay_based_bwe.cc b/modules/congestion_controller/delay_based_bwe.cc index dd59b8a81b..adafb31381 100644 --- a/modules/congestion_controller/delay_based_bwe.cc +++ b/modules/congestion_controller/delay_based_bwe.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/delay_based_bwe.h" #include #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/typedefs.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/pacing/paced_sender.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" +#include "typedefs.h" namespace { constexpr int kTimestampGroupLengthMs = 5; diff --git a/modules/congestion_controller/delay_based_bwe.h b/modules/congestion_controller/delay_based_bwe.h index 52c227f672..c0820e1142 100644 --- a/modules/congestion_controller/delay_based_bwe.h +++ b/modules/congestion_controller/delay_based_bwe.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ +#define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ #include #include #include -#include "webrtc/modules/congestion_controller/median_slope_estimator.h" -#include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" -#include "webrtc/modules/congestion_controller/trendline_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/race_checker.h" +#include "modules/congestion_controller/median_slope_estimator.h" +#include "modules/congestion_controller/probe_bitrate_estimator.h" +#include "modules/congestion_controller/trendline_estimator.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/overuse_estimator.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/race_checker.h" namespace webrtc { @@ -94,4 +94,4 @@ class DelayBasedBwe { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ +#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ diff --git a/modules/congestion_controller/delay_based_bwe_unittest.cc b/modules/congestion_controller/delay_based_bwe_unittest.cc index a4513685ec..311e8e8266 100644 --- a/modules/congestion_controller/delay_based_bwe_unittest.cc +++ b/modules/congestion_controller/delay_based_bwe_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/delay_based_bwe_unittest_helper.h" +#include "modules/pacing/paced_sender.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/delay_based_bwe_unittest_helper.cc index 9a86d9fe72..b441e998cd 100644 --- a/modules/congestion_controller/delay_based_bwe_unittest_helper.cc +++ b/modules/congestion_controller/delay_based_bwe_unittest_helper.cc @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h" +#include "modules/congestion_controller/delay_based_bwe_unittest_helper.h" #include #include #include -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/delay_based_bwe_unittest_helper.h index 2210a2e95e..23969a92ae 100644 --- a/modules/congestion_controller/delay_based_bwe_unittest_helper.h +++ b/modules/congestion_controller/delay_based_bwe_unittest_helper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ #include #include @@ -17,12 +17,12 @@ #include #include -#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace test { @@ -175,4 +175,4 @@ class DelayBasedBweTest : public ::testing::Test { }; } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ diff --git a/modules/congestion_controller/include/mock/mock_congestion_observer.h b/modules/congestion_controller/include/mock/mock_congestion_observer.h index 5433f2957a..c6883d976b 100644 --- a/modules/congestion_controller/include/mock/mock_congestion_observer.h +++ b/modules/congestion_controller/include/mock/mock_congestion_observer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ +#define MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/test/gmock.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -28,4 +28,4 @@ class MockCongestionObserver : public SendSideCongestionController::Observer { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_ diff --git a/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h b/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h index 899a960109..6ec7bb1b6e 100644 --- a/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h +++ b/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/test/gmock.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -36,4 +36,4 @@ class MockSendSideCongestionController : public SendSideCongestionController { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_SEND_SIDE_CONGESTION_CONTROLLER_H_ diff --git a/modules/congestion_controller/include/receive_side_congestion_controller.h b/modules/congestion_controller/include/receive_side_congestion_controller.h index 2960729b0a..a4b593ae88 100644 --- a/modules/congestion_controller/include/receive_side_congestion_controller.h +++ b/modules/congestion_controller/include/receive_side_congestion_controller.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ #include #include -#include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/remote_bitrate_estimator/remote_estimator_proxy.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { class RemoteBitrateEstimator; @@ -101,4 +101,4 @@ class ReceiveSideCongestionController : public CallStatsObserver, } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_RECEIVE_SIDE_CONGESTION_CONTROLLER_H_ diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index b85b5111a4..77bdf3784e 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/race_checker.h" +#include "common_types.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/transport_feedback_adapter.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" +#include "modules/pacing/paced_sender.h" +#include "modules/pacing/packet_router.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/race_checker.h" namespace rtc { struct SentPacket; @@ -159,4 +159,4 @@ class SendSideCongestionController : public CallStatsObserver, } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ diff --git a/modules/congestion_controller/median_slope_estimator.cc b/modules/congestion_controller/median_slope_estimator.cc index ad5133b72f..ea76239577 100644 --- a/modules/congestion_controller/median_slope_estimator.cc +++ b/modules/congestion_controller/median_slope_estimator.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/median_slope_estimator.h" +#include "modules/congestion_controller/median_slope_estimator.h" #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/median_slope_estimator.h b/modules/congestion_controller/median_slope_estimator.h index c2c1b7d12e..f837b24a21 100644 --- a/modules/congestion_controller/median_slope_estimator.h +++ b/modules/congestion_controller/median_slope_estimator.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ #include #include @@ -16,8 +16,8 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/numerics/percentile_filter.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/numerics/percentile_filter.h" namespace webrtc { @@ -69,4 +69,4 @@ class MedianSlopeEstimator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/median_slope_estimator_unittest.cc b/modules/congestion_controller/median_slope_estimator_unittest.cc index 4dabd50e5c..a5b90d8c35 100644 --- a/modules/congestion_controller/median_slope_estimator_unittest.cc +++ b/modules/congestion_controller/median_slope_estimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/median_slope_estimator.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/median_slope_estimator.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/probe_bitrate_estimator.cc b/modules/congestion_controller/probe_bitrate_estimator.cc index 8fa22e7dcd..75e0ff7c47 100644 --- a/modules/congestion_controller/probe_bitrate_estimator.cc +++ b/modules/congestion_controller/probe_bitrate_estimator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" +#include "modules/congestion_controller/probe_bitrate_estimator.h" #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace { // The minumum number of probes we need to receive feedback about in percent diff --git a/modules/congestion_controller/probe_bitrate_estimator.h b/modules/congestion_controller/probe_bitrate_estimator.h index 1666a1a584..bb8a7ed534 100644 --- a/modules/congestion_controller/probe_bitrate_estimator.h +++ b/modules/congestion_controller/probe_bitrate_estimator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { class RtcEventLog; @@ -52,4 +52,4 @@ class ProbeBitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc index 7aa3f451b8..6d21de449d 100644 --- a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" +#include "modules/congestion_controller/probe_bitrate_estimator.h" #include #include -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/probe_controller.cc b/modules/congestion_controller/probe_controller.cc index 24ce7d42c3..0ee0c8f3e9 100644 --- a/modules/congestion_controller/probe_controller.cc +++ b/modules/congestion_controller/probe_controller.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/probe_controller.h" +#include "modules/congestion_controller/probe_controller.h" #include #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/congestion_controller/probe_controller.h b/modules/congestion_controller/probe_controller.h index 7a23360d85..70662fa00f 100644 --- a/modules/congestion_controller/probe_controller.h +++ b/modules/congestion_controller/probe_controller.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "common_types.h" +#include "modules/pacing/paced_sender.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -91,4 +91,4 @@ class ProbeController { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ diff --git a/modules/congestion_controller/probe_controller_unittest.cc b/modules/congestion_controller/probe_controller_unittest.cc index e0a040f3a1..e09d8415c6 100644 --- a/modules/congestion_controller/probe_controller_unittest.cc +++ b/modules/congestion_controller/probe_controller_unittest.cc @@ -9,12 +9,12 @@ */ #include -#include "webrtc/modules/congestion_controller/probe_controller.h" -#include "webrtc/modules/pacing/mock/mock_paced_sender.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/probe_controller.h" +#include "modules/pacing/mock/mock_paced_sender.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::AtLeast; diff --git a/modules/congestion_controller/receive_side_congestion_controller.cc b/modules/congestion_controller/receive_side_congestion_controller.cc index 3224906974..23610dee11 100644 --- a/modules/congestion_controller/receive_side_congestion_controller.cc +++ b/modules/congestion_controller/receive_side_congestion_controller.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" +#include "modules/congestion_controller/include/receive_side_congestion_controller.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/pacing/packet_router.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc index 8ee8a884c8..4b5a66fb0f 100644 --- a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc +++ b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/include/receive_side_congestion_controller.h" +#include "modules/pacing/packet_router.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::AtLeast; diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index fee49902c5..6014164edc 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" #include #include #include -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" -#include "webrtc/modules/congestion_controller/probe_controller.h" -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/probe_controller.h" +#include "modules/pacing/alr_detector.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/rate_limiter.h" +#include "rtc_base/socket.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { diff --git a/modules/congestion_controller/send_side_congestion_controller_unittest.cc b/modules/congestion_controller/send_side_congestion_controller_unittest.cc index 07c0e39fc0..10fedfb2c0 100644 --- a/modules/congestion_controller/send_side_congestion_controller_unittest.cc +++ b/modules/congestion_controller/send_side_congestion_controller_unittest.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" -#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_observer.h" -#include "webrtc/modules/pacing/mock/mock_paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/congestion_controller/congestion_controller_unittests_helper.h" +#include "modules/congestion_controller/include/mock/mock_congestion_observer.h" +#include "modules/pacing/mock/mock_paced_sender.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/socket.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::AtLeast; diff --git a/modules/congestion_controller/transport_feedback_adapter.cc b/modules/congestion_controller/transport_feedback_adapter.cc index 918b9c5b0e..100c286f55 100644 --- a/modules/congestion_controller/transport_feedback_adapter.cc +++ b/modules/congestion_controller/transport_feedback_adapter.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" +#include "modules/congestion_controller/transport_feedback_adapter.h" #include -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/mod_ops.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/mod_ops.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/congestion_controller/transport_feedback_adapter.h b/modules/congestion_controller/transport_feedback_adapter.h index 4d4b4077ce..008bab87f1 100644 --- a/modules/congestion_controller/transport_feedback_adapter.h +++ b/modules/congestion_controller/transport_feedback_adapter.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ +#define MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/remote_bitrate_estimator/include/send_time_history.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -79,4 +79,4 @@ class TransportFeedbackAdapter { } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ diff --git a/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/transport_feedback_adapter_unittest.cc index 3479814cde..49bbbfdb4b 100644 --- a/modules/congestion_controller/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/transport_feedback_adapter_unittest.cc @@ -12,16 +12,16 @@ #include #include -#include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h" -#include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" -#include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/bitrate_controller/include/mock/mock_bitrate_controller.h" +#include "modules/congestion_controller/congestion_controller_unittests_helper.h" +#include "modules/congestion_controller/transport_feedback_adapter.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::Invoke; diff --git a/modules/congestion_controller/trendline_estimator.cc b/modules/congestion_controller/trendline_estimator.cc index e51d4fb137..1489257600 100644 --- a/modules/congestion_controller/trendline_estimator.cc +++ b/modules/congestion_controller/trendline_estimator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/trendline_estimator.h" +#include "modules/congestion_controller/trendline_estimator.h" #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/checks.h" +#include "api/optional.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/congestion_controller/trendline_estimator.h b/modules/congestion_controller/trendline_estimator.h index 9e4655822d..7ee27cdd5d 100644 --- a/modules/congestion_controller/trendline_estimator.h +++ b/modules/congestion_controller/trendline_estimator.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ -#define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ #include #include @@ -16,7 +16,7 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -68,4 +68,4 @@ class TrendlineEstimator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/trendline_estimator_unittest.cc b/modules/congestion_controller/trendline_estimator_unittest.cc index 6f541ca5d7..e44f5032b0 100644 --- a/modules/congestion_controller/trendline_estimator_unittest.cc +++ b/modules/congestion_controller/trendline_estimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/trendline_estimator.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/congestion_controller/trendline_estimator.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/DEPS b/modules/desktop_capture/DEPS index 43c844105b..3314b8cdfd 100644 --- a/modules/desktop_capture/DEPS +++ b/modules/desktop_capture/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+webrtc/system_wrappers", + "+system_wrappers", "+third_party/libyuv", ] diff --git a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc index 4f88d94b09..722f5dc53a 100644 --- a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc +++ b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h index 0501cae14e..c76ceea3f7 100644 --- a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h +++ b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ +#define MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/rgba_color.h" namespace webrtc { @@ -71,4 +71,4 @@ class BlankDetectorDesktopCapturerWrapper final } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ +#endif // MODULES_DESKTOP_CAPTURE_BLANK_DETECTOR_DESKTOP_CAPTURER_WRAPPER_H_ diff --git a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc index bce82ddc25..f9cfee026f 100644 --- a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc +++ b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_frame_generator.h" -#include "webrtc/modules/desktop_capture/fake_desktop_capturer.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame_generator.h" +#include "modules/desktop_capture/fake_desktop_capturer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/cropped_desktop_frame.cc b/modules/desktop_capture/cropped_desktop_frame.cc index a76a3e7efb..c7ada7b61f 100644 --- a/modules/desktop_capture/cropped_desktop_frame.cc +++ b/modules/desktop_capture/cropped_desktop_frame.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" +#include "modules/desktop_capture/cropped_desktop_frame.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/desktop_capture/cropped_desktop_frame.h b/modules/desktop_capture/cropped_desktop_frame.h index 107fe7f4ca..f6cac6c7a2 100644 --- a/modules/desktop_capture/cropped_desktop_frame.h +++ b/modules/desktop_capture/cropped_desktop_frame.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ +#ifndef MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ +#define MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ -#include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" namespace webrtc { @@ -26,5 +26,5 @@ std::unique_ptr CreateCroppedDesktopFrame( } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ +#endif // MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ diff --git a/modules/desktop_capture/cropped_desktop_frame_unittest.cc b/modules/desktop_capture/cropped_desktop_frame_unittest.cc index 36c51d75c9..d15f207dea 100644 --- a/modules/desktop_capture/cropped_desktop_frame_unittest.cc +++ b/modules/desktop_capture/cropped_desktop_frame_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/cropped_desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "rtc_base/ptr_util.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/cropping_window_capturer.cc b/modules/desktop_capture/cropping_window_capturer.cc index 494047dd03..bae5106d47 100644 --- a/modules/desktop_capture/cropping_window_capturer.cc +++ b/modules/desktop_capture/cropping_window_capturer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/cropping_window_capturer.h" +#include "modules/desktop_capture/cropping_window_capturer.h" -#include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/cropped_desktop_frame.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/cropping_window_capturer.h b/modules/desktop_capture/cropping_window_capturer.h index 3542fbdb5f..9fbfddaa81 100644 --- a/modules/desktop_capture/cropping_window_capturer.h +++ b/modules/desktop_capture/cropping_window_capturer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ +#define MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" namespace webrtc { @@ -75,5 +75,5 @@ class CroppingWindowCapturer : public DesktopCapturer, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ +#endif // MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ diff --git a/modules/desktop_capture/cropping_window_capturer_win.cc b/modules/desktop_capture/cropping_window_capturer_win.cc index 5730e43d56..fc58697003 100644 --- a/modules/desktop_capture/cropping_window_capturer_win.cc +++ b/modules/desktop_capture/cropping_window_capturer_win.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/cropping_window_capturer.h" +#include "modules/desktop_capture/cropping_window_capturer.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/window_capture_utils.h" +#include "rtc_base/logging.h" +#include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_and_cursor_composer.cc b/modules/desktop_capture/desktop_and_cursor_composer.cc index 4948dc459e..bc46a5c528 100644 --- a/modules/desktop_capture/desktop_and_cursor_composer.cc +++ b/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" +#include "modules/desktop_capture/desktop_and_cursor_composer.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_and_cursor_composer.h b/modules/desktop_capture/desktop_and_cursor_composer.h index 1d685bb4eb..c88075a986 100644 --- a/modules/desktop_capture/desktop_and_cursor_composer.h +++ b/modules/desktop_capture/desktop_and_cursor_composer.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -96,4 +96,4 @@ class DesktopAndCursorComposer : public DesktopCapturer, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ diff --git a/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc index fe75bb5c97..0725facfcb 100644 --- a/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc +++ b/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_and_cursor_composer.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capture_options.cc b/modules/desktop_capture/desktop_capture_options.cc index 88986d4ff9..8a33807bb3 100644 --- a/modules/desktop_capture/desktop_capture_options.cc +++ b/modules/desktop_capture/desktop_capture_options.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_options.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capture_options.h b/modules/desktop_capture/desktop_capture_options.h index 8956275838..fec5ff0ac5 100644 --- a/modules/desktop_capture/desktop_capture_options.h +++ b/modules/desktop_capture/desktop_capture_options.h @@ -7,19 +7,19 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" #if defined(USE_X11) -#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" +#include "modules/desktop_capture/x11/shared_x_display.h" #endif #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) -#include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" +#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" +#include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #endif namespace webrtc { @@ -139,4 +139,4 @@ class DesktopCaptureOptions { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ diff --git a/modules/desktop_capture/desktop_capture_types.h b/modules/desktop_capture/desktop_capture_types.h index 46346b0077..38117a3c56 100644 --- a/modules/desktop_capture/desktop_capture_types.h +++ b/modules/desktop_capture/desktop_capture_types.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -56,4 +56,4 @@ namespace DesktopCapturerId { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_ diff --git a/modules/desktop_capture/desktop_capturer.cc b/modules/desktop_capture/desktop_capturer.cc index 67d3520103..166d97cc52 100644 --- a/modules/desktop_capture/desktop_capturer.cc +++ b/modules/desktop_capture/desktop_capturer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer_differ_wrapper.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capturer.h b/modules/desktop_capture/desktop_capturer.h index 4f44ce1e46..335427af23 100644 --- a/modules/desktop_capture/desktop_capturer.h +++ b/modules/desktop_capture/desktop_capturer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ #include #include @@ -19,9 +19,9 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { @@ -151,5 +151,5 @@ class DesktopCapturer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_H_ diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc index 3bf4c5343a..087ee4fc03 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h" +#include "modules/desktop_capture/desktop_capturer_differ_wrapper.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/differ_block.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/differ_block.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper.h b/modules/desktop_capture/desktop_capturer_differ_wrapper.h index 1d037a125b..39e1fafc77 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper.h +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/shared_desktop_frame.h" namespace webrtc { @@ -59,4 +59,4 @@ class DesktopCapturerDifferWrapper : public DesktopCapturer, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_ diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc index fbd24770e4..5a0c9d8da2 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h" +#include "modules/desktop_capture/desktop_capturer_differ_wrapper.h" #include #include #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/differ_block.h" -#include "webrtc/modules/desktop_capture/fake_desktop_capturer.h" -#include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/differ_block.h" +#include "modules/desktop_capture/fake_desktop_capturer.h" +#include "modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "rtc_base/random.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/cpu_features_wrapper.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame.cc b/modules/desktop_capture/desktop_frame.cc index efedc03a92..5a62d4d9cc 100644 --- a/modules/desktop_capture/desktop_frame.cc +++ b/modules/desktop_capture/desktop_frame.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame.h b/modules/desktop_capture/desktop_frame.h index 12f7a6d935..27fe24d465 100644 --- a/modules/desktop_capture/desktop_frame.h +++ b/modules/desktop_capture/desktop_frame.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/shared_memory.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -184,5 +184,5 @@ class SharedMemoryDesktopFrame : public DesktopFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ diff --git a/modules/desktop_capture/desktop_frame_generator.cc b/modules/desktop_capture/desktop_frame_generator.cc index 7bb58974ff..9c5640b7ff 100644 --- a/modules/desktop_capture/desktop_frame_generator.cc +++ b/modules/desktop_capture/desktop_frame_generator.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_frame_generator.h" +#include "modules/desktop_capture/desktop_frame_generator.h" #include #include #include -#include "webrtc/modules/desktop_capture/rgba_color.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/rgba_color.h" +#include "rtc_base/random.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_generator.h b/modules/desktop_capture/desktop_frame_generator.h index 2b767dcb4d..c8ac5a9aed 100644 --- a/modules/desktop_capture/desktop_frame_generator.h +++ b/modules/desktop_capture/desktop_frame_generator.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { @@ -118,4 +118,4 @@ class BlackWhiteDesktopFramePainter final : public DesktopFramePainter { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_GENERATOR_H_ diff --git a/modules/desktop_capture/desktop_frame_rotation.cc b/modules/desktop_capture/desktop_frame_rotation.cc index 000f6ae5af..7cf0348e4c 100644 --- a/modules/desktop_capture/desktop_frame_rotation.cc +++ b/modules/desktop_capture/desktop_frame_rotation.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_frame_rotation.h" +#include "modules/desktop_capture/desktop_frame_rotation.h" #include #include "third_party/libyuv/include/libyuv/rotate_argb.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_rotation.h b/modules/desktop_capture/desktop_frame_rotation.h index c0024aaf21..72bb1a651f 100644 --- a/modules/desktop_capture/desktop_frame_rotation.h +++ b/modules/desktop_capture/desktop_frame_rotation.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -49,4 +49,4 @@ DesktopRect RotateRect(DesktopRect rect, DesktopSize size, Rotation rotation); } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_ROTATION_H_ diff --git a/modules/desktop_capture/desktop_frame_rotation_unittest.cc b/modules/desktop_capture/desktop_frame_rotation_unittest.cc index 864559e516..e31f47207a 100644 --- a/modules/desktop_capture/desktop_frame_rotation_unittest.cc +++ b/modules/desktop_capture/desktop_frame_rotation_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_frame_rotation.h" +#include "modules/desktop_capture/desktop_frame_rotation.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/test_utils.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/test_utils.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_win.cc b/modules/desktop_capture/desktop_frame_win.cc index c694f55b31..a6cc52b887 100644 --- a/modules/desktop_capture/desktop_frame_win.cc +++ b/modules/desktop_capture/desktop_frame_win.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_frame_win.h" +#include "modules/desktop_capture/desktop_frame_win.h" #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_win.h b/modules/desktop_capture/desktop_frame_win.h index 96256113ba..7ab26588bf 100644 --- a/modules/desktop_capture/desktop_frame_win.h +++ b/modules/desktop_capture/desktop_frame_win.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -47,5 +47,5 @@ class DesktopFrameWin : public DesktopFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_ diff --git a/modules/desktop_capture/desktop_geometry.cc b/modules/desktop_capture/desktop_geometry.cc index 5fadea2984..8c1b23a006 100644 --- a/modules/desktop_capture/desktop_geometry.cc +++ b/modules/desktop_capture/desktop_geometry.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_geometry.h" #include diff --git a/modules/desktop_capture/desktop_geometry.h b/modules/desktop_capture/desktop_geometry.h index 571243bd2a..decb57360c 100644 --- a/modules/desktop_capture/desktop_geometry.h +++ b/modules/desktop_capture/desktop_geometry.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -162,5 +162,5 @@ class DesktopRect { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ diff --git a/modules/desktop_capture/desktop_geometry_unittest.cc b/modules/desktop_capture/desktop_geometry_unittest.cc index 520b1f9723..f4a07fa46b 100644 --- a/modules/desktop_capture/desktop_geometry_unittest.cc +++ b/modules/desktop_capture/desktop_geometry_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_geometry.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_region.cc b/modules/desktop_capture/desktop_region.cc index e130c10381..fb310d43e5 100644 --- a/modules/desktop_capture/desktop_region.cc +++ b/modules/desktop_capture/desktop_region.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/desktop_region.h" #include diff --git a/modules/desktop_capture/desktop_region.h b/modules/desktop_capture/desktop_region.h index 1c05e98bdd..eff8334048 100644 --- a/modules/desktop_capture/desktop_region.h +++ b/modules/desktop_capture/desktop_region.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ +#define MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -165,5 +165,5 @@ class DesktopRegion { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ +#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ diff --git a/modules/desktop_capture/desktop_region_unittest.cc b/modules/desktop_capture/desktop_region_unittest.cc index 16f8626096..0e94c9dee8 100644 --- a/modules/desktop_capture/desktop_region_unittest.cc +++ b/modules/desktop_capture/desktop_region_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/desktop_region.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/differ_block.cc b/modules/desktop_capture/differ_block.cc index cf2299f815..36169b08c7 100644 --- a/modules/desktop_capture/differ_block.cc +++ b/modules/desktop_capture/differ_block.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/differ_block.h" +#include "modules/desktop_capture/differ_block.h" #include -#include "webrtc/typedefs.h" -#include "webrtc/modules/desktop_capture/differ_vector_sse2.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "typedefs.h" +#include "modules/desktop_capture/differ_vector_sse2.h" +#include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/modules/desktop_capture/differ_block.h b/modules/desktop_capture/differ_block.h index 97fe3bc544..7bf9a7b1db 100644 --- a/modules/desktop_capture/differ_block.h +++ b/modules/desktop_capture/differ_block.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ +#define MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ #include @@ -41,4 +41,4 @@ bool BlockDifference(const uint8_t* image1, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ +#endif // MODULES_DESKTOP_CAPTURE_DIFFER_BLOCK_H_ diff --git a/modules/desktop_capture/differ_block_unittest.cc b/modules/desktop_capture/differ_block_unittest.cc index cfee667893..3f08632aaa 100644 --- a/modules/desktop_capture/differ_block_unittest.cc +++ b/modules/desktop_capture/differ_block_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/differ_block.h" -#include "webrtc/test/gmock.h" +#include "modules/desktop_capture/differ_block.h" +#include "test/gmock.h" namespace webrtc { diff --git a/modules/desktop_capture/differ_vector_sse2.cc b/modules/desktop_capture/differ_vector_sse2.cc index ce6cc297c6..9b552e0f61 100644 --- a/modules/desktop_capture/differ_vector_sse2.cc +++ b/modules/desktop_capture/differ_vector_sse2.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/differ_vector_sse2.h" +#include "modules/desktop_capture/differ_vector_sse2.h" #if defined(_MSC_VER) #include diff --git a/modules/desktop_capture/differ_vector_sse2.h b/modules/desktop_capture/differ_vector_sse2.h index 353c6b9b00..a3c297eb9d 100644 --- a/modules/desktop_capture/differ_vector_sse2.h +++ b/modules/desktop_capture/differ_vector_sse2.h @@ -11,8 +11,8 @@ // This header file is used only differ_block.h. It defines the SSE2 rountines // for finding vector difference. -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ +#ifndef MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ +#define MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ #include @@ -28,4 +28,4 @@ extern bool VectorDifference_SSE2_W32(const uint8_t* image1, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ +#endif // MODULES_DESKTOP_CAPTURE_DIFFER_VECTOR_SSE2_H_ diff --git a/modules/desktop_capture/fake_desktop_capturer.cc b/modules/desktop_capture/fake_desktop_capturer.cc index ea622650b8..d308862f2e 100644 --- a/modules/desktop_capture/fake_desktop_capturer.cc +++ b/modules/desktop_capture/fake_desktop_capturer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/fake_desktop_capturer.h" +#include "modules/desktop_capture/fake_desktop_capturer.h" #include diff --git a/modules/desktop_capture/fake_desktop_capturer.h b/modules/desktop_capture/fake_desktop_capturer.h index 9cab2d6ede..cb1cfe1ba6 100644 --- a/modules/desktop_capture/fake_desktop_capturer.h +++ b/modules/desktop_capture/fake_desktop_capturer.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ +#define MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_frame_generator.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame_generator.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { @@ -73,4 +73,4 @@ class FakeDesktopCapturer : public DesktopCapturer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ +#endif // MODULES_DESKTOP_CAPTURE_FAKE_DESKTOP_CAPTURER_H_ diff --git a/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc index 6ae046e824..b261a03028 100644 --- a/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ b/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/fallback_desktop_capturer_wrapper.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/desktop_capture/fallback_desktop_capturer_wrapper.h b/modules/desktop_capture/fallback_desktop_capturer_wrapper.h index 8e79026f3e..a6f2ceb100 100644 --- a/modules/desktop_capture/fallback_desktop_capturer_wrapper.h +++ b/modules/desktop_capture/fallback_desktop_capturer_wrapper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ +#define MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { @@ -60,4 +60,4 @@ class FallbackDesktopCapturerWrapper final : public DesktopCapturer, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ +#endif // MODULES_DESKTOP_CAPTURE_FALLBACK_DESKTOP_CAPTURER_WRAPPER_H_ diff --git a/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc b/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc index 106848bb2d..ca11162dc4 100644 --- a/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc +++ b/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/fallback_desktop_capturer_wrapper.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame_generator.h" -#include "webrtc/modules/desktop_capture/fake_desktop_capturer.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame_generator.h" +#include "modules/desktop_capture/fake_desktop_capturer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/desktop_configuration.h b/modules/desktop_capture/mac/desktop_configuration.h index 73550ac37d..44d4c0ac29 100644 --- a/modules/desktop_capture/mac/desktop_configuration.h +++ b/modules/desktop_capture/mac/desktop_configuration.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ +#define MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ #include #include -#include "webrtc/typedefs.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "typedefs.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -87,4 +87,4 @@ struct MacDesktopConfiguration { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ +#endif // MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ diff --git a/modules/desktop_capture/mac/desktop_configuration.mm b/modules/desktop_capture/mac/desktop_configuration.mm index c82d1cb631..e6316632c5 100644 --- a/modules/desktop_capture/mac/desktop_configuration.mm +++ b/modules/desktop_capture/mac/desktop_configuration.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" #include #include diff --git a/modules/desktop_capture/mac/desktop_configuration_monitor.cc b/modules/desktop_capture/mac/desktop_configuration_monitor.cc index 21c06f730a..c8cc916d59 100644 --- a/modules/desktop_capture/mac/desktop_configuration_monitor.cc +++ b/modules/desktop_capture/mac/desktop_configuration_monitor.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" +#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/desktop_configuration_monitor.h b/modules/desktop_capture/mac/desktop_configuration_monitor.h index 7b4ade7739..3cb5009a32 100644 --- a/modules/desktop_capture/mac/desktop_configuration_monitor.h +++ b/modules/desktop_capture/mac/desktop_configuration_monitor.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ +#define MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ #include #include #include -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/atomic32.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/atomic32.h" namespace webrtc { @@ -64,4 +64,4 @@ class DesktopConfigurationMonitor { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_MONITOR_H_ diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc index 1c74ed97ab..b5ba988c04 100644 --- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc +++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" +#include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include #include #include -#include "webrtc/modules/desktop_capture/mac/window_list_utils.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/mac/window_list_utils.h" +#include "rtc_base/logging.h" +#include "rtc_base/macutils.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h index 01c1a95be6..b03521bf34 100644 --- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h +++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ +#define MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/atomic32.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/atomic32.h" namespace webrtc { @@ -66,4 +66,4 @@ class FullScreenChromeWindowDetector { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_MAC_FULL_SCREEN_CHROME_WINDOW_DETECTOR_H_ diff --git a/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc b/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc index 5dcbc52a9e..7ba12d757f 100644 --- a/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc +++ b/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h" +#include "modules/desktop_capture/mac/scoped_pixel_buffer_object.h" #include diff --git a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h index 91d1295578..37cd94a9d8 100644 --- a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h +++ b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ +#define MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -38,4 +38,4 @@ class ScopedPixelBufferObject { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ +#endif // MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ diff --git a/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc index 0bd6d5adce..3572d85be0 100644 --- a/modules/desktop_capture/mac/window_list_utils.cc +++ b/modules/desktop_capture/mac/window_list_utils.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mac/window_list_utils.h" +#include "modules/desktop_capture/mac/window_list_utils.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/macutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/macutils.h" static_assert( static_cast(kCGNullWindowID) == webrtc::kNullWindowId, diff --git a/modules/desktop_capture/mac/window_list_utils.h b/modules/desktop_capture/mac/window_list_utils.h index be7aeeab41..7fb0ceec9f 100644 --- a/modules/desktop_capture/mac/window_list_utils.h +++ b/modules/desktop_capture/mac/window_list_utils.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ +#define MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/rtc_base/function_view.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "rtc_base/function_view.h" namespace webrtc { @@ -65,4 +65,4 @@ DesktopRect GetWindowBounds(CGWindowID id); } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ +#endif // MODULES_DESKTOP_CAPTURE_MAC_WINDOW_LIST_UTILS_H_ diff --git a/modules/desktop_capture/mock_desktop_capturer_callback.cc b/modules/desktop_capture/mock_desktop_capturer_callback.cc index 2a02e283b5..de77d99e18 100644 --- a/modules/desktop_capture/mock_desktop_capturer_callback.cc +++ b/modules/desktop_capture/mock_desktop_capturer_callback.cc @@ -7,7 +7,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "modules/desktop_capture/mock_desktop_capturer_callback.h" namespace webrtc { diff --git a/modules/desktop_capture/mock_desktop_capturer_callback.h b/modules/desktop_capture/mock_desktop_capturer_callback.h index 720075da54..bf1d503c78 100644 --- a/modules/desktop_capture/mock_desktop_capturer_callback.h +++ b/modules/desktop_capture/mock_desktop_capturer_callback.h @@ -7,14 +7,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ +#define MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ -#include "webrtc/modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capturer.h" #include -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { @@ -35,4 +35,4 @@ class MockDesktopCapturerCallback : public DesktopCapturer::Callback { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ +#endif // MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ diff --git a/modules/desktop_capture/mouse_cursor.cc b/modules/desktop_capture/mouse_cursor.cc index 22a9c0ee8c..bb9f32707b 100644 --- a/modules/desktop_capture/mouse_cursor.cc +++ b/modules/desktop_capture/mouse_cursor.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/mouse_cursor.h" #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor.h b/modules/desktop_capture/mouse_cursor.h index 45e1fa535a..daf6c9695e 100644 --- a/modules/desktop_capture/mouse_cursor.h +++ b/modules/desktop_capture/mouse_cursor.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ +#define MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -46,4 +46,4 @@ class MouseCursor { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_ diff --git a/modules/desktop_capture/mouse_cursor_monitor.h b/modules/desktop_capture/mouse_cursor_monitor.h index 84edb79dff..e4879f5ec5 100644 --- a/modules/desktop_capture/mouse_cursor_monitor.h +++ b/modules/desktop_capture/mouse_cursor_monitor.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ +#define MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "typedefs.h" namespace webrtc { @@ -107,5 +107,5 @@ class MouseCursorMonitor { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_ diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm index 371852bf42..7f95ffb8f7 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm +++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" #include @@ -18,15 +18,15 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" +#include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "rtc_base/macutils.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor_null.cc b/modules/desktop_capture/mouse_cursor_monitor_null.cc index 6153fac1ac..233819afe6 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_null.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_null.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_capture_types.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index 5305fee2f4..9af0d68efc 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor_win.cc b/modules/desktop_capture/mouse_cursor_monitor_win.cc index 174036e559..929ff4b1e9 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_win.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_win.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/win/cursor.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/win/cursor.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/window_capture_utils.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/modules/desktop_capture/mouse_cursor_monitor_x11.cc index edde01c7ba..b2700d3fe2 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_x11.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_x11.cc @@ -10,18 +10,18 @@ #include -#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/mouse_cursor_monitor.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/x11/x_error_trap.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/x11/x_error_trap.h" +#include "rtc_base/logging.h" namespace { diff --git a/modules/desktop_capture/resolution_tracker.cc b/modules/desktop_capture/resolution_tracker.cc index 326e47460a..9639d627fa 100644 --- a/modules/desktop_capture/resolution_tracker.cc +++ b/modules/desktop_capture/resolution_tracker.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/resolution_tracker.h" +#include "modules/desktop_capture/resolution_tracker.h" namespace webrtc { diff --git a/modules/desktop_capture/resolution_tracker.h b/modules/desktop_capture/resolution_tracker.h index 243333d053..55f25d1337 100644 --- a/modules/desktop_capture/resolution_tracker.h +++ b/modules/desktop_capture/resolution_tracker.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ +#define MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -31,4 +31,4 @@ class ResolutionTracker final { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ +#endif // MODULES_DESKTOP_CAPTURE_RESOLUTION_TRACKER_H_ diff --git a/modules/desktop_capture/rgba_color.cc b/modules/desktop_capture/rgba_color.cc index 6d91de4275..14cb55023e 100644 --- a/modules/desktop_capture/rgba_color.cc +++ b/modules/desktop_capture/rgba_color.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/rgba_color.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/desktop_capture/rgba_color.h b/modules/desktop_capture/rgba_color.h index 11e8d44f5f..c47c8bc656 100644 --- a/modules/desktop_capture/rgba_color.h +++ b/modules/desktop_capture/rgba_color.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ +#define MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" namespace webrtc { @@ -56,4 +56,4 @@ static_assert( } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_RGBA_COLOR_H_ diff --git a/modules/desktop_capture/rgba_color_unittest.cc b/modules/desktop_capture/rgba_color_unittest.cc index dc750219e0..d7c2b6ac88 100644 --- a/modules/desktop_capture/rgba_color_unittest.cc +++ b/modules/desktop_capture/rgba_color_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/rgba_color.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capture_frame_queue.h b/modules/desktop_capture/screen_capture_frame_queue.h index 50201fb944..a9a1643058 100644 --- a/modules/desktop_capture/screen_capture_frame_queue.h +++ b/modules/desktop_capture/screen_capture_frame_queue.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ +#define MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" // TODO(zijiehe): These headers are not used in this file, but to avoid build // break in remoting/host. We should add headers in each individual files. -#include "webrtc/modules/desktop_capture/desktop_frame.h" // Remove -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" // Remove +#include "modules/desktop_capture/desktop_frame.h" // Remove +#include "modules/desktop_capture/shared_desktop_frame.h" // Remove namespace webrtc { @@ -82,4 +82,4 @@ class ScreenCaptureFrameQueue { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ +#endif // MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURE_FRAME_QUEUE_H_ diff --git a/modules/desktop_capture/screen_capturer_helper.cc b/modules/desktop_capture/screen_capturer_helper.cc index 75f1128fe7..4e4635eaed 100644 --- a/modules/desktop_capture/screen_capturer_helper.cc +++ b/modules/desktop_capture/screen_capturer_helper.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/screen_capturer_helper.h" +#include "modules/desktop_capture/screen_capturer_helper.h" #include #include diff --git a/modules/desktop_capture/screen_capturer_helper.h b/modules/desktop_capture/screen_capturer_helper.h index 5527bbb185..d36be49b60 100644 --- a/modules/desktop_capture/screen_capturer_helper.h +++ b/modules/desktop_capture/screen_capturer_helper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ +#define MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { @@ -87,4 +87,4 @@ class ScreenCapturerHelper { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ +#endif // MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_ diff --git a/modules/desktop_capture/screen_capturer_helper_unittest.cc b/modules/desktop_capture/screen_capturer_helper_unittest.cc index 76e7eb36f9..f2944abf67 100644 --- a/modules/desktop_capture/screen_capturer_helper_unittest.cc +++ b/modules/desktop_capture/screen_capturer_helper_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/screen_capturer_helper.h" +#include "modules/desktop_capture/screen_capturer_helper.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc index 0ec76c47bf..198e764b55 100644 --- a/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/modules/desktop_capture/screen_capturer_integration_test.cc @@ -17,23 +17,23 @@ #include // TODO(zijiehe): Remove once flaky has been resolved. -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" -#include "webrtc/modules/desktop_capture/rgba_color.h" -#include "webrtc/modules/desktop_capture/screen_drawer.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/screen_drawer.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "test/gmock.h" +#include "test/gtest.h" #if defined(WEBRTC_WIN) -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "rtc_base/win32.h" #endif // defined(WEBRTC_WIN) using ::testing::_; diff --git a/modules/desktop_capture/screen_capturer_mac.mm b/modules/desktop_capture/screen_capturer_mac.mm index 9fab81952a..0c68740523 100644 --- a/modules/desktop_capture/screen_capturer_mac.mm +++ b/modules/desktop_capture/screen_capturer_mac.mm @@ -21,22 +21,22 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h" -#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" -#include "webrtc/modules/desktop_capture/screen_capturer_helper.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" +#include "modules/desktop_capture/mac/scoped_pixel_buffer_object.h" +#include "modules/desktop_capture/screen_capture_frame_queue.h" +#include "modules/desktop_capture/screen_capturer_helper.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/macutils.h" +#include "rtc_base/timeutils.h" // Once Chrome no longer supports OSX 10.8, everything within this // preprocessor block can be removed. https://crbug.com/579255 diff --git a/modules/desktop_capture/screen_capturer_mac_unittest.cc b/modules/desktop_capture/screen_capturer_mac_unittest.cc index 7133a9ebbc..00d2d02a29 100644 --- a/modules/desktop_capture/screen_capturer_mac_unittest.cc +++ b/modules/desktop_capture/screen_capturer_mac_unittest.cc @@ -13,14 +13,14 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "test/gtest.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/modules/desktop_capture/screen_capturer_null.cc b/modules/desktop_capture/screen_capturer_null.cc index 7b93749638..6b1ccb322e 100644 --- a/modules/desktop_capture/screen_capturer_null.cc +++ b/modules/desktop_capture/screen_capturer_null.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capturer.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capturer_unittest.cc b/modules/desktop_capture/screen_capturer_unittest.cc index 4aa32202d0..6a28c537bb 100644 --- a/modules/desktop_capture/screen_capturer_unittest.cc +++ b/modules/desktop_capture/screen_capturer_unittest.cc @@ -10,18 +10,18 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "test/gmock.h" +#include "test/gtest.h" #if defined(WEBRTC_WIN) -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "modules/desktop_capture/win/screen_capturer_win_directx.h" #endif // defined(WEBRTC_WIN) using ::testing::_; diff --git a/modules/desktop_capture/screen_capturer_win.cc b/modules/desktop_capture/screen_capturer_win.cc index 9e74aabca6..ecdc48e5b4 100644 --- a/modules/desktop_capture/screen_capturer_win.cc +++ b/modules/desktop_capture/screen_capturer_win.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h" -#include "webrtc/modules/desktop_capture/rgba_color.h" -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h" -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h" +#include "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/fallback_desktop_capturer_wrapper.h" +#include "modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "modules/desktop_capture/win/screen_capturer_win_gdi.h" +#include "modules/desktop_capture/win/screen_capturer_win_magnifier.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capturer_x11.cc b/modules/desktop_capture/screen_capturer_x11.cc index ecc2c96533..0a860a5568 100644 --- a/modules/desktop_capture/screen_capturer_x11.cc +++ b/modules/desktop_capture/screen_capturer_x11.cc @@ -19,17 +19,17 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" -#include "webrtc/modules/desktop_capture/screen_capturer_helper.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/screen_capture_frame_queue.h" +#include "modules/desktop_capture/screen_capturer_helper.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/x11/x_server_pixel_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" namespace webrtc { namespace { diff --git a/modules/desktop_capture/screen_drawer.cc b/modules/desktop_capture/screen_drawer.cc index f1209edc54..6460f19f65 100644 --- a/modules/desktop_capture/screen_drawer.cc +++ b/modules/desktop_capture/screen_drawer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/screen_drawer.h" +#include "modules/desktop_capture/screen_drawer.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_drawer.h b/modules/desktop_capture/screen_drawer.h index ee0ebf07b5..89dfd66ddd 100644 --- a/modules/desktop_capture/screen_drawer.h +++ b/modules/desktop_capture/screen_drawer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ +#define MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ #include #include -#include "webrtc/modules/desktop_capture/rgba_color.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -80,4 +80,4 @@ class ScreenDrawer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ +#endif // MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ diff --git a/modules/desktop_capture/screen_drawer_linux.cc b/modules/desktop_capture/screen_drawer_linux.cc index 1a99e69cf2..cbd8ba8612 100644 --- a/modules/desktop_capture/screen_drawer_linux.cc +++ b/modules/desktop_capture/screen_drawer_linux.cc @@ -13,12 +13,12 @@ #include -#include "webrtc/modules/desktop_capture/screen_drawer.h" -#include "webrtc/modules/desktop_capture/screen_drawer_lock_posix.h" -#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "modules/desktop_capture/screen_drawer.h" +#include "modules/desktop_capture/screen_drawer_lock_posix.h" +#include "modules/desktop_capture/x11/shared_x_display.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" +#include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_drawer_lock_posix.cc b/modules/desktop_capture/screen_drawer_lock_posix.cc index 5b6bc9c0c1..0f6c38aadc 100644 --- a/modules/desktop_capture/screen_drawer_lock_posix.cc +++ b/modules/desktop_capture/screen_drawer_lock_posix.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/screen_drawer_lock_posix.h" +#include "modules/desktop_capture/screen_drawer_lock_posix.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_drawer_lock_posix.h b/modules/desktop_capture/screen_drawer_lock_posix.h index a768066533..1d5adf2c57 100644 --- a/modules/desktop_capture/screen_drawer_lock_posix.h +++ b/modules/desktop_capture/screen_drawer_lock_posix.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ +#define MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ #include -#include "webrtc/modules/desktop_capture/screen_drawer.h" +#include "modules/desktop_capture/screen_drawer.h" namespace webrtc { @@ -35,4 +35,4 @@ class ScreenDrawerLockPosix final : public ScreenDrawerLock { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ +#endif // MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_LOCK_POSIX_H_ diff --git a/modules/desktop_capture/screen_drawer_mac.cc b/modules/desktop_capture/screen_drawer_mac.cc index 90f727124b..bfc162c6e3 100644 --- a/modules/desktop_capture/screen_drawer_mac.cc +++ b/modules/desktop_capture/screen_drawer_mac.cc @@ -10,9 +10,9 @@ // TODO(zijiehe): Implement ScreenDrawerMac -#include "webrtc/modules/desktop_capture/screen_drawer.h" -#include "webrtc/modules/desktop_capture/screen_drawer_lock_posix.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/screen_drawer.h" +#include "modules/desktop_capture/screen_drawer_lock_posix.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc index 94404ee6a1..b30e900c58 100644 --- a/modules/desktop_capture/screen_drawer_unittest.cc +++ b/modules/desktop_capture/screen_drawer_unittest.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/screen_drawer.h" +#include "modules/desktop_capture/screen_drawer.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/checks.h" +#include "rtc_base/function_view.h" +#include "rtc_base/logging.h" +#include "rtc_base/random.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" #if defined(WEBRTC_POSIX) -#include "webrtc/modules/desktop_capture/screen_drawer_lock_posix.h" +#include "modules/desktop_capture/screen_drawer_lock_posix.h" #endif namespace webrtc { diff --git a/modules/desktop_capture/screen_drawer_win.cc b/modules/desktop_capture/screen_drawer_win.cc index caa0ce2330..cacb88957a 100644 --- a/modules/desktop_capture/screen_drawer_win.cc +++ b/modules/desktop_capture/screen_drawer_win.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/modules/desktop_capture/screen_drawer.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "modules/desktop_capture/screen_drawer.h" +#include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/desktop_capture/shared_desktop_frame.cc b/modules/desktop_capture/shared_desktop_frame.cc index ef3abe339c..25345d79fd 100644 --- a/modules/desktop_capture/shared_desktop_frame.cc +++ b/modules/desktop_capture/shared_desktop_frame.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/shared_desktop_frame.h" #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/shared_desktop_frame.h b/modules/desktop_capture/shared_desktop_frame.h index 6b2fea099d..1f01220320 100644 --- a/modules/desktop_capture/shared_desktop_frame.h +++ b/modules/desktop_capture/shared_desktop_frame.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ +#define MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -59,4 +59,4 @@ class SharedDesktopFrame : public DesktopFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ +#endif // MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ diff --git a/modules/desktop_capture/shared_memory.cc b/modules/desktop_capture/shared_memory.cc index 872116eec9..fcbdd54e28 100644 --- a/modules/desktop_capture/shared_memory.cc +++ b/modules/desktop_capture/shared_memory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { diff --git a/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h index 8d283fbcbe..47752a3e16 100644 --- a/modules/desktop_capture/shared_memory.h +++ b/modules/desktop_capture/shared_memory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ +#ifndef MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ +#define MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ #include @@ -19,9 +19,9 @@ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_checker.h" +#include "typedefs.h" namespace webrtc { @@ -79,5 +79,5 @@ class SharedMemoryFactory { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ +#endif // MODULES_DESKTOP_CAPTURE_SHARED_MEMORY_H_ diff --git a/modules/desktop_capture/test_utils.cc b/modules/desktop_capture/test_utils.cc index e2b428ed46..0a4749afdb 100644 --- a/modules/desktop_capture/test_utils.cc +++ b/modules/desktop_capture/test_utils.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/test_utils.h" +#include "modules/desktop_capture/test_utils.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/desktop_capture/test_utils.h b/modules/desktop_capture/test_utils.h index ca272986a0..1e8b5f97df 100644 --- a/modules/desktop_capture/test_utils.h +++ b/modules/desktop_capture/test_utils.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ +#ifndef MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ +#define MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ -#include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame.h" namespace webrtc { @@ -24,4 +24,4 @@ bool DesktopFrameDataEquals(const DesktopFrame& left, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ +#endif // MODULES_DESKTOP_CAPTURE_TEST_UTILS_H_ diff --git a/modules/desktop_capture/test_utils_unittest.cc b/modules/desktop_capture/test_utils_unittest.cc index fd8fa942cf..8be8716f54 100644 --- a/modules/desktop_capture/test_utils_unittest.cc +++ b/modules/desktop_capture/test_utils_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/test_utils.h" +#include "modules/desktop_capture/test_utils.h" -#include "webrtc/modules/desktop_capture/rgba_color.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/rgba_color.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/win/cursor.cc b/modules/desktop_capture/win/cursor.cc index 8e3d34b39a..f028ed0851 100644 --- a/modules/desktop_capture/win/cursor.cc +++ b/modules/desktop_capture/win/cursor.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/cursor.h" +#include "modules/desktop_capture/win/cursor.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/typedefs.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/win/scoped_gdi_object.h" +#include "rtc_base/logging.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/desktop_capture/win/cursor.h b/modules/desktop_capture/win/cursor.h index d521cc0819..e67c711dbd 100644 --- a/modules/desktop_capture/win/cursor.h +++ b/modules/desktop_capture/win/cursor.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ #include @@ -22,4 +22,4 @@ MouseCursor* CreateMouseCursorFromHCursor(HDC dc, HCURSOR cursor); } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_CURSOR_H_ diff --git a/modules/desktop_capture/win/cursor_unittest.cc b/modules/desktop_capture/win/cursor_unittest.cc index e37fd981b0..368a3da587 100644 --- a/modules/desktop_capture/win/cursor_unittest.cc +++ b/modules/desktop_capture/win/cursor_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/win/cursor.h" -#include "webrtc/modules/desktop_capture/win/cursor_unittest_resources.h" -#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" -#include "webrtc/test/gmock.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/win/cursor.h" +#include "modules/desktop_capture/win/cursor_unittest_resources.h" +#include "modules/desktop_capture/win/scoped_gdi_object.h" +#include "test/gmock.h" namespace webrtc { diff --git a/modules/desktop_capture/win/cursor_unittest_resources.h b/modules/desktop_capture/win/cursor_unittest_resources.h index 89545c165f..043103dc47 100644 --- a/modules/desktop_capture/win/cursor_unittest_resources.h +++ b/modules/desktop_capture/win/cursor_unittest_resources.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ #define IDD_CURSOR1_24BPP 101 #define IDD_CURSOR1_32BPP 102 @@ -21,4 +21,4 @@ #define IDD_CURSOR3_4BPP 106 #define IDD_CURSOR3_32BPP 107 -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_CURSOR_UNITTEST_RESOURCES_H_ diff --git a/modules/desktop_capture/win/cursor_unittest_resources.rc b/modules/desktop_capture/win/cursor_unittest_resources.rc index 4f41489ecd..90073791c9 100644 --- a/modules/desktop_capture/win/cursor_unittest_resources.rc +++ b/modules/desktop_capture/win/cursor_unittest_resources.rc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/cursor_unittest_resources.h" +#include "modules/desktop_capture/win/cursor_unittest_resources.h" // These cursors are matched with their less than 32bpp counterparts below. IDD_CURSOR1_32BPP CURSOR "cursor_test_data/1_32bpp.cur" diff --git a/modules/desktop_capture/win/d3d_device.cc b/modules/desktop_capture/win/d3d_device.cc index 190993c3e6..23b547453d 100644 --- a/modules/desktop_capture/win/d3d_device.cc +++ b/modules/desktop_capture/win/d3d_device.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/d3d_device.h" +#include "modules/desktop_capture/win/d3d_device.h" #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/win/d3d_device.h b/modules/desktop_capture/win/d3d_device.h index 41efa84905..8f545d367c 100644 --- a/modules/desktop_capture/win/d3d_device.h +++ b/modules/desktop_capture/win/d3d_device.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ #include #include @@ -56,4 +56,4 @@ class D3dDevice { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_D3D_DEVICE_H_ diff --git a/modules/desktop_capture/win/desktop.cc b/modules/desktop_capture/win/desktop.cc index 4a7c263402..0df509ead5 100644 --- a/modules/desktop_capture/win/desktop.cc +++ b/modules/desktop_capture/win/desktop.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/desktop.h" +#include "modules/desktop_capture/win/desktop.h" #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/win/desktop.h b/modules/desktop_capture/win/desktop.h index 673731679f..94857eca1b 100644 --- a/modules/desktop_capture/win/desktop.h +++ b/modules/desktop_capture/win/desktop.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -60,4 +60,4 @@ class Desktop { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_ diff --git a/modules/desktop_capture/win/display_configuration_monitor.cc b/modules/desktop_capture/win/display_configuration_monitor.cc index 5685d9574d..52d89214d8 100644 --- a/modules/desktop_capture/win/display_configuration_monitor.cc +++ b/modules/desktop_capture/win/display_configuration_monitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/display_configuration_monitor.h" +#include "modules/desktop_capture/win/display_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/win/display_configuration_monitor.h b/modules/desktop_capture/win/display_configuration_monitor.h index 0937c33815..39c211cfbe 100644 --- a/modules/desktop_capture/win/display_configuration_monitor.h +++ b/modules/desktop_capture/win/display_configuration_monitor.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -35,4 +35,4 @@ class DisplayConfigurationMonitor { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DISPLAY_CONFIGURATION_MONITOR_H_ diff --git a/modules/desktop_capture/win/dxgi_adapter_duplicator.cc b/modules/desktop_capture/win/dxgi_adapter_duplicator.cc index 4174dc952c..3fb92c977b 100644 --- a/modules/desktop_capture/win/dxgi_adapter_duplicator.cc +++ b/modules/desktop_capture/win/dxgi_adapter_duplicator.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h" +#include "modules/desktop_capture/win/dxgi_adapter_duplicator.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_adapter_duplicator.h b/modules/desktop_capture/win/dxgi_adapter_duplicator.h index 0fa51ac920..d70eb7c35f 100644 --- a/modules/desktop_capture/win/dxgi_adapter_duplicator.h +++ b/modules/desktop_capture/win/dxgi_adapter_duplicator.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/d3d_device.h" -#include "webrtc/modules/desktop_capture/win/dxgi_context.h" -#include "webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/win/d3d_device.h" +#include "modules/desktop_capture/win/dxgi_context.h" +#include "modules/desktop_capture/win/dxgi_output_duplicator.h" namespace webrtc { @@ -89,4 +89,4 @@ class DxgiAdapterDuplicator { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_ADAPTER_DUPLICATOR_H_ diff --git a/modules/desktop_capture/win/dxgi_context.cc b/modules/desktop_capture/win/dxgi_context.cc index 18ca990970..6b4649e26c 100644 --- a/modules/desktop_capture/win/dxgi_context.cc +++ b/modules/desktop_capture/win/dxgi_context.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_context.h" -#include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" +#include "modules/desktop_capture/win/dxgi_context.h" +#include "modules/desktop_capture/win/dxgi_duplicator_controller.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_context.h b/modules/desktop_capture/win/dxgi_context.h index 323ea7cad3..0faf5cdadb 100644 --- a/modules/desktop_capture/win/dxgi_context.h +++ b/modules/desktop_capture/win/dxgi_context.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ #include -#include "webrtc/modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/desktop_region.h" namespace webrtc { @@ -58,4 +58,4 @@ struct DxgiFrameContext final { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_ diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.cc b/modules/desktop_capture/win/dxgi_duplicator_controller.cc index 38bf43704a..bd992f1f05 100644 --- a/modules/desktop_capture/win/dxgi_duplicator_controller.cc +++ b/modules/desktop_capture/win/dxgi_duplicator_controller.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" +#include "modules/desktop_capture/win/dxgi_duplicator_controller.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/win/dxgi_frame.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/win/dxgi_frame.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.h b/modules/desktop_capture/win/dxgi_duplicator_controller.h index ddf02a89d1..e2fa32e281 100644 --- a/modules/desktop_capture/win/dxgi_duplicator_controller.h +++ b/modules/desktop_capture/win/dxgi_duplicator_controller.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ #include @@ -17,15 +17,15 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/d3d_device.h" -#include "webrtc/modules/desktop_capture/win/display_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h" -#include "webrtc/modules/desktop_capture/win/dxgi_context.h" -#include "webrtc/modules/desktop_capture/win/dxgi_frame.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/win/d3d_device.h" +#include "modules/desktop_capture/win/display_configuration_monitor.h" +#include "modules/desktop_capture/win/dxgi_adapter_duplicator.h" +#include "modules/desktop_capture/win/dxgi_context.h" +#include "modules/desktop_capture/win/dxgi_frame.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -231,4 +231,4 @@ class DxgiDuplicatorController { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_DUPLICATOR_CONTROLLER_H_ diff --git a/modules/desktop_capture/win/dxgi_frame.cc b/modules/desktop_capture/win/dxgi_frame.cc index d0af1f9349..453905a448 100644 --- a/modules/desktop_capture/win/dxgi_frame.cc +++ b/modules/desktop_capture/win/dxgi_frame.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_frame.h" +#include "modules/desktop_capture/win/dxgi_frame.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/win/dxgi_duplicator_controller.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_frame.h b/modules/desktop_capture/win/dxgi_frame.h index 236ae48011..49f2320c31 100644 --- a/modules/desktop_capture/win/dxgi_frame.h +++ b/modules/desktop_capture/win/dxgi_frame.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/resolution_tracker.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/shared_memory.h" -#include "webrtc/modules/desktop_capture/win/dxgi_context.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/resolution_tracker.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/shared_memory.h" +#include "modules/desktop_capture/win/dxgi_context.h" namespace webrtc { @@ -60,4 +60,4 @@ class DxgiFrame final { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_ diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc index acb9c9df0f..ae1c00064f 100644 --- a/modules/desktop_capture/win/dxgi_output_duplicator.cc +++ b/modules/desktop_capture/win/dxgi_output_duplicator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h" +#include "modules/desktop_capture/win/dxgi_output_duplicator.h" #include @@ -19,11 +19,11 @@ #include -#include "webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h" -#include "webrtc/modules/desktop_capture/win/dxgi_texture_staging.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/win/dxgi_texture_mapping.h" +#include "modules/desktop_capture/win/dxgi_texture_staging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.h b/modules/desktop_capture/win/dxgi_output_duplicator.h index 47e078f4ad..3f10533a22 100644 --- a/modules/desktop_capture/win/dxgi_output_duplicator.h +++ b/modules/desktop_capture/win/dxgi_output_duplicator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ #include #include @@ -20,15 +20,15 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_frame_rotation.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/d3d_device.h" -#include "webrtc/modules/desktop_capture/win/dxgi_context.h" -#include "webrtc/modules/desktop_capture/win/dxgi_texture.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/desktop_capture/desktop_frame_rotation.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/win/d3d_device.h" +#include "modules/desktop_capture/win/dxgi_context.h" +#include "modules/desktop_capture/win/dxgi_texture.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -142,4 +142,4 @@ class DxgiOutputDuplicator { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_ diff --git a/modules/desktop_capture/win/dxgi_texture.cc b/modules/desktop_capture/win/dxgi_texture.cc index f9cfd82ea1..f0942a9342 100644 --- a/modules/desktop_capture/win/dxgi_texture.cc +++ b/modules/desktop_capture/win/dxgi_texture.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_texture.h" +#include "modules/desktop_capture/win/dxgi_texture.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/desktop_region.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" using Microsoft::WRL::ComPtr; diff --git a/modules/desktop_capture/win/dxgi_texture.h b/modules/desktop_capture/win/dxgi_texture.h index fb120921da..18fa349f82 100644 --- a/modules/desktop_capture/win/dxgi_texture.h +++ b/modules/desktop_capture/win/dxgi_texture.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ #include #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -70,4 +70,4 @@ class DxgiTexture { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_H_ diff --git a/modules/desktop_capture/win/dxgi_texture_mapping.cc b/modules/desktop_capture/win/dxgi_texture_mapping.cc index 66e5e75812..01051951f5 100644 --- a/modules/desktop_capture/win/dxgi_texture_mapping.cc +++ b/modules/desktop_capture/win/dxgi_texture_mapping.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h" +#include "modules/desktop_capture/win/dxgi_texture_mapping.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_texture_mapping.h b/modules/desktop_capture/win/dxgi_texture_mapping.h index 0291a90aaa..1d18a57131 100644 --- a/modules/desktop_capture/win/dxgi_texture_mapping.h +++ b/modules/desktop_capture/win/dxgi_texture_mapping.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/win/dxgi_texture.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/win/dxgi_texture.h" namespace webrtc { @@ -44,4 +44,4 @@ class DxgiTextureMapping : public DxgiTexture { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_MAPPING_H_ diff --git a/modules/desktop_capture/win/dxgi_texture_staging.cc b/modules/desktop_capture/win/dxgi_texture_staging.cc index 3b165bd034..5741b88a7d 100644 --- a/modules/desktop_capture/win/dxgi_texture_staging.cc +++ b/modules/desktop_capture/win/dxgi_texture_staging.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/dxgi_texture_staging.h" +#include "modules/desktop_capture/win/dxgi_texture_staging.h" #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" using Microsoft::WRL::ComPtr; diff --git a/modules/desktop_capture/win/dxgi_texture_staging.h b/modules/desktop_capture/win/dxgi_texture_staging.h index a7e9b86b48..65d56baed2 100644 --- a/modules/desktop_capture/win/dxgi_texture_staging.h +++ b/modules/desktop_capture/win/dxgi_texture_staging.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ #include #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/win/d3d_device.h" -#include "webrtc/modules/desktop_capture/win/dxgi_texture.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/win/d3d_device.h" +#include "modules/desktop_capture/win/dxgi_texture.h" namespace webrtc { @@ -65,4 +65,4 @@ class DxgiTextureStaging : public DxgiTexture { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_TEXTURE_STAGING_H_ diff --git a/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h index f0d5477aa5..f06a42d404 100644 --- a/modules/desktop_capture/win/scoped_gdi_object.h +++ b/modules/desktop_capture/win/scoped_gdi_object.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace win { @@ -92,4 +92,4 @@ typedef ScopedGDIObject ScopedCursor; } // namespace win } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCOPED_GDI_HANDLE_H_ diff --git a/modules/desktop_capture/win/scoped_thread_desktop.cc b/modules/desktop_capture/win/scoped_thread_desktop.cc index aef0d041ff..bbc00efbbb 100644 --- a/modules/desktop_capture/win/scoped_thread_desktop.cc +++ b/modules/desktop_capture/win/scoped_thread_desktop.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" +#include "modules/desktop_capture/win/scoped_thread_desktop.h" -#include "webrtc/modules/desktop_capture/win/desktop.h" +#include "modules/desktop_capture/win/desktop.h" namespace webrtc { diff --git a/modules/desktop_capture/win/scoped_thread_desktop.h b/modules/desktop_capture/win/scoped_thread_desktop.h index a495bebbf5..7ea6d313c5 100644 --- a/modules/desktop_capture/win/scoped_thread_desktop.h +++ b/modules/desktop_capture/win/scoped_thread_desktop.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -51,4 +51,4 @@ class ScopedThreadDesktop { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_ diff --git a/modules/desktop_capture/win/screen_capture_utils.cc b/modules/desktop_capture/win/screen_capture_utils.cc index a8718459b2..a76a7f527a 100644 --- a/modules/desktop_capture/win/screen_capture_utils.cc +++ b/modules/desktop_capture/win/screen_capture_utils.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "rtc_base/checks.h" +#include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capture_utils.h b/modules/desktop_capture/win/screen_capture_utils.h index fdbf633084..2e7d1fff16 100644 --- a/modules/desktop_capture/win/screen_capture_utils.h +++ b/modules/desktop_capture/win/screen_capture_utils.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capturer.h" namespace webrtc { @@ -44,4 +44,4 @@ DesktopRect GetScreenRect(DesktopCapturer::SourceId screen, } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_ diff --git a/modules/desktop_capture/win/screen_capture_utils_unittest.cc b/modules/desktop_capture/win/screen_capture_utils_unittest.cc index 47f02e4551..b9dbf3d05b 100644 --- a/modules/desktop_capture/win/screen_capture_utils_unittest.cc +++ b/modules/desktop_capture/win/screen_capture_utils_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_directx.cc b/modules/desktop_capture/win/screen_capturer_win_directx.cc index c4d778f8f8..3ac1ce037f 100644 --- a/modules/desktop_capture/win/screen_capturer_win_directx.cc +++ b/modules/desktop_capture/win/screen_capturer_win_directx.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "modules/desktop_capture/win/screen_capturer_win_directx.h" #include #include #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_directx.h b/modules/desktop_capture/win/screen_capturer_win_directx.h index b91882c655..9438bbd0cf 100644 --- a/modules/desktop_capture/win/screen_capturer_win_directx.h +++ b/modules/desktop_capture/win/screen_capturer_win_directx.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ #include #include #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" -#include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" -#include "webrtc/modules/desktop_capture/win/dxgi_frame.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/screen_capture_frame_queue.h" +#include "modules/desktop_capture/win/dxgi_duplicator_controller.h" +#include "modules/desktop_capture/win/dxgi_frame.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -92,4 +92,4 @@ class ScreenCapturerWinDirectx : public DesktopCapturer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ diff --git a/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc b/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc index 577be0aa97..d07a6482ee 100644 --- a/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc +++ b/modules/desktop_capture/win/screen_capturer_win_directx_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "modules/desktop_capture/win/screen_capturer_win_directx.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/modules/desktop_capture/win/screen_capturer_win_gdi.cc index 10e3ca4344..ab5a156a1e 100644 --- a/modules/desktop_capture/win/screen_capturer_win_gdi.cc +++ b/modules/desktop_capture/win/screen_capturer_win_gdi.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h" +#include "modules/desktop_capture/win/screen_capturer_win_gdi.h" #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_frame_win.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/win/cursor.h" -#include "webrtc/modules/desktop_capture/win/desktop.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame_win.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/win/cursor.h" +#include "modules/desktop_capture/win/desktop.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.h b/modules/desktop_capture/win/screen_capturer_win_gdi.h index 6822895c6d..2e30d59e0b 100644 --- a/modules/desktop_capture/win/screen_capturer_win_gdi.h +++ b/modules/desktop_capture/win/screen_capturer_win_gdi.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/display_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/screen_capture_frame_queue.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/win/display_configuration_monitor.h" +#include "modules/desktop_capture/win/scoped_thread_desktop.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -80,4 +80,4 @@ class ScreenCapturerWinGdi : public DesktopCapturer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_ diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc index f744f42aaf..03ea99e58d 100644 --- a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc +++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h" +#include "modules/desktop_capture/win/screen_capturer_win_magnifier.h" #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_frame_win.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/modules/desktop_capture/win/cursor.h" -#include "webrtc/modules/desktop_capture/win/desktop.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_frame_win.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/mouse_cursor.h" +#include "modules/desktop_capture/win/cursor.h" +#include "modules/desktop_capture/win/desktop.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/modules/desktop_capture/win/screen_capturer_win_magnifier.h index 680bac3ff8..b25633da0d 100644 --- a/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ +#define MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ #include @@ -17,13 +17,13 @@ #include #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" -#include "webrtc/modules/desktop_capture/screen_capturer_helper.h" -#include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/atomic32.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/screen_capture_frame_queue.h" +#include "modules/desktop_capture/screen_capturer_helper.h" +#include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/win/scoped_thread_desktop.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/atomic32.h" namespace webrtc { @@ -139,4 +139,4 @@ class ScreenCapturerWinMagnifier : public DesktopCapturer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ +#endif // MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ diff --git a/modules/desktop_capture/win/window_capture_utils.cc b/modules/desktop_capture/win/window_capture_utils.cc index 6b5e5733b9..41c62dca59 100644 --- a/modules/desktop_capture/win/window_capture_utils.cc +++ b/modules/desktop_capture/win/window_capture_utils.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/win/window_capture_utils.h" +#include "modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/win/scoped_gdi_object.h" +#include "rtc_base/checks.h" +#include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/win/window_capture_utils.h b/modules/desktop_capture/win/window_capture_utils.h index 500d58d387..c38995a82a 100644 --- a/modules/desktop_capture/win/window_capture_utils.h +++ b/modules/desktop_capture/win/window_capture_utils.h @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm index fa1ddcd86c..a6b5bf99b9 100644 --- a/modules/desktop_capture/window_capturer_mac.mm +++ b/modules/desktop_capture/window_capturer_mac.mm @@ -15,18 +15,18 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/window_finder_mac.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" -#include "webrtc/modules/desktop_capture/mac/window_list_utils.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/window_finder_mac.h" +#include "modules/desktop_capture/mac/desktop_configuration.h" +#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" +#include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" +#include "modules/desktop_capture/mac/window_list_utils.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/macutils.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_null.cc b/modules/desktop_capture/window_capturer_null.cc index d4ef9b940a..b4e8feab72 100644 --- a/modules/desktop_capture/window_capturer_null.cc +++ b/modules/desktop_capture/window_capturer_null.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_unittest.cc b/modules/desktop_capture/window_capturer_unittest.cc index 5af278c03f..f042df407e 100644 --- a/modules/desktop_capture/window_capturer_unittest.cc +++ b/modules/desktop_capture/window_capturer_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc index 01b4e4db14..6c43658393 100644 --- a/modules/desktop_capture/window_capturer_win.cc +++ b/modules/desktop_capture/window_capturer_win.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame_win.h" -#include "webrtc/modules/desktop_capture/window_finder_win.h" -#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame_win.h" +#include "modules/desktop_capture/window_finder_win.h" +#include "modules/desktop_capture/win/screen_capture_utils.h" +#include "modules/desktop_capture/win/window_capture_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_x11.cc b/modules/desktop_capture/window_capturer_x11.cc index 987ceb7248..78153161e0 100644 --- a/modules/desktop_capture/window_capturer_x11.cc +++ b/modules/desktop_capture/window_capturer_x11.cc @@ -14,18 +14,18 @@ #include -#include "webrtc/modules/desktop_capture/desktop_capture_options.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/window_finder_x11.h" -#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" -#include "webrtc/modules/desktop_capture/x11/window_list_utils.h" -#include "webrtc/modules/desktop_capture/x11/x_atom_cache.h" -#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/window_finder_x11.h" +#include "modules/desktop_capture/x11/shared_x_display.h" +#include "modules/desktop_capture/x11/window_list_utils.h" +#include "modules/desktop_capture/x11/x_atom_cache.h" +#include "modules/desktop_capture/x11/x_server_pixel_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/window_finder.h b/modules/desktop_capture/window_finder.h index f1ede97ae7..360278a6db 100644 --- a/modules/desktop_capture/window_finder.h +++ b/modules/desktop_capture/window_finder.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ +#define MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ #include -#include "webrtc/modules/desktop_capture/desktop_capture_types.h" -#include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" namespace webrtc { @@ -49,4 +49,4 @@ class WindowFinder { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ +#endif // MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_H_ diff --git a/modules/desktop_capture/window_finder_mac.h b/modules/desktop_capture/window_finder_mac.h index 9f872eaadd..30c841b17f 100644 --- a/modules/desktop_capture/window_finder_mac.h +++ b/modules/desktop_capture/window_finder_mac.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ +#define MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ -#include "webrtc/modules/desktop_capture/window_finder.h" +#include "modules/desktop_capture/window_finder.h" namespace webrtc { @@ -27,4 +27,4 @@ class WindowFinderMac final : public WindowFinder { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ +#endif // MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_MAC_H_ diff --git a/modules/desktop_capture/window_finder_mac.mm b/modules/desktop_capture/window_finder_mac.mm index 8bf7150bab..94f30e519d 100644 --- a/modules/desktop_capture/window_finder_mac.mm +++ b/modules/desktop_capture/window_finder_mac.mm @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/window_finder_mac.h" +#include "modules/desktop_capture/window_finder_mac.h" #include -#include "webrtc/modules/desktop_capture/mac/window_list_utils.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/mac/window_list_utils.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/window_finder_unittest.cc b/modules/desktop_capture/window_finder_unittest.cc index 6121ded7b4..4f8a5e47ce 100644 --- a/modules/desktop_capture/window_finder_unittest.cc +++ b/modules/desktop_capture/window_finder_unittest.cc @@ -8,28 +8,28 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/window_finder.h" +#include "modules/desktop_capture/window_finder.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/screen_drawer.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gtest.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/screen_drawer.h" +#include "rtc_base/logging.h" +#include "test/gtest.h" #if defined(USE_X11) -#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" -#include "webrtc/modules/desktop_capture/x11/x_atom_cache.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/x11/shared_x_display.h" +#include "modules/desktop_capture/x11/x_atom_cache.h" +#include "rtc_base/ptr_util.h" #endif #if defined(WEBRTC_WIN) #include -#include "webrtc/modules/desktop_capture/window_finder_win.h" -#include "webrtc/modules/desktop_capture/win/window_capture_utils.h" +#include "modules/desktop_capture/window_finder_win.h" +#include "modules/desktop_capture/win/window_capture_utils.h" #endif namespace webrtc { diff --git a/modules/desktop_capture/window_finder_win.cc b/modules/desktop_capture/window_finder_win.cc index 19dbea3a9e..9f87106a30 100644 --- a/modules/desktop_capture/window_finder_win.cc +++ b/modules/desktop_capture/window_finder_win.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/window_finder_win.h" +#include "modules/desktop_capture/window_finder_win.h" #include -#include "webrtc/rtc_base/ptr_util.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/window_finder_win.h b/modules/desktop_capture/window_finder_win.h index ceec42690c..a04e7e1aae 100644 --- a/modules/desktop_capture/window_finder_win.h +++ b/modules/desktop_capture/window_finder_win.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ +#define MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ -#include "webrtc/modules/desktop_capture/window_finder.h" +#include "modules/desktop_capture/window_finder.h" namespace webrtc { @@ -27,4 +27,4 @@ class WindowFinderWin final : public WindowFinder { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ +#endif // MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_WIN_H_ diff --git a/modules/desktop_capture/window_finder_x11.cc b/modules/desktop_capture/window_finder_x11.cc index d929460eca..3096217e5b 100644 --- a/modules/desktop_capture/window_finder_x11.cc +++ b/modules/desktop_capture/window_finder_x11.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/window_finder_x11.h" +#include "modules/desktop_capture/window_finder_x11.h" -#include "webrtc/modules/desktop_capture/x11/window_list_utils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/desktop_capture/x11/window_list_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" namespace webrtc { diff --git a/modules/desktop_capture/window_finder_x11.h b/modules/desktop_capture/window_finder_x11.h index 6dec89b220..38c30c4670 100644 --- a/modules/desktop_capture/window_finder_x11.h +++ b/modules/desktop_capture/window_finder_x11.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ +#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ +#define MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ -#include "webrtc/modules/desktop_capture/window_finder.h" +#include "modules/desktop_capture/window_finder.h" namespace webrtc { @@ -32,4 +32,4 @@ class WindowFinderX11 final : public WindowFinder { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ +#endif // MODULES_DESKTOP_CAPTURE_WINDOW_FINDER_X11_H_ diff --git a/modules/desktop_capture/x11/shared_x_display.cc b/modules/desktop_capture/x11/shared_x_display.cc index 853d50fb9a..dacb9346ae 100644 --- a/modules/desktop_capture/x11/shared_x_display.cc +++ b/modules/desktop_capture/x11/shared_x_display.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/x11/shared_x_display.h" +#include "modules/desktop_capture/x11/shared_x_display.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/x11/shared_x_display.h b/modules/desktop_capture/x11/shared_x_display.h index 3dcd2fd214..8b888de014 100644 --- a/modules/desktop_capture/x11/shared_x_display.h +++ b/modules/desktop_capture/x11/shared_x_display.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ +#ifndef MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ +#define MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ #include #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/include/atomic32.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "system_wrappers/include/atomic32.h" // Including Xlib.h will involve evil defines (Bool, Status, True, False), which // easily conflict with other headers. @@ -84,4 +84,4 @@ class SharedXDisplay { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ +#endif // MODULES_DESKTOP_CAPTURE_X11_SHARED_X_DISPLAY_H_ diff --git a/modules/desktop_capture/x11/window_list_utils.cc b/modules/desktop_capture/x11/window_list_utils.cc index d8c6e57a36..13bb94172c 100644 --- a/modules/desktop_capture/x11/window_list_utils.cc +++ b/modules/desktop_capture/x11/window_list_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/x11/window_list_utils.h" +#include "modules/desktop_capture/x11/window_list_utils.h" #include #include @@ -17,10 +17,10 @@ #include -#include "webrtc/modules/desktop_capture/x11/x_error_trap.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/x11/x_error_trap.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/x11/window_list_utils.h b/modules/desktop_capture/x11/window_list_utils.h index 8557e24e1f..92571b2ca6 100644 --- a/modules/desktop_capture/x11/window_list_utils.h +++ b/modules/desktop_capture/x11/window_list_utils.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ +#ifndef MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ +#define MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ #include -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/modules/desktop_capture/x11/x_atom_cache.h" -#include "webrtc/rtc_base/function_view.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/x11/x_atom_cache.h" +#include "rtc_base/function_view.h" namespace webrtc { @@ -53,4 +53,4 @@ DesktopRect DesktopRectFromXAttributes(const T& attributes) { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ +#endif // MODULES_DESKTOP_CAPTURE_X11_WINDOW_LIST_UTILS_H_ diff --git a/modules/desktop_capture/x11/x_atom_cache.cc b/modules/desktop_capture/x11/x_atom_cache.cc index 161c8e93e1..fa3a1fdebd 100644 --- a/modules/desktop_capture/x11/x_atom_cache.cc +++ b/modules/desktop_capture/x11/x_atom_cache.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/x11/x_atom_cache.h" +#include "modules/desktop_capture/x11/x_atom_cache.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/desktop_capture/x11/x_atom_cache.h b/modules/desktop_capture/x11/x_atom_cache.h index 8ccf2cb7f7..d77d2fb524 100644 --- a/modules/desktop_capture/x11/x_atom_cache.h +++ b/modules/desktop_capture/x11/x_atom_cache.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ +#ifndef MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ +#define MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ #include #include @@ -40,4 +40,4 @@ class XAtomCache final { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ +#endif // MODULES_DESKTOP_CAPTURE_X11_X_ATOM_CACHE_H_ diff --git a/modules/desktop_capture/x11/x_error_trap.cc b/modules/desktop_capture/x11/x_error_trap.cc index 458fbe61a0..a0dbac6c46 100644 --- a/modules/desktop_capture/x11/x_error_trap.cc +++ b/modules/desktop_capture/x11/x_error_trap.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/x11/x_error_trap.h" +#include "modules/desktop_capture/x11/x_error_trap.h" #include diff --git a/modules/desktop_capture/x11/x_error_trap.h b/modules/desktop_capture/x11/x_error_trap.h index 70414a4cc6..ea9ebf670b 100644 --- a/modules/desktop_capture/x11/x_error_trap.h +++ b/modules/desktop_capture/x11/x_error_trap.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ +#ifndef MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ +#define MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -36,4 +36,4 @@ class XErrorTrap { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ +#endif // MODULES_DESKTOP_CAPTURE_X11_X_ERROR_TRAP_H_ diff --git a/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/modules/desktop_capture/x11/x_server_pixel_buffer.cc index 5068802da6..988404e99e 100644 --- a/modules/desktop_capture/x11/x_server_pixel_buffer.cc +++ b/modules/desktop_capture/x11/x_server_pixel_buffer.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" +#include "modules/desktop_capture/x11/x_server_pixel_buffer.h" #include #include -#include "webrtc/modules/desktop_capture/desktop_frame.h" -#include "webrtc/modules/desktop_capture/x11/window_list_utils.h" -#include "webrtc/modules/desktop_capture/x11/x_error_trap.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/x11/window_list_utils.h" +#include "modules/desktop_capture/x11/x_error_trap.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/x11/x_server_pixel_buffer.h b/modules/desktop_capture/x11/x_server_pixel_buffer.h index 305b8e1650..7e20945f3d 100644 --- a/modules/desktop_capture/x11/x_server_pixel_buffer.h +++ b/modules/desktop_capture/x11/x_server_pixel_buffer.h @@ -10,11 +10,11 @@ // Don't include this file in any .h files because it pulls in some X headers. -#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ -#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ +#ifndef MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ +#define MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ -#include "webrtc/modules/desktop_capture/desktop_geometry.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/constructormagic.h" #include #include @@ -81,4 +81,4 @@ class XServerPixelBuffer { } // namespace webrtc -#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ +#endif // MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ diff --git a/modules/include/DEPS b/modules/include/DEPS index d3f1725335..1b4439dfc7 100644 --- a/modules/include/DEPS +++ b/modules/include/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+webrtc/common_video", + "+common_video", ] diff --git a/modules/include/module.h b/modules/include/module.h index 432ed409ee..5b8124a2c3 100644 --- a/modules/include/module.h +++ b/modules/include/module.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_INCLUDE_MODULE_H_ -#define WEBRTC_MODULES_INCLUDE_MODULE_H_ +#ifndef MODULES_INCLUDE_MODULE_H_ +#define MODULES_INCLUDE_MODULE_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -78,4 +78,4 @@ class RefCountedModule : public Module { } // namespace webrtc -#endif // WEBRTC_MODULES_INCLUDE_MODULE_H_ +#endif // MODULES_INCLUDE_MODULE_H_ diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index a3ac2bbc56..59711bcf59 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ -#define WEBRTC_MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ +#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ +#define MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ #include #include // memcpy @@ -17,16 +17,16 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264_globals.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_globals.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "api/video/video_rotation.h" +#include "common_types.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/deprecation.h" +#include "rtc_base/safe_conversions.h" +#include "typedefs.h" namespace webrtc { @@ -644,4 +644,4 @@ struct PacedPacketInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ +#endif // MODULES_INCLUDE_MODULE_COMMON_TYPES_H_ diff --git a/modules/media_file/DEPS b/modules/media_file/DEPS index 45852cd4e1..dc17ef44fe 100644 --- a/modules/media_file/DEPS +++ b/modules/media_file/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+webrtc/common_audio", - "+webrtc/system_wrappers", + "+common_audio", + "+system_wrappers", ] diff --git a/modules/media_file/media_file.h b/modules/media_file/media_file.h index f6924d6bb0..f7225d0d29 100644 --- a/modules/media_file/media_file.h +++ b/modules/media_file/media_file.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ -#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ +#ifndef MODULES_MEDIA_FILE_MEDIA_FILE_H_ +#define MODULES_MEDIA_FILE_MEDIA_FILE_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/media_file_defines.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" +#include "modules/media_file/media_file_defines.h" +#include "typedefs.h" namespace webrtc { class MediaFile : public Module @@ -177,4 +177,4 @@ protected: virtual ~MediaFile() {} }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ +#endif // MODULES_MEDIA_FILE_MEDIA_FILE_H_ diff --git a/modules/media_file/media_file_defines.h b/modules/media_file/media_file_defines.h index 3113620ede..534a366d83 100644 --- a/modules/media_file/media_file_defines.h +++ b/modules/media_file/media_file_defines.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ -#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ +#ifndef MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ +#define MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { // Callback class for the MediaFile class. @@ -47,4 +47,4 @@ protected: FileCallback() {} }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ +#endif // MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ diff --git a/modules/media_file/media_file_impl.cc b/modules/media_file/media_file_impl.cc index a43769d6c6..80b407dd11 100644 --- a/modules/media_file/media_file_impl.cc +++ b/modules/media_file/media_file_impl.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/media_file/media_file_impl.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "modules/media_file/media_file_impl.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/file_wrapper.h" namespace webrtc { MediaFile* MediaFile::CreateMediaFile(const int32_t id) diff --git a/modules/media_file/media_file_impl.h b/modules/media_file/media_file_impl.h index 664030a0f1..0e0f748d15 100644 --- a/modules/media_file/media_file_impl.h +++ b/modules/media_file/media_file_impl.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ -#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ +#ifndef MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ +#define MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/media_file.h" -#include "webrtc/modules/media_file/media_file_defines.h" -#include "webrtc/modules/media_file/media_file_utility.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "modules/media_file/media_file.h" +#include "modules/media_file/media_file_defines.h" +#include "modules/media_file/media_file_utility.h" +#include "rtc_base/criticalsection.h" namespace webrtc { class MediaFileImpl : public MediaFile @@ -145,4 +145,4 @@ private: }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ +#endif // MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ diff --git a/modules/media_file/media_file_unittest.cc b/modules/media_file/media_file_unittest.cc index 5e70a5fc38..7df1a68cde 100644 --- a/modules/media_file/media_file_unittest.cc +++ b/modules/media_file/media_file_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/media_file/media_file.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/media_file/media_file.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" class MediaFileTest : public testing::Test { protected: diff --git a/modules/media_file/media_file_utility.cc b/modules/media_file/media_file_utility.cc index 8b0f22d9b7..d350ea97ac 100644 --- a/modules/media_file/media_file_utility.cc +++ b/modules/media_file/media_file_utility.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/media_file/media_file_utility.h" +#include "modules/media_file/media_file_utility.h" #include #include #include #include -#include "webrtc/common_audio/wav_header.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/typedefs.h" +#include "common_audio/wav_header.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/file_wrapper.h" +#include "typedefs.h" namespace { diff --git a/modules/media_file/media_file_utility.h b/modules/media_file/media_file_utility.h index b339af7e41..613a97045d 100644 --- a/modules/media_file/media_file_utility.h +++ b/modules/media_file/media_file_utility.h @@ -9,13 +9,13 @@ */ // Note: the class cannot be used for reading and writing at the same time. -#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ -#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ +#ifndef MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ +#define MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/media_file/media_file_defines.h" +#include "common_types.h" +#include "modules/media_file/media_file_defines.h" namespace webrtc { class InStream; @@ -278,4 +278,4 @@ private: uint8_t _tempData[WAV_MAX_BUFFER_SIZE]; }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ +#endif // MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ diff --git a/modules/module_common_types_unittest.cc b/modules/module_common_types_unittest.cc index f91668b162..f601a59051 100644 --- a/modules/module_common_types_unittest.cc +++ b/modules/module_common_types_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" #include // memcmp -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/pacing/DEPS b/modules/pacing/DEPS index ab0885b6b9..3088a75e68 100644 --- a/modules/pacing/DEPS +++ b/modules/pacing/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+webrtc/system_wrappers", - "+webrtc/logging/rtc_event_log" + "+system_wrappers", + "+logging/rtc_event_log" ] diff --git a/modules/pacing/alr_detector.cc b/modules/pacing/alr_detector.cc index 68732105c1..3b60a3793a 100644 --- a/modules/pacing/alr_detector.cc +++ b/modules/pacing/alr_detector.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/alr_detector.h" +#include "modules/pacing/alr_detector.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/pacing/alr_detector.h b/modules/pacing/alr_detector.h index 0d43fbb8f2..c8c6faf716 100644 --- a/modules/pacing/alr_detector.h +++ b/modules/pacing/alr_detector.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_ALR_DETECTOR_H_ -#define WEBRTC_MODULES_PACING_ALR_DETECTOR_H_ +#ifndef MODULES_PACING_ALR_DETECTOR_H_ +#define MODULES_PACING_ALR_DETECTOR_H_ -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/pacing/interval_budget.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/pacing/interval_budget.h" +#include "modules/pacing/paced_sender.h" +#include "rtc_base/rate_statistics.h" +#include "typedefs.h" namespace webrtc { @@ -80,4 +80,4 @@ class AlrDetector { } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_ALR_DETECTOR_H_ +#endif // MODULES_PACING_ALR_DETECTOR_H_ diff --git a/modules/pacing/alr_detector_unittest.cc b/modules/pacing/alr_detector_unittest.cc index 9f1998b617..891b4ef0c1 100644 --- a/modules/pacing/alr_detector_unittest.cc +++ b/modules/pacing/alr_detector_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/alr_detector.h" +#include "modules/pacing/alr_detector.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace { diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc index 8f676af678..c25666669c 100644 --- a/modules/pacing/bitrate_prober.cc +++ b/modules/pacing/bitrate_prober.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/bitrate_prober.h" +#include "modules/pacing/bitrate_prober.h" #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/pacing/paced_sender.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/pacing/bitrate_prober.h b/modules/pacing/bitrate_prober.h index a88898fc03..b5cb56a5ea 100644 --- a/modules/pacing/bitrate_prober.h +++ b/modules/pacing/bitrate_prober.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_BITRATE_PROBER_H_ -#define WEBRTC_MODULES_PACING_BITRATE_PROBER_H_ +#ifndef MODULES_PACING_BITRATE_PROBER_H_ +#define MODULES_PACING_BITRATE_PROBER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/basictypes.h" +#include "typedefs.h" namespace webrtc { class RtcEventLog; @@ -107,4 +107,4 @@ class BitrateProber { } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_BITRATE_PROBER_H_ +#endif // MODULES_PACING_BITRATE_PROBER_H_ diff --git a/modules/pacing/bitrate_prober_unittest.cc b/modules/pacing/bitrate_prober_unittest.cc index 7040bed40f..fda4adb234 100644 --- a/modules/pacing/bitrate_prober_unittest.cc +++ b/modules/pacing/bitrate_prober_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/pacing/bitrate_prober.h" -#include "webrtc/test/gtest.h" +#include "modules/pacing/bitrate_prober.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/pacing/interval_budget.cc b/modules/pacing/interval_budget.cc index 7e4fe0200a..b63bc37149 100644 --- a/modules/pacing/interval_budget.cc +++ b/modules/pacing/interval_budget.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/interval_budget.h" +#include "modules/pacing/interval_budget.h" #include diff --git a/modules/pacing/interval_budget.h b/modules/pacing/interval_budget.h index fe770ab43f..2d07573cd2 100644 --- a/modules/pacing/interval_budget.h +++ b/modules/pacing/interval_budget.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_INTERVAL_BUDGET_H_ -#define WEBRTC_MODULES_PACING_INTERVAL_BUDGET_H_ +#ifndef MODULES_PACING_INTERVAL_BUDGET_H_ +#define MODULES_PACING_INTERVAL_BUDGET_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -40,4 +40,4 @@ class IntervalBudget { } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_INTERVAL_BUDGET_H_ +#endif // MODULES_PACING_INTERVAL_BUDGET_H_ diff --git a/modules/pacing/interval_budget_unittest.cc b/modules/pacing/interval_budget_unittest.cc index 30e2c798f1..cf02cb6af2 100644 --- a/modules/pacing/interval_budget_unittest.cc +++ b/modules/pacing/interval_budget_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/interval_budget.h" +#include "modules/pacing/interval_budget.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/pacing/mock/mock_paced_sender.h b/modules/pacing/mock/mock_paced_sender.h index d6587b4b75..3366aa85ed 100644 --- a/modules/pacing/mock/mock_paced_sender.h +++ b/modules/pacing/mock/mock_paced_sender.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ -#define WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ +#ifndef MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ +#define MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ #include -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" +#include "modules/pacing/paced_sender.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" namespace webrtc { @@ -41,4 +41,4 @@ class MockPacedSender : public PacedSender { } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ +#endif // MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index d0a8864f14..785a2de0cf 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/paced_sender.h" +#include "modules/pacing/paced_sender.h" #include #include @@ -16,15 +16,15 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/modules/pacing/bitrate_prober.h" -#include "webrtc/modules/pacing/interval_budget.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/include/module_common_types.h" +#include "modules/pacing/alr_detector.h" +#include "modules/pacing/bitrate_prober.h" +#include "modules/pacing/interval_budget.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" namespace { // Time limit in milliseconds between packet bursts. diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 196c9f4be9..b753ac7d58 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_PACED_SENDER_H_ -#define WEBRTC_MODULES_PACING_PACED_SENDER_H_ +#ifndef MODULES_PACING_PACED_SENDER_H_ +#define MODULES_PACING_PACED_SENDER_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/pacing/pacer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "modules/pacing/pacer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { class AlrDetector; @@ -199,4 +199,4 @@ class PacedSender : public Pacer { int64_t queue_time_limit RTC_GUARDED_BY(critsect_); }; } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_PACED_SENDER_H_ +#endif // MODULES_PACING_PACED_SENDER_H_ diff --git a/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc index 8a3cee0991..7ad3f9fdcb 100644 --- a/modules/pacing/paced_sender_unittest.cc +++ b/modules/pacing/paced_sender_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/pacing/paced_sender.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::Field; diff --git a/modules/pacing/pacer.h b/modules/pacing/pacer.h index b5ac2ec597..8b43e1851e 100644 --- a/modules/pacing/pacer.h +++ b/modules/pacing/pacer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_PACER_H_ -#define WEBRTC_MODULES_PACING_PACER_H_ +#ifndef MODULES_PACING_PACER_H_ +#define MODULES_PACING_PACER_H_ -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/include/module.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { class Pacer : public Module, public RtpPacketSender { @@ -34,4 +34,4 @@ class Pacer : public Module, public RtpPacketSender { ~Pacer() override {} }; } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_PACER_H_ +#endif // MODULES_PACING_PACER_H_ diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc index b5cd444495..7f76c6626a 100644 --- a/modules/pacing/packet_router.cc +++ b/modules/pacing/packet_router.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/packet_router.h" +#include "modules/pacing/packet_router.h" #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace webrtc { namespace { diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h index d76a210701..651dcfa094 100644 --- a/modules/pacing/packet_router.h +++ b/modules/pacing/packet_router.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ -#define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ +#ifndef MODULES_PACING_PACKET_ROUTER_H_ +#define MODULES_PACING_PACKET_ROUTER_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "common_types.h" +#include "modules/pacing/paced_sender.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -128,4 +128,4 @@ class PacketRouter : public PacedSender::PacketSender, RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); }; } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ +#endif // MODULES_PACING_PACKET_ROUTER_H_ diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc index c33f25ce93..7a3847c494 100644 --- a/modules/pacing/packet_router_unittest.cc +++ b/modules/pacing/packet_router_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/DEPS b/modules/remote_bitrate_estimator/DEPS index 6d0079d14f..d6a2fbafc9 100644 --- a/modules/remote_bitrate_estimator/DEPS +++ b/modules/remote_bitrate_estimator/DEPS @@ -1,10 +1,10 @@ include_rules = [ - "+webrtc/logging/rtc_event_log", - "+webrtc/system_wrappers", + "+logging/rtc_event_log", + "+system_wrappers", ] specific_include_rules = { "nada\.h": [ - "+webrtc/voice_engine", + "+voice_engine", ], } diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc index dc6f02d8c6..d91f2cb342 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_minmax.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.h b/modules/remote_bitrate_estimator/aimd_rate_control.h index 24cb4d3aa7..769429a280 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -89,4 +89,4 @@ class AimdRateControl { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ diff --git a/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc b/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc index cf6b5a51d7..a7bb752ee6 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc @@ -9,9 +9,9 @@ */ #include -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/remote_bitrate_estimator/bwe_defines.cc b/modules/remote_bitrate_estimator/bwe_defines.cc index 15eafc20f7..2c55e324db 100644 --- a/modules/remote_bitrate_estimator/bwe_defines.cc +++ b/modules/remote_bitrate_estimator/bwe_defines.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc index 92d5a55b4d..f8866d81cb 100644 --- a/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe_test.h" +#include "modules/remote_bitrate_estimator/test/packet_receiver.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "rtc_base/constructormagic.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h index 426dbb1b6c..a08183c338 100644 --- a/modules/remote_bitrate_estimator/include/bwe_defines.h +++ b/modules/remote_bitrate_estimator/include/bwe_defines.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ -#include "webrtc/api/optional.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "typedefs.h" #define BWE_MAX(a, b) ((a) > (b) ? (a) : (b)) #define BWE_MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -57,4 +57,4 @@ struct RateControlInput { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ diff --git a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h index 0177b8180f..6a9d20fb41 100644 --- a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h +++ b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h @@ -10,17 +10,17 @@ // This class estimates the incoming available bandwidth. -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "typedefs.h" namespace webrtc { @@ -80,4 +80,4 @@ inline bool RemoteBitrateEstimator::GetStats( } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_ diff --git a/modules/remote_bitrate_estimator/include/send_time_history.h b/modules/remote_bitrate_estimator/include/send_time_history.h index bc3b8ccac0..3946c4effa 100644 --- a/modules/remote_bitrate_estimator/include/send_time_history.h +++ b/modules/remote_bitrate_estimator/include/send_time_history.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class Clock; @@ -52,4 +52,4 @@ class SendTimeHistory { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ diff --git a/modules/remote_bitrate_estimator/inter_arrival.cc b/modules/remote_bitrate_estimator/inter_arrival.cc index 81244f5ddc..3c448ddb66 100644 --- a/modules/remote_bitrate_estimator/inter_arrival.cc +++ b/modules/remote_bitrate_estimator/inter_arrival.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/inter_arrival.h b/modules/remote_bitrate_estimator/inter_arrival.h index 00742697f4..a81f04772a 100644 --- a/modules/remote_bitrate_estimator/inter_arrival.h +++ b/modules/remote_bitrate_estimator/inter_arrival.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -92,4 +92,4 @@ class InterArrival { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ diff --git a/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc index 107641967c..426e32c603 100644 --- a/modules/remote_bitrate_estimator/inter_arrival_unittest.cc +++ b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/overuse_detector.cc b/modules/remote_bitrate_estimator/overuse_detector.cc index b7d5ca39aa..004214579c 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/modules/remote_bitrate_estimator/overuse_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" #include #include @@ -17,13 +17,13 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h index 399bfa4067..466216bf09 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.h +++ b/modules/remote_bitrate_estimator/overuse_detector.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -59,4 +59,4 @@ class OveruseDetector { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ diff --git a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc index e90a4eee51..79d83ecd32 100644 --- a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc +++ b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc @@ -15,14 +15,14 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/overuse_estimator.h" +#include "rtc_base/random.h" +#include "rtc_base/rate_statistics.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/overuse_estimator.cc b/modules/remote_bitrate_estimator/overuse_estimator.cc index 27afdd0e11..ffed5e39bf 100644 --- a/modules/remote_bitrate_estimator/overuse_estimator.cc +++ b/modules/remote_bitrate_estimator/overuse_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" +#include "modules/remote_bitrate_estimator/overuse_estimator.h" #include #include @@ -17,9 +17,9 @@ #include -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_estimator.h b/modules/remote_bitrate_estimator/overuse_estimator.h index d05ddee944..62e5398661 100644 --- a/modules/remote_bitrate_estimator/overuse_estimator.h +++ b/modules/remote_bitrate_estimator/overuse_estimator.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_types.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -70,4 +70,4 @@ class OveruseEstimator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index c43bc12a4a..64a0a2ae49 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include #include -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/typedefs.h" +#include "modules/pacing/paced_sender.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/metrics.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index cde266fbc0..9bf8d9a45c 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ #include #include #include #include -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/overuse_estimator.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/rate_statistics.h" namespace webrtc { @@ -139,4 +139,4 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc index 017cc675fc..ccfb64645b 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc index 050a5b788e..0d27d2b891 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" #include -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" -#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/typedefs.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/inter_arrival.h" +#include "modules/remote_bitrate_estimator/overuse_detector.h" +#include "modules/remote_bitrate_estimator/overuse_estimator.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 4634492b48..fd4ff32979 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ #include #include #include -#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/rate_statistics.h" namespace webrtc { @@ -72,4 +72,4 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc index 639a8ceb6c..c4bb76bb23 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" +#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc index 4c12eac32f..0b3ff439d8 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index 27c54d6ccb..c3a323b385 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ #include #include @@ -17,10 +17,10 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace testing { @@ -218,4 +218,4 @@ class RemoteBitrateEstimatorTest : public ::testing::Test { }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_UNITTEST_HELPER_H_ diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc index 97b8bcf7ea..ee66c72b55 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc @@ -16,13 +16,13 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe_test.h" +#include "modules/remote_bitrate_estimator/test/packet_receiver.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/random.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 6ddee174b1..0c459b39b3 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" +#include "modules/remote_bitrate_estimator/remote_estimator_proxy.h" #include #include -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/modules/remote_bitrate_estimator/remote_estimator_proxy.h index 129b5e704a..7a69177a08 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy.h +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/include/module_common_types.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -74,4 +74,4 @@ class RemoteEstimatorProxy : public RemoteBitrateEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc index 66571083e9..4f1d9e7b13 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/pacing/packet_router.h" +#include "modules/remote_bitrate_estimator/remote_estimator_proxy.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::ElementsAre; diff --git a/modules/remote_bitrate_estimator/send_time_history.cc b/modules/remote_bitrate_estimator/send_time_history.cc index 4cc7a7c1c2..014080530a 100644 --- a/modules/remote_bitrate_estimator/send_time_history.cc +++ b/modules/remote_bitrate_estimator/send_time_history.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" +#include "modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/modules/remote_bitrate_estimator/send_time_history_unittest.cc index c3c047c6d1..bda245c03c 100644 --- a/modules/remote_bitrate_estimator/send_time_history_unittest.cc +++ b/modules/remote_bitrate_estimator/send_time_history_unittest.cc @@ -12,10 +12,10 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/remote_bitrate_estimator/include/send_time_history.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc b/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc index 3df97aad18..e9321c6919 100644 --- a/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc +++ b/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.h" +#include "modules/remote_bitrate_estimator/test/bbr_paced_sender.h" #include #include #include #include -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/pacing/paced_sender.h" +#include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bbr_paced_sender.h b/modules/remote_bitrate_estimator/test/bbr_paced_sender.h index f5ddaeff68..6cb45e3966 100644 --- a/modules/remote_bitrate_estimator/test/bbr_paced_sender.h +++ b/modules/remote_bitrate_estimator/test/bbr_paced_sender.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ #include #include -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/pacing/pacer.h" +#include "modules/pacing/paced_sender.h" +#include "modules/pacing/pacer.h" namespace webrtc { namespace testing { @@ -89,4 +89,4 @@ class BbrPacedSender : public Pacer { std::unique_ptr congestion_window_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BBR_PACED_SENDER_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe.cc b/modules/remote_bitrate_estimator/test/bwe.cc index abc301cfca..cf72f29d24 100644 --- a/modules/remote_bitrate_estimator/test/bwe.cc +++ b/modules/remote_bitrate_estimator/test/bwe.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" #include -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "modules/remote_bitrate_estimator/test/estimators/nada.h" +#include "modules/remote_bitrate_estimator/test/estimators/remb.h" +#include "modules/remote_bitrate_estimator/test/estimators/send_side.h" +#include "modules/remote_bitrate_estimator/test/estimators/tcp.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe.h b/modules/remote_bitrate_estimator/test/bwe.h index 4474ed253a..96aed21c6b 100644 --- a/modules/remote_bitrate_estimator/test/bwe.h +++ b/modules/remote_bitrate_estimator/test/bwe.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ #include #include #include #include -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/packet.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/gtest_prod_util.h" namespace webrtc { namespace testing { @@ -196,4 +196,4 @@ BweReceiver* CreateBweReceiver(BandwidthEstimatorType type, } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_test.cc b/modules/remote_bitrate_estimator/test/bwe_test.cc index 357cfa5c8d..e998d8f4c3 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" +#include "modules/remote_bitrate_estimator/test/bwe_test.h" #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "modules/include/module_common_types.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "modules/remote_bitrate_estimator/test/packet_receiver.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "rtc_base/arraysize.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" +#include "test/testsupport/perf_test.h" using std::vector; diff --git a/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h index 01e439c7af..43156e7fc7 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/modules/remote_bitrate_estimator/test/bwe_test.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ #include #include #include -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gtest.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "rtc_base/constructormagic.h" +#include "test/gtest.h" namespace webrtc { @@ -193,4 +193,4 @@ struct DefaultEvaluationFilter { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc index 94a3d5e110..7b12f067cf 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h" #include @@ -16,10 +16,10 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/constructormagic.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h index b3df7124e3..f07fb14a51 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ #include -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { namespace testing { @@ -42,4 +42,4 @@ class BaseLineFileInterface { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc index 5fe78a7758..ffd410ef37 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" #ifdef WIN32 #include @@ -17,8 +17,8 @@ #endif #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h index 99bdcf9741..55a03ce6cd 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace testing { @@ -56,4 +56,4 @@ class OutputFileWriter { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index 51c1f55afe..6c303eea04 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/safe_minmax.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/safe_minmax.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/modules/remote_bitrate_estimator/test/bwe_test_framework.h index 08b0a72c50..8cf45beac5 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ #include #include @@ -24,17 +24,17 @@ #include #include -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/typedefs.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/include/module_common_types.h" +#include "modules/pacing/paced_sender.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/remote_bitrate_estimator/test/packet.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "typedefs.h" namespace webrtc { @@ -470,4 +470,4 @@ class PeriodicKeyFrameSource : public AdaptiveVideoSource { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index 775756e943..2562732a1b 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include -#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/test/packet.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "rtc_base/constructormagic.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.cc b/modules/remote_bitrate_estimator/test/bwe_test_logging.cc index 729254a9b3..fb9955ae32 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_logging.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE @@ -18,9 +18,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/platform_thread.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h index 76f2aeed4a..c02fde889c 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ // To enable BWE logging, run this command from trunk/ : // build/gyp_chromium --depth=. webrtc/modules/modules.gyp @@ -128,9 +128,9 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \ do { \ @@ -348,4 +348,4 @@ class Logging { } // namespace webrtc #endif // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_ diff --git a/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_unittest.cc index 3033726d87..6c0bc53f20 100644 --- a/modules/remote_bitrate_estimator/test/bwe_unittest.cc +++ b/modules/remote_bitrate_estimator/test/bwe_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/arraysize.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/bbr.cc b/modules/remote_bitrate_estimator/test/estimators/bbr.cc index a8444b4bfe..c9ed3aea2c 100644 --- a/modules/remote_bitrate_estimator/test/estimators/bbr.cc +++ b/modules/remote_bitrate_estimator/test/estimators/bbr.cc @@ -9,14 +9,14 @@ * */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h" +#include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" +#include "modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" +#include "modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/bbr.h b/modules/remote_bitrate_estimator/test/estimators/bbr.h index cf61c5747e..a79a40b8c5 100644 --- a/modules/remote_bitrate_estimator/test/estimators/bbr.h +++ b/modules/remote_bitrate_estimator/test/estimators/bbr.h @@ -9,18 +9,18 @@ * */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/random.h" +#include "api/optional.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/random.h" namespace webrtc { namespace testing { @@ -239,4 +239,4 @@ class BbrBweReceiver : public BweReceiver { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc b/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc index 5c01e89aa1..f3f66a0e40 100644 --- a/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc +++ b/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc @@ -9,11 +9,11 @@ * */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h" +#include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" #include -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/congestion_window.h b/modules/remote_bitrate_estimator/test/estimators/congestion_window.h index 3194d81c2a..f344adb739 100644 --- a/modules/remote_bitrate_estimator/test/estimators/congestion_window.h +++ b/modules/remote_bitrate_estimator/test/estimators/congestion_window.h @@ -9,12 +9,12 @@ * */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { namespace testing { @@ -46,4 +46,4 @@ class CongestionWindow { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc index 2415c137ac..3f8760cac7 100644 --- a/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc +++ b/modules/remote_bitrate_estimator/test/estimators/congestion_window_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc index 3a7e0dd062..49efcdccc9 100644 --- a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc +++ b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.cc @@ -9,7 +9,7 @@ * */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" +#include "modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h index 15d06760a6..011934d9cf 100644 --- a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h +++ b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h @@ -9,8 +9,8 @@ * */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ #include #include @@ -19,9 +19,9 @@ #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/remote_bitrate_estimator/include/send_time_history.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" namespace webrtc { namespace testing { @@ -52,4 +52,4 @@ class MaxBandwidthFilter { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc index 6c13fd1b51..46b6d78422 100644 --- a/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc +++ b/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" +#include "modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h index 82451bd242..ed8ec8601e 100644 --- a/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h +++ b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h @@ -9,14 +9,14 @@ * */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ #include #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { namespace testing { @@ -70,4 +70,4 @@ class MinRttFilter { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc index 5cf08d4111..53767e0db7 100644 --- a/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc +++ b/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h" +#include "modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/nada.cc b/modules/remote_bitrate_estimator/test/estimators/nada.cc index 0c2bf78264..d3d0baea0e 100644 --- a/modules/remote_bitrate_estimator/test/estimators/nada.cc +++ b/modules/remote_bitrate_estimator/test/estimators/nada.cc @@ -18,10 +18,10 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/rtc_base/arraysize.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/remote_bitrate_estimator/test/estimators/nada.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "rtc_base/arraysize.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/nada.h b/modules/remote_bitrate_estimator/test/estimators/nada.h index 75f769d0cb..590175c784 100644 --- a/modules/remote_bitrate_estimator/test/estimators/nada.h +++ b/modules/remote_bitrate_estimator/test/estimators/nada.h @@ -14,17 +14,17 @@ // http://tools.ietf.org/html/draft-zhu-rmcat-nada-06 // From March 26, 2015. -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ #include #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/voice_engine/channel.h" +#include "modules/include/module_common_types.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "rtc_base/constructormagic.h" +#include "voice_engine/channel.h" namespace webrtc { @@ -108,4 +108,4 @@ class NadaBweSender : public BweSender { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc index d6226ab94b..eac9e9349a 100644 --- a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc +++ b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" +#include "modules/remote_bitrate_estimator/test/estimators/nada.h" #include #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/packet.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/constructormagic.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.cc b/modules/remote_bitrate_estimator/test/estimators/remb.cc index c3f1dc98e4..bf8ad3282e 100644 --- a/modules/remote_bitrate_estimator/test/estimators/remb.cc +++ b/modules/remote_bitrate_estimator/test/estimators/remb.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h" +#include "modules/remote_bitrate_estimator/test/estimators/remb.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.h b/modules/remote_bitrate_estimator/test/estimators/remb.h index 77086a761e..1b30327c6f 100644 --- a/modules/remote_bitrate_estimator/test/estimators/remb.h +++ b/modules/remote_bitrate_estimator/test/estimators/remb.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ #include #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -84,4 +84,4 @@ class RembReceiver : public BweReceiver, public RemoteBitrateObserver { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_REMB_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/modules/remote_bitrate_estimator/test/estimators/send_side.cc index d4192402be..d26f7325a2 100644 --- a/modules/remote_bitrate_estimator/test/estimators/send_side.cc +++ b/modules/remote_bitrate_estimator/test/estimators/send_side.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h" +#include "modules/remote_bitrate_estimator/test/estimators/send_side.h" #include -#include "webrtc/modules/congestion_controller/delay_based_bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.h b/modules/remote_bitrate_estimator/test/estimators/send_side.h index ed6a7cdee8..89150c51e6 100644 --- a/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ b/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ #include #include -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/include/send_time_history.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" namespace webrtc { namespace testing { @@ -73,4 +73,4 @@ class SendSideBweReceiver : public BweReceiver { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ diff --git a/modules/remote_bitrate_estimator/test/estimators/tcp.cc b/modules/remote_bitrate_estimator/test/estimators/tcp.cc index fefc8472b9..5899837985 100644 --- a/modules/remote_bitrate_estimator/test/estimators/tcp.cc +++ b/modules/remote_bitrate_estimator/test/estimators/tcp.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h" +#include "modules/remote_bitrate_estimator/test/estimators/tcp.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/test/gtest.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/estimators/tcp.h b/modules/remote_bitrate_estimator/test/estimators/tcp.h index b33c93eef7..472aaf823a 100644 --- a/modules/remote_bitrate_estimator/test/estimators/tcp.h +++ b/modules/remote_bitrate_estimator/test/estimators/tcp.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" namespace webrtc { namespace testing { @@ -35,4 +35,4 @@ class TcpBweReceiver : public BweReceiver { } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ diff --git a/modules/remote_bitrate_estimator/test/metric_recorder.cc b/modules/remote_bitrate_estimator/test/metric_recorder.cc index c0dc7415a8..e3b815fbc8 100644 --- a/modules/remote_bitrate_estimator/test/metric_recorder.cc +++ b/modules/remote_bitrate_estimator/test/metric_recorder.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "modules/remote_bitrate_estimator/test/metric_recorder.h" #include -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/typedefs.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "typedefs.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/metric_recorder.h b/modules/remote_bitrate_estimator/test/metric_recorder.h index 56ea1df3d2..4df504a24a 100644 --- a/modules/remote_bitrate_estimator/test/metric_recorder.h +++ b/modules/remote_bitrate_estimator/test/metric_recorder.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ #include #include #include #include -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "rtc_base/gtest_prod_util.h" namespace webrtc { namespace testing { @@ -185,4 +185,4 @@ class MetricRecorder { } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_ diff --git a/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc index e8f291cbeb..f085797643 100644 --- a/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc +++ b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "modules/remote_bitrate_estimator/test/metric_recorder.h" #include #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/packet.h b/modules/remote_bitrate_estimator/test/packet.h index 05e1267436..cd44ae3bae 100644 --- a/modules/remote_bitrate_estimator/test/packet.h +++ b/modules/remote_bitrate_estimator/test/packet.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ #include #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" namespace webrtc { namespace testing { @@ -217,4 +217,4 @@ typedef std::list::const_iterator PacketsConstIt; } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.cc b/modules/remote_bitrate_estimator/test/packet_receiver.cc index 9e786e548c..f4a42ed182 100644 --- a/modules/remote_bitrate_estimator/test/packet_receiver.cc +++ b/modules/remote_bitrate_estimator/test/packet_receiver.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" +#include "modules/remote_bitrate_estimator/test/packet_receiver.h" #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/include/module_common_types.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.h b/modules/remote_bitrate_estimator/test/packet_receiver.h index c63e38ffd4..a4b26daf1e 100644 --- a/modules/remote_bitrate_estimator/test/packet_receiver.h +++ b/modules/remote_bitrate_estimator/test/packet_receiver.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace testing { @@ -68,4 +68,4 @@ class PacketReceiver : public PacketProcessor { } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ diff --git a/modules/remote_bitrate_estimator/test/packet_sender.cc b/modules/remote_bitrate_estimator/test/packet_sender.cc index 1eed3809d7..08db1a3f55 100644 --- a/modules/remote_bitrate_estimator/test/packet_sender.cc +++ b/modules/remote_bitrate_estimator/test/packet_sender.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "modules/remote_bitrate_estimator/test/packet_sender.h" #include #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/pacer.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/include/module_common_types.h" +#include "modules/pacing/pacer.h" +#include "modules/remote_bitrate_estimator/test/bbr_paced_sender.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "rtc_base/checks.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/packet_sender.h b/modules/remote_bitrate_estimator/test/packet_sender.h index 86ad0e812f..81a466bca4 100644 --- a/modules/remote_bitrate_estimator/test/packet_sender.h +++ b/modules/remote_bitrate_estimator/test/packet_sender.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ #include #include @@ -17,10 +17,10 @@ #include #include -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/include/module.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace testing { @@ -204,4 +204,4 @@ class TcpSender : public PacketSender { } // namespace bwe } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ diff --git a/modules/remote_bitrate_estimator/tools/bwe_rtp.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp.cc index d8493982c0..2fcb4241e3 100644 --- a/modules/remote_bitrate_estimator/tools/bwe_rtp.cc +++ b/modules/remote_bitrate_estimator/tools/bwe_rtp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h" +#include "modules/remote_bitrate_estimator/tools/bwe_rtp.h" #include @@ -16,12 +16,12 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" -#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/rtp_file_reader.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" +#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "rtc_base/flags.h" +#include "test/rtp_file_reader.h" namespace flags { diff --git a/modules/remote_bitrate_estimator/tools/bwe_rtp.h b/modules/remote_bitrate_estimator/tools/bwe_rtp.h index 2d12a8083f..9a4723b795 100644 --- a/modules/remote_bitrate_estimator/tools/bwe_rtp.h +++ b/modules/remote_bitrate_estimator/tools/bwe_rtp.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ -#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ +#ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ +#define MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ #include @@ -33,4 +33,4 @@ bool ParseArgsAndSetupEstimator( webrtc::RemoteBitrateEstimator** estimator, std::string* estimator_used); -#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ +#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_ diff --git a/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc index fa9a026a95..7dae0408a1 100644 --- a/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc +++ b/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc @@ -12,12 +12,12 @@ #include -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/rtp_file_reader.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/tools/bwe_rtp.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "rtc_base/format_macros.h" +#include "test/rtp_file_reader.h" class Observer : public webrtc::RemoteBitrateObserver { public: diff --git a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc index 7a88236c2d..6ff705a49d 100644 --- a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc +++ b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/rtp_file_reader.h" +#include "modules/remote_bitrate_estimator/tools/bwe_rtp.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "rtc_base/format_macros.h" +#include "test/rtp_file_reader.h" int main(int argc, char** argv) { webrtc::test::RtpFileReader* reader; diff --git a/modules/rtp_rtcp/DEPS b/modules/rtp_rtcp/DEPS index 83abb27473..9d9f33cbaf 100644 --- a/modules/rtp_rtcp/DEPS +++ b/modules/rtp_rtcp/DEPS @@ -1,6 +1,6 @@ include_rules = [ - "+webrtc/call", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log", - "+webrtc/system_wrappers", + "+call", + "+common_video", + "+logging/rtc_event_log", + "+system_wrappers", ] diff --git a/modules/rtp_rtcp/include/flexfec_receiver.h b/modules/rtp_rtcp/include/flexfec_receiver.h index ae4696441b..7355262a13 100644 --- a/modules/rtp_rtcp/include/flexfec_receiver.h +++ b/modules/rtp_rtcp/include/flexfec_receiver.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ +#define MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ #include -#include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/include/ulpfec_receiver.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/sequenced_task_checker.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -66,4 +66,4 @@ class FlexfecReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h index 9404f789c0..5b939d534b 100644 --- a/modules/rtp_rtcp/include/flexfec_sender.h +++ b/modules/rtp_rtcp/include/flexfec_sender.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ +#define MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/array_view.h" +#include "api/rtpparameters.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/ulpfec_generator.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -90,4 +90,4 @@ class FlexfecSender { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_FLEXFEC_SENDER_H_ diff --git a/modules/rtp_rtcp/include/receive_statistics.h b/modules/rtp_rtcp/include/receive_statistics.h index 11e18be841..934d6f93f1 100644 --- a/modules/rtp_rtcp/include/receive_statistics.h +++ b/modules/rtp_rtcp/include/receive_statistics.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ +#define MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ #include #include -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/typedefs.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "typedefs.h" namespace webrtc { @@ -92,4 +92,4 @@ class ReceiveStatistics : public ReceiveStatisticsProvider { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_ diff --git a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h index e80593bf9f..ef0ccdf891 100644 --- a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h +++ b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ +#define MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/rtp_to_ntp_estimator.h" namespace webrtc { @@ -50,4 +50,4 @@ class RemoteNtpTimeEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ diff --git a/modules/rtp_rtcp/include/rtp_cvo.h b/modules/rtp_rtcp/include/rtp_cvo.h index 6ce731200c..bc0b4ee95c 100644 --- a/modules/rtp_rtcp/include/rtp_cvo.h +++ b/modules/rtp_rtcp/include/rtp_cvo.h @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/rtc_base/checks.h" +#include "api/video/video_rotation.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -53,4 +53,4 @@ inline VideoRotation ConvertCVOByteToVideoRotation(uint8_t cvo_byte) { } } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h index 59ab582cb7..efac056322 100644 --- a/modules/rtp_rtcp/include/rtp_header_extension_map.h +++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" +#include "api/array_view.h" +#include "api/rtpparameters.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -77,4 +77,4 @@ class RtpHeaderExtensionMap { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ diff --git a/modules/rtp_rtcp/include/rtp_header_parser.h b/modules/rtp_rtcp/include/rtp_header_parser.h index 329de32611..db117a7bf0 100644 --- a/modules/rtp_rtcp/include/rtp_header_parser.h +++ b/modules/rtp_rtcp/include/rtp_header_parser.h @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "typedefs.h" namespace webrtc { @@ -41,4 +41,4 @@ class RtpHeaderParser { virtual bool DeregisterRtpHeaderExtension(RTPExtensionType type) = 0; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ diff --git a/modules/rtp_rtcp/include/rtp_payload_registry.h b/modules/rtp_rtcp/include/rtp_payload_registry.h index 4eda28d2ce..6212802a62 100644 --- a/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ #include #include -#include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "api/audio_codecs/audio_format.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -127,4 +127,4 @@ class RTPPayloadRegistry { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ diff --git a/modules/rtp_rtcp/include/rtp_receiver.h b/modules/rtp_rtcp/include/rtp_receiver.h index 95bade62fe..b6394c0ae5 100644 --- a/modules/rtp_rtcp/include/rtp_receiver.h +++ b/modules/rtp_rtcp/include/rtp_receiver.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ #include -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/typedefs.h" +#include "api/rtpreceiverinterface.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "typedefs.h" namespace webrtc { @@ -97,4 +97,4 @@ class RtpReceiver { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index 4fb50d1bde..fd4ea14864 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/deprecation.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/include/module.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/deprecation.h" namespace webrtc { @@ -459,4 +459,4 @@ class RtpRtcp : public Module { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 8add0a680a..863bb0530a 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ +#define MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/deprecation.h" +#include "system_wrappers/include/clock.h" +#include "typedefs.h" #define RTCP_CNAME_SIZE 256 // RFC 3550 page 44, including null termination #define IP_PACKET_SIZE 1500 // we assume ethernet @@ -486,4 +486,4 @@ class TransportSequenceNumberAllocator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ diff --git a/modules/rtp_rtcp/include/ulpfec_receiver.h b/modules/rtp_rtcp/include/ulpfec_receiver.h index dc9adb408d..190cc7a13b 100644 --- a/modules/rtp_rtcp/include/ulpfec_receiver.h +++ b/modules/rtp_rtcp/include/ulpfec_receiver.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ -#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ +#ifndef MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ +#define MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ class UlpfecReceiver { virtual FecPacketCounter GetPacketCounter() const = 0; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ +#endif // MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ diff --git a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h index fb8529fa30..501c5c3298 100644 --- a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h +++ b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ -#define WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ +#ifndef MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ +#define MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/test/gmock.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "rtc_base/basictypes.h" +#include "test/gmock.h" namespace webrtc { @@ -24,4 +24,4 @@ class MockRecoveredPacketReceiver : public RecoveredPacketReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ +#endif // MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ diff --git a/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h b/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h index 5f2fae9e73..8f2bb6e1e1 100644 --- a/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h +++ b/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ -#define WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ +#ifndef MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ +#define MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/test/gmock.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "test/gmock.h" namespace webrtc { @@ -22,4 +22,4 @@ class MockRtcpRttStats : public RtcpRttStats { MOCK_CONST_METHOD0(LastProcessedRtt, int64_t()); }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ +#endif // MODULES_RTP_RTCP_MOCKS_MOCK_RTCP_RTT_STATS_H_ diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index fb0db62229..1a89446dfb 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ -#define WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ +#ifndef MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ +#define MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gmock.h" +#include "api/optional.h" +#include "modules/include/module.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "test/gmock.h" namespace webrtc { @@ -209,4 +209,4 @@ class MockRtpRtcp : public RtpRtcp { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ +#endif // MODULES_RTP_RTCP_MOCKS_MOCK_RTP_RTCP_H_ diff --git a/modules/rtp_rtcp/source/byte_io.h b/modules/rtp_rtcp/source/byte_io.h index 1724bb0a2e..3fbe071175 100644 --- a/modules/rtp_rtcp/source/byte_io.h +++ b/modules/rtp_rtcp/source/byte_io.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ +#define MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ // This file contains classes for reading and writing integer types from/to @@ -38,7 +38,7 @@ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -405,4 +405,4 @@ class ByteWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ +#endif // MODULES_RTP_RTCP_SOURCE_BYTE_IO_H_ diff --git a/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc index addf33423a..3931a04fe3 100644 --- a/modules/rtp_rtcp/source/byte_io_unittest.cc +++ b/modules/rtp_rtcp/source/byte_io_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/dtmf_queue.cc b/modules/rtp_rtcp/source/dtmf_queue.cc index 7b1c61bdda..86ddb105f9 100644 --- a/modules/rtp_rtcp/source/dtmf_queue.cc +++ b/modules/rtp_rtcp/source/dtmf_queue.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/dtmf_queue.h" +#include "modules/rtp_rtcp/source/dtmf_queue.h" namespace { constexpr size_t kDtmfOutbandMax = 20; diff --git a/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h index 9a8c2e7b30..db70c97508 100644 --- a/modules/rtp_rtcp/source/dtmf_queue.h +++ b/modules/rtp_rtcp/source/dtmf_queue.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ +#define MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ #include -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/criticalsection.h" namespace webrtc { class DtmfQueue { @@ -38,4 +38,4 @@ class DtmfQueue { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ +#endif // MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ diff --git a/modules/rtp_rtcp/source/fec_private_tables_bursty.h b/modules/rtp_rtcp/source/fec_private_tables_bursty.h index 1fce36a584..4871ed5494 100644 --- a/modules/rtp_rtcp/source/fec_private_tables_bursty.h +++ b/modules/rtp_rtcp/source/fec_private_tables_bursty.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ +#define MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ // This file contains a set of packets masks for the FEC code. The masks in // this table are specifically designed to favor recovery of bursty/consecutive @@ -25,7 +25,7 @@ // (i.e., more packets/symbols in the code, so larger (k,m), i.e., k > 4, // m > 3). -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace fec_private_tables { @@ -759,4 +759,4 @@ const uint8_t* const* const kPacketMaskBurstyTbl[12] = { } // namespace fec_private_tables } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_BURSTY_H_ diff --git a/modules/rtp_rtcp/source/fec_private_tables_random.h b/modules/rtp_rtcp/source/fec_private_tables_random.h index 798c585661..3d5a6c0c2d 100644 --- a/modules/rtp_rtcp/source/fec_private_tables_random.h +++ b/modules/rtp_rtcp/source/fec_private_tables_random.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ +#define MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ // This file contains a set of packets masks for the FEC code. The masks in // this table are specifically designed to favor recovery to random loss. // These packet masks are defined to protect up to maximum of 48 media packets. -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace fec_private_tables { @@ -24521,4 +24521,4 @@ const uint8_t* const* const kPacketMaskRandomTbl[48] = { } // namespace fec_private_tables } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FEC_PRIVATE_TABLES_RANDOM_H_ diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc index 45dfbf5ba4..d73af5a31c 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/modules/rtp_rtcp/source/fec_test_helper.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h index fce99dc3a2..712b20143b 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.h +++ b/modules/rtp_rtcp/source/fec_test_helper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ +#define MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/random.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/random.h" namespace webrtc { namespace test { @@ -131,4 +131,4 @@ class UlpfecPacketGenerator : public AugmentedPacketGenerator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc index d1a1b045c7..465334c7b6 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h index 720a8b6dd1..3bb73f97bc 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ +#define MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "rtc_base/basictypes.h" namespace webrtc { @@ -83,4 +83,4 @@ class FlexfecHeaderWriter : public FecHeaderWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc index 6b7c9c55e0..0f0bf274fa 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc @@ -13,16 +13,16 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/random.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc index af8582737a..5a625d89a2 100644 --- a/modules/rtp_rtcp/source/flexfec_receiver.cc +++ b/modules/rtp_rtcp/source/flexfec_receiver.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc index 93c49cb6e9..ae2ec1dca5 100644 --- a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/basictypes.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc index 214304f963..c20c3cfd98 100644 --- a/modules/rtp_rtcp/source/flexfec_sender.cc +++ b/modules/rtp_rtcp/source/flexfec_sender.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc index da33837c8d..aa729ed0b8 100644 --- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc @@ -10,16 +10,16 @@ #include -#include "webrtc/api/rtpparameters.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "api/rtpparameters.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc index 7e524bf95a..fe348b5e33 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.cc +++ b/modules/rtp_rtcp/source/forward_error_correction.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" #include @@ -16,13 +16,13 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h index 673d15bfbc..f821f6f26d 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.h +++ b/modules/rtp_rtcp/source/forward_error_correction.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ +#define MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ #include @@ -17,12 +17,12 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -418,4 +418,4 @@ class FecHeaderWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc index b411686143..60b403bb78 100644 --- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc +++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include #include #include -#include "webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h" -#include "webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/fec_private_tables_bursty.h" +#include "modules/rtp_rtcp/source/fec_private_tables_random.h" +#include "rtc_base/checks.h" namespace { using webrtc::fec_private_tables::kPacketMaskBurstyTbl; diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.h b/modules/rtp_rtcp/source/forward_error_correction_internal.h index b437cee400..f79327ddb3 100644 --- a/modules/rtp_rtcp/source/forward_error_correction_internal.h +++ b/modules/rtp_rtcp/source/forward_error_correction_internal.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ +#define MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -105,4 +105,4 @@ void CopyColumn(uint8_t* new_mask, } // namespace internal } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc index 89d68e1a6a..3629982bd7 100644 --- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc +++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc @@ -14,16 +14,16 @@ #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/call/rtx_receive_stream.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gtest.h" +#include "api/call/transport.h" +#include "call/rtp_stream_receiver_controller.h" +#include "call/rtx_receive_stream.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/rate_limiter.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/packet_loss_stats.cc b/modules/rtp_rtcp/source/packet_loss_stats.cc index 12f8bfa1cd..69c20c4cf8 100644 --- a/modules/rtp_rtcp/source/packet_loss_stats.cc +++ b/modules/rtp_rtcp/source/packet_loss_stats.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" +#include "modules/rtp_rtcp/source/packet_loss_stats.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // After this many packets are added, adding additional packets will cause the // oldest packets to be pruned from the buffer. diff --git a/modules/rtp_rtcp/source/packet_loss_stats.h b/modules/rtp_rtcp/source/packet_loss_stats.h index 2eab043c0d..683399f123 100644 --- a/modules/rtp_rtcp/source/packet_loss_stats.h +++ b/modules/rtp_rtcp/source/packet_loss_stats.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ +#define MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ #include #include @@ -54,4 +54,4 @@ class PacketLossStats { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ +#endif // MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_ diff --git a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc index b82f46bf1f..3731250718 100644 --- a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc +++ b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/packet_loss_stats.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.cc b/modules/rtp_rtcp/source/playout_delay_oracle.cc index 0ca81edca3..d3a75dd13a 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle.cc +++ b/modules/rtp_rtcp/source/playout_delay_oracle.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" +#include "modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.h b/modules/rtp_rtcp/source/playout_delay_oracle.h index b0d734bf29..6e6e253c8c 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ +#define MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -78,4 +78,4 @@ class PlayoutDelayOracle { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ +#endif // MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ diff --git a/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc index f32e821ec2..099339d6d4 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc +++ b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" +#include "modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/logging.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.cc b/modules/rtp_rtcp/source/receive_statistics_impl.cc index 9c7bb2a8ec..f1db54719b 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.cc +++ b/modules/rtp_rtcp/source/receive_statistics_impl.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h" +#include "modules/rtp_rtcp/source/receive_statistics_impl.h" #include #include #include -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/time_util.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h index b80a91a72e..55110eac62 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ +#define MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" #include #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/rate_statistics.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { @@ -135,4 +135,4 @@ class ReceiveStatisticsImpl : public ReceiveStatistics, StreamDataCountersCallback* rtp_stats_callback_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ diff --git a/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc index 4264ac4582..283f51b1ec 100644 --- a/modules/rtp_rtcp/source/receive_statistics_unittest.cc +++ b/modules/rtp_rtcp/source/receive_statistics_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc index b39c5a616f..b2102fb45a 100644 --- a/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc +++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" +#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/timestamp_extrapolator.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc index 1f6ccf13a9..3fd450cc75 100644 --- a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc +++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::DoAll; diff --git a/modules/rtp_rtcp/source/rtcp_nack_stats.cc b/modules/rtp_rtcp/source/rtcp_nack_stats.cc index 91fdc6e607..8700b045b9 100644 --- a/modules/rtp_rtcp/source/rtcp_nack_stats.cc +++ b/modules/rtp_rtcp/source/rtcp_nack_stats.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h" +#include "modules/rtp_rtcp/source/rtcp_nack_stats.h" -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_nack_stats.h b/modules/rtp_rtcp/source/rtcp_nack_stats.h index 72fad6c73f..d9e2622abc 100644 --- a/modules/rtp_rtcp/source/rtcp_nack_stats.h +++ b/modules/rtp_rtcp/source/rtcp_nack_stats.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ #include @@ -37,4 +37,4 @@ class RtcpNackStats { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_NACK_STATS_H_ diff --git a/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc b/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc index 6583f79b38..5b4def5476 100644 --- a/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/rtcp_nack_stats.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_packet.cc b/modules/rtp_rtcp/source/rtcp_packet.cc index 7d409718bd..ef02b863ad 100644 --- a/modules/rtp_rtcp/source/rtcp_packet.cc +++ b/modules/rtp_rtcp/source/rtcp_packet.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h index f99b5b9290..5f7304e6c1 100644 --- a/modules/rtp_rtcp/source/rtcp_packet.h +++ b/modules/rtp_rtcp/source/rtcp_packet.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" namespace webrtc { namespace rtcp { @@ -100,4 +100,4 @@ class RtcpPacket { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.cc b/modules/rtp_rtcp/source/rtcp_packet/app.cc index 8d02dfc416..a6baf284b6 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/app.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.h b/modules/rtp_rtcp/source/rtcp_packet/app.h index 7368b7cc97..3b6418d3df 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app.h +++ b/modules/rtp_rtcp/source/rtcp_packet/app.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/buffer.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/buffer.h" namespace webrtc { namespace rtcp { @@ -57,4 +57,4 @@ class App : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc index 91783d0c45..59356e58aa 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/modules/rtp_rtcp/source/rtcp_packet/bye.cc index d5c204d993..2f85dd8493 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/bye.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/bye.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye.h b/modules/rtp_rtcp/source/rtcp_packet/bye.h index e82f01c43f..0cfc53475e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/bye.h +++ b/modules/rtp_rtcp/source/rtcp_packet/bye.h @@ -9,13 +9,13 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { namespace rtcp { @@ -56,4 +56,4 @@ class Bye : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_BYE_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc index cc9786744e..00944b3a33 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAre; using webrtc::rtcp::Bye; diff --git a/modules/rtp_rtcp/source/rtcp_packet/common_header.cc b/modules/rtp_rtcp/source/rtcp_packet/common_header.cc index 9971208e78..e5c6fd566e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/common_header.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/common_header.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/common_header.h b/modules/rtp_rtcp/source/rtcp_packet/common_header.h index a36b1991db..54dd12a42b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/common_header.h +++ b/modules/rtp_rtcp/source/rtcp_packet/common_header.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -43,4 +43,4 @@ class CommonHeader { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc index f22422682e..5ced421a7c 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" using webrtc::rtcp::CommonHeader; diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc index 28437c82ed..aec49c8ea7 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h index ea32b351b6..a58118ea94 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h +++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h @@ -9,14 +9,14 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace rtcp { @@ -45,4 +45,4 @@ class CompoundPacket : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMPOUND_PACKET_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc index 4c1c238c29..156f687018 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using webrtc::rtcp::Bye; using webrtc::rtcp::CompoundPacket; diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc index b7ca58c52a..5e3546b04b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr.h b/modules/rtp_rtcp/source/rtcp_packet/dlrr.h index 16bc115742..f0f23022f5 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/dlrr.h +++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr.h @@ -9,12 +9,12 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -66,4 +66,4 @@ class Dlrr { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc index 6144ab7f36..408d0011b8 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "test/gtest.h" using webrtc::rtcp::Dlrr; using webrtc::rtcp::ReceiveTimeInfo; diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc index 575184fbfd..a9c955eb6f 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h index 1771e023ca..a40cfee2b3 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { namespace rtcp { @@ -51,4 +51,4 @@ class ExtendedJitterReport : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_JITTER_REPORT_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc index 39eb93105e..7598fefed1 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAre; using testing::IsEmpty; diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc index eb84cd79be..cd9359270d 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h index 33a23de57a..2fe5618867 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" +#include "api/optional.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" +#include "modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" namespace webrtc { namespace rtcp { @@ -82,4 +82,4 @@ class ExtendedReports : public RtcpPacket { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_EXTENDED_REPORTS_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc index 08ffd49458..088b363c54 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "rtc_base/random.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAre; using testing::ElementsAreArray; diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir.cc b/modules/rtp_rtcp/source/rtcp_packet/fir.cc index 5beb16fc45..a817971d9e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/fir.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/fir.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir.h b/modules/rtp_rtcp/source/rtcp_packet/fir.h index 0f1169793d..80bf5c6359 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/fir.h +++ b/modules/rtp_rtcp/source/rtcp_packet/fir.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -59,4 +59,4 @@ class Fir : public Psfb { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_FIR_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc index 7680fcbd41..2800fbc79e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::AllOf; using testing::ElementsAre; diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack.cc b/modules/rtp_rtcp/source/rtcp_packet/nack.cc index 478f8dc477..4cf2d7d622 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/nack.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/nack.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack.h b/modules/rtp_rtcp/source/rtcp_packet/nack.h index 44d0f74aa1..3f6330d717 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/nack.h +++ b/modules/rtp_rtcp/source/rtcp_packet/nack.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -55,4 +55,4 @@ class Nack : public Rtpfb { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_NACK_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc index f523598c35..ef5b5b639b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli.cc b/modules/rtp_rtcp/source/rtcp_packet/pli.cc index 3db3394f6d..112397daa6 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/pli.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/pli.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli.h b/modules/rtp_rtcp/source/rtcp_packet/pli.h index e464891dfd..f3c2fba960 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/pli.h +++ b/modules/rtp_rtcp/source/rtcp_packet/pli.h @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -36,4 +36,4 @@ class Pli : public Psfb { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc index 8aba81b6bd..e6cf7bef4a 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::make_tuple; diff --git a/modules/rtp_rtcp/source/rtcp_packet/psfb.cc b/modules/rtp_rtcp/source/rtcp_packet/psfb.cc index 0a9e4a36ac..074413a869 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/psfb.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/psfb.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/byte_io.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/psfb.h b/modules/rtp_rtcp/source/rtcp_packet/psfb.h index 96ad413516..33b7f1c9ef 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/psfb.h +++ b/modules/rtp_rtcp/source/rtcp_packet/psfb.h @@ -9,11 +9,11 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -45,4 +45,4 @@ class Psfb : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc index 943c238694..a1ef3c5166 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h index 0a1108390d..3e37295845 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h +++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -38,4 +38,4 @@ class RapidResyncRequest : public Rtpfb { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc index 5564186fa7..e80736900d 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::make_tuple; diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc index fd67600c1b..dfe75a783b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h index 1b08f6404c..d8d828918a 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h +++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -57,4 +57,4 @@ class ReceiverReport : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc index d9b89c8b08..8c105cd365 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" #include -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::IsEmpty; diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb.cc b/modules/rtp_rtcp/source/rtcp_packet/remb.cc index 8e2eceb72d..8cc281cffa 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/remb.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/remb.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb.h b/modules/rtp_rtcp/source/rtcp_packet/remb.h index 062effab1a..1b01125169 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/remb.h +++ b/modules/rtp_rtcp/source/rtcp_packet/remb.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -57,4 +57,4 @@ class Remb : public Psfb { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMB_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc index f7b1dcf397..c939d9b41c 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::IsEmpty; diff --git a/modules/rtp_rtcp/source/rtcp_packet/report_block.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block.cc index 9589d89579..63c322258e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/report_block.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/report_block.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/report_block.h b/modules/rtp_rtcp/source/rtcp_packet/report_block.h index 0156cc0151..0d5c2fe6da 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/report_block.h +++ b/modules/rtp_rtcp/source/rtcp_packet/report_block.h @@ -9,10 +9,10 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -64,4 +64,4 @@ class ReportBlock { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc index 9d6117a744..38f8104933 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/random.h" +#include "test/gtest.h" using webrtc::rtcp::ReportBlock; diff --git a/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc b/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc index 0f81f3a8ba..95fc890b19 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h index b87efe8f77..9eae8c8922 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h +++ b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h @@ -9,11 +9,11 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "rtc_base/basictypes.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { namespace rtcp { @@ -46,4 +46,4 @@ class Rrtr { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc index 70bfe0b8e3..7bd79b311c 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" using webrtc::rtcp::Rrtr; diff --git a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc index 1286229c02..9b13e9a744 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/byte_io.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h index 734ed9aaa9..4b08106af4 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h +++ b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h @@ -9,11 +9,11 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -45,4 +45,4 @@ class Rtpfb : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc index e74746707c..34f51861a1 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/modules/rtp_rtcp/source/rtcp_packet/sdes.h index 5ce518e4a2..2eea09b3de 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sdes.h +++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -53,4 +53,4 @@ class Sdes : public RtcpPacket { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SDES_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc index 5c5601b3b8..7896f2d0bc 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using webrtc::rtcp::Sdes; diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc index a43ee18b67..41222cf4c5 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report.h b/modules/rtp_rtcp/source/rtcp_packet/sender_report.h index 69b55db12a..2cbfe72af9 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sender_report.h +++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { namespace rtcp { @@ -77,4 +77,4 @@ class SenderReport : public RtcpPacket { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SENDER_REPORT_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc index 8e3a926dde..30edc7ecdb 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::make_tuple; diff --git a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc index 7f1fae4395..ffcc3d087b 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" +#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h index 0781a6bcae..6ac0fa47a3 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h +++ b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -57,4 +57,4 @@ class TargetBitrate { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc index 75efe31c78..5fec75fe44 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" +#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "rtc_base/buffer.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc index 97e361a240..96bab160ca 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h index 31071c0730..7185976fe0 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -48,4 +48,4 @@ class TmmbItem { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc index 3f26983353..271e83cba8 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h index 3a06e44a1e..8c3b8348b0 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -53,4 +53,4 @@ class Tmmbn : public Rtpfb { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBN_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc index c85cc10682..5a85d8a7bb 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::IsEmpty; diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc index 96abf8143e..867c41aa57 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h index 4209ddf96c..9b2eca1869 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -52,4 +52,4 @@ class Tmmbr : public Rtpfb { }; } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMBR_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc index 012646823c..d3fe72ac72 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using testing::ElementsAreArray; using testing::IsEmpty; diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc index 057fe55801..548b4953fb 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h index 35fe90bb88..a28c573772 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h +++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" namespace webrtc { namespace rtcp { @@ -103,4 +103,4 @@ class TransportFeedback : public Rtpfb { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc index b2923da8bf..1a4cf7874d 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc index 1b3bbf3fa7..b715b3dedf 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" +#include "modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h index 7409b4e652..135dc45c76 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h +++ b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h @@ -9,11 +9,11 @@ * */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/basictypes.h" namespace webrtc { namespace rtcp { @@ -50,4 +50,4 @@ class VoipMetric { } // namespace rtcp } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ diff --git a/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc index 803d41dc40..a2fbcc5f75 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" +#include "modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc index f9544b3b65..f2a5f2de87 100644 --- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "test/gmock.h" +#include "test/gtest.h" using webrtc::rtcp::ReceiverReport; using webrtc::rtcp::ReportBlock; diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc index 8f498acd4f..b9cac09255 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" +#include "modules/rtp_rtcp/source/rtcp_receiver.h" #include @@ -18,30 +18,30 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/time_util.h" +#include "modules/rtp_rtcp/source/tmmbr_help.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h index c0e486afa2..cf52c891cc 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/modules/rtp_rtcp/source/rtcp_receiver.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ #include #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/ntp_time.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_nack_stats.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/ntp_time.h" +#include "typedefs.h" namespace webrtc { class VideoBitrateAllocationObserver; @@ -263,4 +263,4 @@ class RTCPReceiver { int64_t last_skipped_packets_warning_ms_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index 50585e2dfe..81f7b8c2b8 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -10,33 +10,33 @@ #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/ntp_time.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_receiver.h" +#include "modules/rtp_rtcp/source/time_util.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/ntp_time.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index be78a4320f..46f75a1f0a 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -8,35 +8,35 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" +#include "modules/rtp_rtcp/source/rtcp_sender.h" #include // memcpy #include -#include "webrtc/common_types.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "common_types.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "modules/rtp_rtcp/source/time_util.h" +#include "modules/rtp_rtcp/source/tmmbr_help.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index d581a044de..12a0f8e75d 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ +#define MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ #include #include @@ -18,22 +18,22 @@ #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/call/transport.h" +#include "api/optional.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_nack_stats.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/random.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -289,4 +289,4 @@ class RTCPSender { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index 223e06b35d..04250ee1e7 100644 --- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -10,16 +10,16 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_transport.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_sender.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "rtc_base/rate_limiter.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_transport.h" +#include "test/rtcp_packet_parser.h" using ::testing::_; using ::testing::ElementsAre; diff --git a/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc index 99f16699f3..5f84af501f 100644 --- a/modules/rtp_rtcp/source/rtp_fec_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_fec_unittest.cc @@ -12,14 +12,14 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format.cc b/modules/rtp_rtcp/source/rtp_format.cc index 7f799bb863..05dc900233 100644 --- a/modules/rtp_rtcp/source/rtp_format.cc +++ b/modules/rtp_rtcp/source/rtp_format.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_format.h" #include -#include "webrtc/modules/rtp_rtcp/source/rtp_format_h264.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/rtp_rtcp/source/rtp_format_h264.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" namespace webrtc { RtpPacketizer* RtpPacketizer::Create(RtpVideoCodecTypes type, diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h index 7b47921c2a..ea098da710 100644 --- a/modules/rtp_rtcp/source/rtp_format.h +++ b/modules/rtp_rtcp/source/rtp_format.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class RtpPacketToSend; @@ -67,4 +67,4 @@ class RtpDepacketizer { size_t payload_data_length) = 0; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc index 5aa7e27d23..050f3c0184 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.cc +++ b/modules/rtp_rtcp/source/rtp_format_h264.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_h264.h" +#include "modules/rtp_rtcp/source/rtp_format_h264.h" #include #include #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/common_video/h264/pps_parser.h" -#include "webrtc/common_video/h264/sps_parser.h" -#include "webrtc/common_video/h264/sps_vui_rewriter.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "common_video/h264/h264_common.h" +#include "common_video/h264/pps_parser.h" +#include "common_video/h264/sps_parser.h" +#include "common_video/h264/sps_vui_rewriter.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h index efa9b97fb8..5b6fe02295 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.h +++ b/modules/rtp_rtcp/source/rtp_format_h264.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ #include #include #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -117,4 +117,4 @@ class RtpDepacketizerH264 : public RtpDepacketizer { std::unique_ptr modified_buffer_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc index 047b4a3afa..0eef2bcd85 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "common_video/h264/h264_common.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc index ffb5f77494..0af8fc8dd5 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.cc +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h index 9fa3cce464..03c8255598 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { namespace RtpFormatVideoGeneric { @@ -71,4 +71,4 @@ class RtpDepacketizerGeneric : public RtpDepacketizer { size_t payload_data_length) override; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc index 78ee4350d2..85d6689376 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc @@ -13,14 +13,14 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/array_view.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc index e56a977f28..220a37de20 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" #include // assert #include // memcpy @@ -17,8 +17,8 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index f8b7c2fe47..de626d7405 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -22,17 +22,17 @@ * false as long as there are more packets left to fetch. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ #include #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -197,4 +197,4 @@ class RtpDepacketizerVp8 : public RtpDepacketizer { size_t payload_data_length) override; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc index 13d7dda258..62d7c3c3bf 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc @@ -9,9 +9,9 @@ */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index 4acccd28a9..7e0870ddb7 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -15,14 +15,14 @@ // packetizer. The packetizer can then be provided to this helper class, which // will then extract all packets and compare to the expected outcome. -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -74,4 +74,4 @@ class RtpFormatVp8TestHelper { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc index 3f6de76aed..9f16274aea 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "typedefs.h" #define CHECK_ARRAY_SIZE(expected_size, array) \ static_assert(expected_size == sizeof(array) / sizeof(array[0]), \ diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc index b08ec8b03c..89a9848c83 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" #include #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" #define RETURN_FALSE_ON_ERROR(x) \ if (!(x)) { \ diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h index cf911a3ec6..fd2d90ea5f 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -18,16 +18,16 @@ // false as long as there are more packets left to fetch. // -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -98,4 +98,4 @@ class RtpDepacketizerVp9 : public RtpDepacketizer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc index 49ded0737a..2fd5d2002c 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/modules/rtp_rtcp/source/rtp_header_extension_map.cc index 6cdcc1fc2b..7a3bdf4ec9 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_map.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_map.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc index e5accb1bf4..5fdfae643c 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc index d409d5a619..37524760d9 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { // Absolute send time in RTP streams. diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index 866dc28fb4..6ef5040db5 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -7,17 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/video/video_content_type.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/video/video_timing.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "api/array_view.h" +#include "api/video/video_content_type.h" +#include "api/video/video_rotation.h" +#include "api/video/video_timing.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { @@ -183,4 +183,4 @@ class RtpMid : public BaseRtpStringExtension { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ diff --git a/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc index b79135937d..5d2971a0c6 100644 --- a/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/criticalsection.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index ceafca1471..97e47e26a0 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_packet.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/random.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h index 4d6f2f78ab..8bdb8c6ad9 100644 --- a/modules/rtp_rtcp/source/rtp_packet.h +++ b/modules/rtp_rtcp/source/rtp_packet.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "api/array_view.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/copyonwritebuffer.h" namespace webrtc { class RtpHeaderExtensionMap; @@ -196,4 +196,4 @@ bool RtpPacket::ReserveExtension() { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_ diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc index 0dd80cbbb7..e1a22f6c2b 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" +#include "modules/rtp_rtcp/source/rtp_packet_history.h" #include #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h index 9b12436e66..e3830c745f 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/modules/rtp_rtcp/source/rtp_packet_history.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -82,4 +82,4 @@ class RtpPacketHistory { RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPacketHistory); }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_ diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc index 52ef81a67c..0477b3b5d0 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" +#include "modules/rtp_rtcp/source/rtp_packet_history.h" #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc index 0d3fdd1acd..f84029b604 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.cc +++ b/modules/rtp_rtcp/source/rtp_packet_received.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" #include -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h index 5b90cd0268..3fa1db35c1 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.h +++ b/modules/rtp_rtcp/source/rtp_packet_received.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet.h" -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { // Class to hold rtp packet with metadata for receiver side. @@ -52,4 +52,4 @@ class RtpPacketReceived : public RtpPacket { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h index 505d921ea4..c287f0ca29 100644 --- a/modules/rtp_rtcp/source/rtp_packet_to_send.h +++ b/modules/rtp_rtcp/source/rtp_packet_to_send.h @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" namespace webrtc { // Class to hold rtp packet with metadata for sender side. @@ -59,4 +59,4 @@ class RtpPacketToSend : public RtpPacket { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ diff --git a/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc index 776db53385..253ce32db0 100644 --- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_unittest.cc @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/random.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc index fe2bc804e4..f73ec75607 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc index 6e17eb9aca..b7270d17d0 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/modules/rtp_rtcp/source/rtp_receiver_audio.cc index 4265ba5654..a4ebaf1011 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_audio.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_audio.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" +#include "modules/rtp_rtcp/source/rtp_receiver_audio.h" #include // assert #include // pow() #include // memcpy() -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "common_types.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { RTPReceiverStrategy* RTPReceiverStrategy::CreateAudioStrategy( diff --git a/modules/rtp_rtcp/source/rtp_receiver_audio.h b/modules/rtp_rtcp/source/rtp_receiver_audio.h index fd8238aeaf..fc94ee05b3 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_audio.h +++ b/modules/rtp_rtcp/source/rtp_receiver_audio.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/onetimeevent.h" +#include "typedefs.h" namespace webrtc { @@ -95,4 +95,4 @@ class RTPReceiverAudio : public RTPReceiverStrategy, }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/modules/rtp_rtcp/source/rtp_receiver_impl.cc index ed0383f0d6..c604c24921 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_impl.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h" +#include "modules/rtp_rtcp/source/rtp_receiver_impl.h" #include #include @@ -18,11 +18,11 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/rtc_base/logging.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.h b/modules/rtp_rtcp/source/rtp_receiver_impl.h index 6d38cf7e4d..e08ea8c44c 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ #include #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { @@ -108,4 +108,4 @@ class RtpReceiverImpl : public RtpReceiver { std::vector ssrc_sources_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ diff --git a/modules/rtp_rtcp/source/rtp_receiver_strategy.cc b/modules/rtp_rtcp/source/rtp_receiver_strategy.cc index 69d079f9aa..de58b615e6 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_strategy.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_strategy.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include diff --git a/modules/rtp_rtcp/source/rtp_receiver_strategy.h b/modules/rtp_rtcp/source/rtp_receiver_strategy.h index f909b85aec..80355187d9 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_strategy.h +++ b/modules/rtp_rtcp/source/rtp_receiver_strategy.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { @@ -96,4 +96,4 @@ class RTPReceiverStrategy { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ diff --git a/modules/rtp_rtcp/source/rtp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtp_receiver_unittest.cc index e20d2d52a9..686537c569 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_unittest.cc @@ -10,15 +10,15 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtp_receiver_impl.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_receiver_video.cc b/modules/rtp_rtcp/source/rtp_receiver_video.cc index 106f056075..14fe4ad2ad 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" +#include "modules/rtp_rtcp/source/rtp_receiver_video.h" #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_video.h b/modules/rtp_rtcp/source/rtp_receiver_video.h index a243484fcf..9da2532e2d 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_video.h +++ b/modules/rtp_rtcp/source/rtp_receiver_video.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/onetimeevent.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ class RTPReceiverVideo : public RTPReceiverStrategy { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ diff --git a/modules/rtp_rtcp/source/rtp_rtcp_config.h b/modules/rtp_rtcp/source/rtp_rtcp_config.h index 57f66559a5..09deef35cd 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_config.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ // Configuration file for RTP utilities (RTPSender, RTPReceiver ...) namespace webrtc { @@ -42,4 +42,4 @@ enum { RTP_AUDIO_LEVEL_UNIQUE_ID = 0xbede }; enum { RTP_MAX_PACKETS_PER_FRAME = 512 }; // must be multiple of 32 } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 7318ff4ad6..317a0540f7 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include @@ -16,10 +16,10 @@ #include #include -#include "webrtc/api/rtpparameters.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/rtpparameters.h" +#include "common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" #ifdef _WIN32 // Disable warning C4355: 'this' : used in base member initializer list. diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 70edc9d334..b18e2dc7c4 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "api/optional.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/packet_loss_stats.h" +#include "modules/rtp_rtcp/source/rtcp_receiver.h" +#include "modules/rtp_rtcp/source/rtcp_sender.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/gtest_prod_util.h" namespace webrtc { @@ -357,4 +357,4 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc index aa9db2af7a..a51a86a6a6 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -12,16 +12,16 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "rtc_base/rate_limiter.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/rtcp_packet_parser.h" using ::testing::_; using ::testing::ElementsAre; diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 6fd7600cbb..de9bf73c67 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" -#include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/playout_delay_oracle.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/rtp_sender_audio.h" +#include "modules/rtp_rtcp/source/rtp_sender_video.h" +#include "modules/rtp_rtcp/source/time_util.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/rate_limiter.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 91ae865927..fcb6b09383 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -8,31 +8,31 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ #include #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/call/transport.h" -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "api/array_view.h" +#include "api/call/transport.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/playout_delay_oracle.h" +#include "modules/rtp_rtcp/source/rtp_packet_history.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/deprecation.h" +#include "rtc_base/random.h" +#include "rtc_base/rate_statistics.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -334,4 +334,4 @@ class RTPSender { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc index 04c776ce40..f75452fde9 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" +#include "modules/rtp_rtcp/source/rtp_sender_audio.h" #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index 3a07080599..6f5f757c38 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/dtmf_queue.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/dtmf_queue.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/onetimeevent.h" +#include "typedefs.h" namespace webrtc { @@ -95,4 +95,4 @@ class RTPSenderAudio { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 860f193d0c..2411b7c844 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -11,29 +11,29 @@ #include #include -#include "webrtc/api/video/video_timing.h" -#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_transport.h" -#include "webrtc/typedefs.h" +#include "api/video/video_timing.h" +#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/rtp_rtcp/source/rtp_sender_video.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/buffer.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/rate_limiter.h" +#include "test/field_trial.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/mock_transport.h" +#include "typedefs.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 4e46b78baa..888dc7277b 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" +#include "modules/rtp_rtcp/source/rtp_sender_video.h" #include #include @@ -18,17 +18,17 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_format_video_generic.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index fed35cd03a..b4192d0054 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" -#include "webrtc/modules/rtp_rtcp/source/video_codec_information.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/rtp_rtcp/source/ulpfec_generator.h" +#include "modules/rtp_rtcp/source/video_codec_information.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/onetimeevent.h" +#include "rtc_base/rate_statistics.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { class RtpPacketizer; @@ -164,4 +164,4 @@ class RTPSenderVideo { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ diff --git a/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc index fbcf731393..523b2b4cea 100644 --- a/modules/rtp_rtcp/source/rtp_utility.cc +++ b/modules/rtp_rtcp/source/rtp_utility.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h index a1c2b67baf..3793437c28 100644 --- a/modules/rtp_rtcp/source/rtp_utility.h +++ b/modules/rtp_rtcp/source/rtp_utility.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ +#define MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ #include -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/rtc_base/deprecation.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "rtc_base/deprecation.h" +#include "typedefs.h" namespace webrtc { @@ -61,4 +61,4 @@ class RtpHeaderParser { } // namespace RtpUtility } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ +#endif // MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ diff --git a/modules/rtp_rtcp/source/rtp_utility_unittest.cc b/modules/rtp_rtcp/source/rtp_utility_unittest.cc index ebc452c9b2..e1bcfb7a4a 100644 --- a/modules/rtp_rtcp/source/rtp_utility_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_utility_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/time_util.cc b/modules/rtp_rtcp/source/time_util.cc index dedba4d7ec..af954687c4 100644 --- a/modules/rtp_rtcp/source/time_util.cc +++ b/modules/rtp_rtcp/source/time_util.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/time_util.h" +#include "modules/rtp_rtcp/source/time_util.h" #include diff --git a/modules/rtp_rtcp/source/time_util.h b/modules/rtp_rtcp/source/time_util.h index 69bbb0a59a..d13e0803b8 100644 --- a/modules/rtp_rtcp/source/time_util.h +++ b/modules/rtp_rtcp/source/time_util.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ +#define MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ #include -#include "webrtc/system_wrappers/include/ntp_time.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { @@ -40,4 +40,4 @@ inline uint32_t CompactNtp(NtpTime ntp) { int64_t CompactNtpRttToMs(uint32_t compact_ntp_interval); } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ diff --git a/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc index 54733b359d..eafe15db9b 100644 --- a/modules/rtp_rtcp/source/time_util_unittest.cc +++ b/modules/rtp_rtcp/source/time_util_unittest.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/time_util.h" +#include "modules/rtp_rtcp/source/time_util.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc index 2390d066a0..8aa4530211 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.cc +++ b/modules/rtp_rtcp/source/tmmbr_help.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" +#include "modules/rtp_rtcp/source/tmmbr_help.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { std::vector TMMBRHelp::FindBoundingSet( diff --git a/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h index 9bd09c3251..2082d172e2 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.h +++ b/modules/rtp_rtcp/source/tmmbr_help.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ +#define MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "typedefs.h" namespace webrtc { @@ -30,4 +30,4 @@ class TMMBRHelp { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ +#endif // MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc index fa7505ebbf..ba62d4ef29 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" +#include "modules/rtp_rtcp/source/ulpfec_generator.h" #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_generator.h b/modules/rtp_rtcp/source/ulpfec_generator.h index 52e03cdad9..bd3e478d72 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.h +++ b/modules/rtp_rtcp/source/ulpfec_generator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ +#define MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ #include #include #include -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" namespace webrtc { @@ -112,4 +112,4 @@ class UlpfecGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ +#endif // MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc index 5d281aac2e..a4ab6de00f 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/ulpfec_generator.h" +#include "rtc_base/basictypes.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc index 3a6000a200..c54d3cdd8f 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h index 2c1994dc21..ac9fcc171b 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ +#define MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "rtc_base/basictypes.h" namespace webrtc { @@ -64,4 +64,4 @@ class UlpfecHeaderWriter : public FecHeaderWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ +#endif // MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc index 8eebf38c67..9eaaf89b44 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc @@ -13,15 +13,15 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/random.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc index f3b08310c6..a35393d732 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h" +#include "modules/rtp_rtcp/source/ulpfec_receiver_impl.h" #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_receiver_video.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index e4f71ffb71..8a82ec0ae1 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ +#define MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/include/ulpfec_receiver.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { @@ -51,4 +51,4 @@ class UlpfecReceiverImpl : public UlpfecReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ +#endif // MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc index 7a9c446a22..c3bd5a7304 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc @@ -13,15 +13,15 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/ulpfec_receiver.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/video_codec_information.h b/modules/rtp_rtcp/source/video_codec_information.h index 7b819d060f..593d87d01c 100644 --- a/modules/rtp_rtcp/source/video_codec_information.h +++ b/modules/rtp_rtcp/source/video_codec_information.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ -#define WEBRTC_MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ +#ifndef MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ +#define MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" namespace webrtc { class VideoCodecInformation { @@ -24,4 +24,4 @@ class VideoCodecInformation { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ +#endif // MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ diff --git a/modules/rtp_rtcp/test/testAPI/test_api.cc b/modules/rtp_rtcp/test/testAPI/test_api.cc index fadf8f4240..61375e9284 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api.cc +++ b/modules/rtp_rtcp/test/testAPI/test_api.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" +#include "modules/rtp_rtcp/test/testAPI/test_api.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/null_transport.h" +#include "rtc_base/checks.h" +#include "rtc_base/rate_limiter.h" +#include "test/null_transport.h" namespace webrtc { diff --git a/modules/rtp_rtcp/test/testAPI/test_api.h b/modules/rtp_rtcp/test/testAPI/test_api.h index b2a0361d60..262d4b96ad 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api.h +++ b/modules/rtp_rtcp/test/testAPI/test_api.h @@ -7,18 +7,18 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ -#define WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ +#ifndef MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ +#define MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ -#include "webrtc/api/call/transport.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/test/gtest.h" +#include "api/call/transport.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "test/gtest.h" namespace webrtc { @@ -69,4 +69,4 @@ class TestRtpReceiver : public RtpData { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ +#endif // MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ diff --git a/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc index a9be072feb..f2699c1cad 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api_audio.cc +++ b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" -#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_audio.h" +#include "modules/rtp_rtcp/test/testAPI/test_api.h" +#include "rtc_base/rate_limiter.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc index 3ce1af7859..92a17b5993 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc +++ b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc @@ -12,15 +12,15 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" -#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_receiver_audio.h" +#include "modules/rtp_rtcp/test/testAPI/test_api.h" +#include "rtc_base/rate_limiter.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/modules/rtp_rtcp/test/testAPI/test_api_video.cc index e6b075f0f7..4bdaf2ae45 100644 --- a/modules/rtp_rtcp/test/testAPI/test_api_video.cc +++ b/modules/rtp_rtcp/test/testAPI/test_api_video.cc @@ -14,15 +14,15 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" -#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_receiver_video.h" +#include "modules/rtp_rtcp/test/testAPI/test_api.h" +#include "rtc_base/rate_limiter.h" +#include "test/gtest.h" namespace { diff --git a/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h b/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h index 6c233bba17..ccf9752ee9 100644 --- a/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h +++ b/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ -#define WEBRTC_MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ +#ifndef MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ +#define MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ namespace webrtc { @@ -188,4 +188,4 @@ const float kMaxResidualLossBurstyMask[kNumberCodes] = { }; } // namespace webrtc -#endif // WEBRTC_MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ +#endif // MODULES_RTP_RTCP_TEST_TESTFEC_AVERAGE_RESIDUAL_LOSS_XOR_CODES_H_ diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc index cc6512d7d4..c65a2b5926 100644 --- a/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -18,12 +18,12 @@ #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/random.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" // #define VERBOSE_OUTPUT diff --git a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc index 7188e2215d..f40a8e8ed6 100644 --- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc +++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc @@ -47,10 +47,10 @@ #include -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "webrtc/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/utility/DEPS b/modules/utility/DEPS index 7e573560ea..d693ea6221 100644 --- a/modules/utility/DEPS +++ b/modules/utility/DEPS @@ -1,8 +1,8 @@ include_rules = [ # TODO(aleloi): remove when clients update. See # bugs.webrtc.org/6548. - "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/common_audio", - "+webrtc/common_video", - "+webrtc/system_wrappers", + "+audio/utility/audio_frame_operations.h", + "+common_audio", + "+common_video", + "+system_wrappers", ] diff --git a/modules/utility/include/audio_frame_operations.h b/modules/utility/include/audio_frame_operations.h index 4bf73df666..adaadfeca7 100644 --- a/modules/utility/include/audio_frame_operations.h +++ b/modules/utility/include/audio_frame_operations.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ +#ifndef MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ +#define MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ // The contents of this file have moved to -// //webrtc/audio/utility. This file is deprecated. +// //audio/utility. This file is deprecated. // TODO(aleloi): Remove this file when clients have updated their // includes. See bugs.webrtc.org/6548. -#include "webrtc/audio/utility/audio_frame_operations.h" +#include "audio/utility/audio_frame_operations.h" -#endif // #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ +#endif // #ifndef MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_ diff --git a/modules/utility/include/helpers_android.h b/modules/utility/include/helpers_android.h index 2840ca965e..c1d9ad87ec 100644 --- a/modules/utility/include/helpers_android.h +++ b/modules/utility/include/helpers_android.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ +#ifndef MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ +#define MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ #include #include @@ -84,4 +84,4 @@ class ScopedGlobalRef { } // namespace webrtc -#endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ +#endif // MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ diff --git a/modules/utility/include/jvm_android.h b/modules/utility/include/jvm_android.h index 95e31eea24..f899263f76 100644 --- a/modules/utility/include/jvm_android.h +++ b/modules/utility/include/jvm_android.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ +#ifndef MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ +#define MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ #include #include #include -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/utility/include/helpers_android.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -185,4 +185,4 @@ class JVM { } // namespace webrtc -#endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ +#endif // MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ diff --git a/modules/utility/include/mock/mock_process_thread.h b/modules/utility/include/mock/mock_process_thread.h index 27d1b106d7..fb88e40074 100644 --- a/modules/utility/include/mock/mock_process_thread.h +++ b/modules/utility/include/mock/mock_process_thread.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ +#ifndef MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ +#define MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ #include -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/test/gmock.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/location.h" +#include "test/gmock.h" namespace webrtc { @@ -41,4 +41,4 @@ class MockProcessThread : public ProcessThread { }; } // namespace webrtc -#endif // WEBRTC_MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ +#endif // MODULES_UTILITY_INCLUDE_MOCK_MOCK_PROCESS_THREAD_H_ diff --git a/modules/utility/include/process_thread.h b/modules/utility/include/process_thread.h index 6fa4e79bcd..2168c275e2 100644 --- a/modules/utility/include/process_thread.h +++ b/modules/utility/include/process_thread.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ +#ifndef MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ +#define MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_WIN) // Due to a bug in the std::unique_ptr implementation that ships with MSVS, // we need the full definition of QueuedTask, on Windows. -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/task_queue.h" #else namespace rtc { class QueuedTask; @@ -74,4 +74,4 @@ class ProcessThread { } // namespace webrtc -#endif // WEBRTC_MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ +#endif // MODULES_UTILITY_INCLUDE_PROCESS_THREAD_H_ diff --git a/modules/utility/source/helpers_android.cc b/modules/utility/source/helpers_android.cc index 59f4a69d9c..c5a91235e3 100644 --- a/modules/utility/source/helpers_android.cc +++ b/modules/utility/source/helpers_android.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/utility/include/helpers_android.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/utility/include/helpers_android.h" +#include "rtc_base/checks.h" #include #include diff --git a/modules/utility/source/jvm_android.cc b/modules/utility/source/jvm_android.cc index b13eb897fb..8c27624947 100644 --- a/modules/utility/source/jvm_android.cc +++ b/modules/utility/source/jvm_android.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/modules/utility/include/jvm_android.h" +#include "modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #define TAG "JVM" #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) diff --git a/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc index b3057ec088..014624e48c 100644 --- a/modules/utility/source/process_thread_impl.cc +++ b/modules/utility/source/process_thread_impl.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/utility/source/process_thread_impl.h" +#include "modules/utility/source/process_thread_impl.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/include/module.h" +#include "rtc_base/checks.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace webrtc { namespace { diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index 4f4c65da8c..93d093d14b 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ -#define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ +#ifndef MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ +#define MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ #include #include #include -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/typedefs.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/location.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread_checker.h" +#include "system_wrappers/include/event_wrapper.h" +#include "typedefs.h" namespace webrtc { @@ -85,4 +85,4 @@ class ProcessThreadImpl : public ProcessThread { } // namespace webrtc -#endif // WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ +#endif // MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ diff --git a/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc index e594de0f87..d27896410e 100644 --- a/modules/utility/source/process_thread_impl_unittest.cc +++ b/modules/utility/source/process_thread_impl_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/utility/source/process_thread_impl.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/include/module.h" +#include "modules/utility/source/process_thread_impl.h" +#include "rtc_base/location.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_capture/DEPS b/modules/video_capture/DEPS index 86af6db1c8..40560a195c 100644 --- a/modules/video_capture/DEPS +++ b/modules/video_capture/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+webrtc/common_video", - "+webrtc/media/base", - "+webrtc/system_wrappers", + "+common_video", + "+media/base", + "+system_wrappers", ] diff --git a/modules/video_capture/device_info_impl.cc b/modules/video_capture/device_info_impl.cc index d9e5879aa3..03c6e1d3ff 100644 --- a/modules/video_capture/device_info_impl.cc +++ b/modules/video_capture/device_info_impl.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/modules/video_capture/device_info_impl.h" -#include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_capture/device_info_impl.h" +#include "modules/video_capture/video_capture_config.h" +#include "rtc_base/logging.h" #ifndef abs #define abs(a) (a>=0?a:-a) diff --git a/modules/video_capture/device_info_impl.h b/modules/video_capture/device_info_impl.h index 463e10d07e..296adfbbab 100644 --- a/modules/video_capture/device_info_impl.h +++ b/modules/video_capture/device_info_impl.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ #include -#include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "modules/video_capture/video_capture.h" +#include "system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { @@ -57,4 +57,4 @@ protected: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ diff --git a/modules/video_capture/external/device_info_external.cc b/modules/video_capture/external/device_info_external.cc index e54bd43774..4951dc8927 100644 --- a/modules/video_capture/external/device_info_external.cc +++ b/modules/video_capture/external/device_info_external.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/device_info_impl.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/device_info_impl.h" +#include "modules/video_capture/video_capture_impl.h" namespace webrtc { diff --git a/modules/video_capture/external/video_capture_external.cc b/modules/video_capture/external/video_capture_external.cc index e1f4a54f23..cd85071ea3 100644 --- a/modules/video_capture/external/video_capture_external.cc +++ b/modules/video_capture/external/video_capture_external.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/rtc_base/refcount.h" +#include "modules/video_capture/video_capture_impl.h" +#include "rtc_base/refcount.h" namespace webrtc { diff --git a/modules/video_capture/linux/device_info_linux.cc b/modules/video_capture/linux/device_info_linux.cc index 9c8c051515..719a6378cf 100644 --- a/modules/video_capture/linux/device_info_linux.cc +++ b/modules/video_capture/linux/device_info_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/linux/device_info_linux.h" +#include "modules/video_capture/linux/device_info_linux.h" #include #include @@ -20,7 +20,7 @@ //v4l includes #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc diff --git a/modules/video_capture/linux/device_info_linux.h b/modules/video_capture/linux/device_info_linux.h index 80a8e77812..86eb61efa1 100644 --- a/modules/video_capture/linux/device_info_linux.h +++ b/modules/video_capture/linux/device_info_linux.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ -#include "webrtc/modules/video_capture/device_info_impl.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/device_info_impl.h" +#include "modules/video_capture/video_capture_impl.h" namespace webrtc { @@ -50,4 +50,4 @@ private: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ diff --git a/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc index f9efc7ba8d..be8e64e6d2 100644 --- a/modules/video_capture/linux/video_capture_linux.cc +++ b/modules/video_capture/linux/video_capture_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/linux/video_capture_linux.h" +#include "modules/video_capture/linux/video_capture_linux.h" #include #include @@ -23,10 +23,10 @@ #include #include -#include "webrtc/media/base/videocommon.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/logging.h" +#include "media/base/videocommon.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/logging.h" namespace webrtc { namespace videocapturemodule { diff --git a/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h index dc500597ad..ab2f8b021f 100644 --- a/modules/video_capture/linux/video_capture_linux.h +++ b/modules/video_capture/linux/video_capture_linux.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "common_types.h" +#include "modules/video_capture/video_capture_impl.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" namespace webrtc { @@ -64,4 +64,4 @@ private: } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ diff --git a/modules/video_capture/objc/device_info.h b/modules/video_capture/objc/device_info.h index 67d5877694..8802367f5d 100644 --- a/modules/video_capture/objc/device_info.h +++ b/modules/video_capture/objc/device_info.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ +#ifndef MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ +#define MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ -#include "webrtc/modules/video_capture/device_info_impl.h" +#include "modules/video_capture/device_info_impl.h" #include #include @@ -58,4 +58,4 @@ class DeviceInfoIos : public DeviceInfoImpl { } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ +#endif // MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_H_ diff --git a/modules/video_capture/objc/device_info.mm b/modules/video_capture/objc/device_info.mm index 85733d143f..f5a76d3273 100644 --- a/modules/video_capture/objc/device_info.mm +++ b/modules/video_capture/objc/device_info.mm @@ -16,10 +16,10 @@ #include -#include "webrtc/modules/video_capture/objc/device_info.h" -#include "webrtc/modules/video_capture/objc/device_info_objc.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_capture/objc/device_info.h" +#include "modules/video_capture/objc/device_info_objc.h" +#include "modules/video_capture/video_capture_impl.h" +#include "rtc_base/logging.h" using namespace webrtc; using namespace videocapturemodule; diff --git a/modules/video_capture/objc/device_info_objc.h b/modules/video_capture/objc/device_info_objc.h index b5db689e30..670c3a126c 100644 --- a/modules/video_capture/objc/device_info_objc.h +++ b/modules/video_capture/objc/device_info_objc.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ +#ifndef MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ +#define MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ #import -#include "webrtc/modules/video_capture/video_capture_defines.h" +#include "modules/video_capture/video_capture_defines.h" @interface DeviceInfoIosObjC : NSObject + (int)captureDeviceCount; @@ -26,4 +26,4 @@ @end -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ +#endif // MODULES_VIDEO_CAPTURE_OBJC_DEVICE_INFO_OBJC_H_ diff --git a/modules/video_capture/objc/device_info_objc.mm b/modules/video_capture/objc/device_info_objc.mm index 1db03a490f..f2b102e03b 100644 --- a/modules/video_capture/objc/device_info_objc.mm +++ b/modules/video_capture/objc/device_info_objc.mm @@ -14,8 +14,8 @@ #import -#import "webrtc/modules/video_capture/objc/device_info_objc.h" -#include "webrtc/modules/video_capture/video_capture_config.h" +#import "modules/video_capture/objc/device_info_objc.h" +#include "modules/video_capture/video_capture_config.h" @implementation DeviceInfoIosObjC diff --git a/modules/video_capture/objc/rtc_video_capture_objc.h b/modules/video_capture/objc/rtc_video_capture_objc.h index 71f8d8e372..4b1d71c572 100644 --- a/modules/video_capture/objc/rtc_video_capture_objc.h +++ b/modules/video_capture/objc/rtc_video_capture_objc.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ +#ifndef MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ +#define MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ #import #ifdef WEBRTC_IOS #import #endif -#include "webrtc/modules/video_capture/objc/video_capture.h" +#include "modules/video_capture/objc/video_capture.h" // The following class listens to a notification with name: // 'StatusBarOrientationDidChange'. @@ -37,4 +37,4 @@ - (BOOL)stopCapture; @end -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ +#endif // MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_ diff --git a/modules/video_capture/objc/rtc_video_capture_objc.mm b/modules/video_capture/objc/rtc_video_capture_objc.mm index 0bd7a4addf..0489d3dfeb 100644 --- a/modules/video_capture/objc/rtc_video_capture_objc.mm +++ b/modules/video_capture/objc/rtc_video_capture_objc.mm @@ -17,10 +17,10 @@ #import #endif -#import "webrtc/modules/video_capture/objc/device_info_objc.h" -#import "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h" +#import "modules/video_capture/objc/device_info_objc.h" +#import "modules/video_capture/objc/rtc_video_capture_objc.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" using namespace webrtc; using namespace webrtc::videocapturemodule; diff --git a/modules/video_capture/objc/video_capture.h b/modules/video_capture/objc/video_capture.h index 910455b407..0427d48584 100644 --- a/modules/video_capture/objc/video_capture.h +++ b/modules/video_capture/objc/video_capture.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ +#ifndef MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ +#define MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ -#include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/video_capture/video_capture_impl.h" +#include "rtc_base/scoped_ref_ptr.h" @class RTCVideoCaptureIosObjC; @@ -41,4 +41,4 @@ class VideoCaptureIos : public VideoCaptureImpl { } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ +#endif // MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ diff --git a/modules/video_capture/objc/video_capture.mm b/modules/video_capture/objc/video_capture.mm index ca5428e1f0..4f9c2f3e86 100644 --- a/modules/video_capture/objc/video_capture.mm +++ b/modules/video_capture/objc/video_capture.mm @@ -12,10 +12,10 @@ #error "This file requires ARC support." #endif -#include "webrtc/modules/video_capture/objc/device_info_objc.h" -#include "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/video_capture/objc/device_info_objc.h" +#include "modules/video_capture/objc/rtc_video_capture_objc.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" using namespace webrtc; using namespace videocapturemodule; diff --git a/modules/video_capture/test/video_capture_main_mac.mm b/modules/video_capture/test/video_capture_main_mac.mm index 6d6d5c6479..680160fb9f 100644 --- a/modules/video_capture/test/video_capture_main_mac.mm +++ b/modules/video_capture/test/video_capture_main_mac.mm @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/mac/run_threaded_main_mac.h" +#include "test/gtest.h" +#include "test/testsupport/mac/run_threaded_main_mac.h" int ImplementThisToRunYourTest(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index a80039a599..39d0489e43 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -14,18 +14,18 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/modules/video_capture/video_capture_factory.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/utility/include/process_thread.h" +#include "modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/sleep.h" +#include "test/frame_utils.h" +#include "test/gtest.h" using webrtc::SleepMs; using webrtc::VideoCaptureCapability; diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h index 884953b5e1..8fb782230e 100644 --- a/modules/video_capture/video_capture.h +++ b/modules/video_capture/video_capture.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ +#ifndef MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ +#define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/video_capture/video_capture_defines.h" +#include "api/video/video_rotation.h" +#include "media/base/videosinkinterface.h" +#include "modules/include/module.h" +#include "modules/video_capture/video_capture_defines.h" namespace webrtc { @@ -118,4 +118,4 @@ protected: }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ +#endif // MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ diff --git a/modules/video_capture/video_capture_config.h b/modules/video_capture/video_capture_config.h index 829a6bea2d..4cfff6ee71 100644 --- a/modules/video_capture/video_capture_config.h +++ b/modules/video_capture/video_capture_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ namespace webrtc { @@ -30,4 +30,4 @@ enum {kFrameRateHistoryWindowMs = 2000}; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_CONFIG_H_ diff --git a/modules/video_capture/video_capture_defines.h b/modules/video_capture/video_capture_defines.h index ed813623f7..ff6d2c1477 100644 --- a/modules/video_capture/video_capture_defines.h +++ b/modules/video_capture/video_capture_defines.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ +#ifndef MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ +#define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ -#include "webrtc/api/video/video_frame.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -80,4 +80,4 @@ protected: } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ +#endif // MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ diff --git a/modules/video_capture/video_capture_factory.cc b/modules/video_capture/video_capture_factory.cc index ec016f8d3d..92ab75fd3c 100644 --- a/modules/video_capture/video_capture_factory.cc +++ b/modules/video_capture/video_capture_factory.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/video_capture_factory.h" +#include "modules/video_capture/video_capture_factory.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/video_capture_impl.h" namespace webrtc { diff --git a/modules/video_capture/video_capture_factory.h b/modules/video_capture/video_capture_factory.h index c219a2a0ce..1dfc91e98f 100644 --- a/modules/video_capture/video_capture_factory.h +++ b/modules/video_capture/video_capture_factory.h @@ -11,10 +11,10 @@ // This file contains interfaces used for creating the VideoCaptureModule // and DeviceInfo. -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ +#ifndef MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ +#define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ -#include "webrtc/modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture.h" namespace webrtc { @@ -41,4 +41,4 @@ class VideoCaptureFactory { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ +#endif // MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc index d827ae6366..4d67010108 100644 --- a/modules/video_capture/video_capture_impl.cc +++ b/modules/video_capture/video_capture_impl.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/video_capture_impl.h" #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/video/i420_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/include/module_common_types.h" +#include "modules/video_capture/video_capture_config.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcount.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace videocapturemodule { diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h index 923397a8e8..d252597643 100644 --- a/modules/video_capture/video_capture_impl.h +++ b/modules/video_capture/video_capture_impl.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ /* * video_capture_impl.h */ -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/video/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture_config.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -117,4 +117,4 @@ private: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc index 22ff2fea51..1911fd924a 100644 --- a/modules/video_capture/windows/device_info_ds.cc +++ b/modules/video_capture/windows/device_info_ds.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/device_info_ds.h" +#include "modules/video_capture/windows/device_info_ds.h" #include // std::hex -#include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/modules/video_capture/windows/help_functions_ds.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_capture/video_capture_config.h" +#include "modules/video_capture/windows/help_functions_ds.h" +#include "rtc_base/logging.h" #include #include diff --git a/modules/video_capture/windows/device_info_ds.h b/modules/video_capture/windows/device_info_ds.h index 0f711965b0..9da349f42d 100644 --- a/modules/video_capture/windows/device_info_ds.h +++ b/modules/video_capture/windows/device_info_ds.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ -#include "webrtc/modules/video_capture/device_info_impl.h" -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/device_info_impl.h" +#include "modules/video_capture/video_capture_impl.h" #include @@ -103,4 +103,4 @@ private: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ diff --git a/modules/video_capture/windows/device_info_mf.cc b/modules/video_capture/windows/device_info_mf.cc index de367aabfb..3bdd7553a5 100644 --- a/modules/video_capture/windows/device_info_mf.cc +++ b/modules/video_capture/windows/device_info_mf.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/device_info_mf.h" +#include "modules/video_capture/windows/device_info_mf.h" namespace webrtc { namespace videocapturemodule { diff --git a/modules/video_capture/windows/device_info_mf.h b/modules/video_capture/windows/device_info_mf.h index 7512277cb5..027f7c4401 100644 --- a/modules/video_capture/windows/device_info_mf.h +++ b/modules/video_capture/windows/device_info_mf.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ +#ifndef MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ +#define MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ -#include "webrtc/modules/video_capture/device_info_impl.h" +#include "modules/video_capture/device_info_impl.h" namespace webrtc { namespace videocapturemodule { @@ -40,4 +40,4 @@ class DeviceInfoMF : public DeviceInfoImpl { } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ +#endif // MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_ diff --git a/modules/video_capture/windows/help_functions_ds.cc b/modules/video_capture/windows/help_functions_ds.cc index 057bffb0af..12deab0128 100644 --- a/modules/video_capture/windows/help_functions_ds.cc +++ b/modules/video_capture/windows/help_functions_ds.cc @@ -12,7 +12,7 @@ // that DEFINE_GUID() entries will be defined in this // object file. -#include "webrtc/modules/video_capture/windows/help_functions_ds.h" +#include "modules/video_capture/windows/help_functions_ds.h" #include diff --git a/modules/video_capture/windows/help_functions_ds.h b/modules/video_capture/windows/help_functions_ds.h index d675f9299a..990f4183cc 100644 --- a/modules/video_capture/windows/help_functions_ds.h +++ b/modules/video_capture/windows/help_functions_ds.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ #include @@ -32,4 +32,4 @@ BOOL PinMatchesCategory(IPin *pPin, REFGUID Category); } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc index 58e1bfc940..1b2138ac20 100644 --- a/modules/video_capture/windows/sink_filter_ds.cc +++ b/modules/video_capture/windows/sink_filter_ds.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/sink_filter_ds.h" +#include "modules/video_capture/windows/sink_filter_ds.h" #include // std::hex -#include "webrtc/modules/video_capture/windows/help_functions_ds.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "modules/video_capture/windows/help_functions_ds.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" #include // VIDEOINFOHEADER2 #include diff --git a/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h index f065f91eae..af0afe9357 100644 --- a/modules/video_capture/windows/sink_filter_ds.h +++ b/modules/video_capture/windows/sink_filter_ds.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ #include // Include base DS filter header files -#include "webrtc/modules/video_capture/video_capture_defines.h" +#include "modules/video_capture/video_capture_defines.h" namespace webrtc { @@ -92,4 +92,4 @@ private: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ diff --git a/modules/video_capture/windows/video_capture_ds.cc b/modules/video_capture/windows/video_capture_ds.cc index 46747ba157..a9f06f7423 100644 --- a/modules/video_capture/windows/video_capture_ds.cc +++ b/modules/video_capture/windows/video_capture_ds.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/video_capture_ds.h" +#include "modules/video_capture/windows/video_capture_ds.h" -#include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/modules/video_capture/windows/help_functions_ds.h" -#include "webrtc/modules/video_capture/windows/sink_filter_ds.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_capture/video_capture_config.h" +#include "modules/video_capture/windows/help_functions_ds.h" +#include "modules/video_capture/windows/sink_filter_ds.h" +#include "rtc_base/logging.h" #include // VIDEOINFOHEADER2 diff --git a/modules/video_capture/windows/video_capture_ds.h b/modules/video_capture/windows/video_capture_ds.h index 7e63e56cd1..54c5f00c65 100644 --- a/modules/video_capture/windows/video_capture_ds.h +++ b/modules/video_capture/windows/video_capture_ds.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ -#include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/modules/video_capture/windows/device_info_ds.h" +#include "modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/windows/device_info_ds.h" #define CAPTURE_FILTER_NAME L"VideoCaptureFilter" #define SINK_FILTER_NAME L"SinkFilter" @@ -76,4 +76,4 @@ protected: }; } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ diff --git a/modules/video_capture/windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc index f53ea994f2..069f463c32 100644 --- a/modules/video_capture/windows/video_capture_factory_windows.cc +++ b/modules/video_capture/windows/video_capture_factory_windows.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/video_capture_ds.h" -#include "webrtc/modules/video_capture/windows/video_capture_mf.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/video_capture/windows/video_capture_ds.h" +#include "modules/video_capture/windows/video_capture_mf.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace videocapturemodule { diff --git a/modules/video_capture/windows/video_capture_mf.cc b/modules/video_capture/windows/video_capture_mf.cc index cd3faf7abb..086b7083d9 100644 --- a/modules/video_capture/windows/video_capture_mf.cc +++ b/modules/video_capture/windows/video_capture_mf.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/windows/video_capture_mf.h" +#include "modules/video_capture/windows/video_capture_mf.h" namespace webrtc { namespace videocapturemodule { diff --git a/modules/video_capture/windows/video_capture_mf.h b/modules/video_capture/windows/video_capture_mf.h index 5b58f891e6..896be4e260 100644 --- a/modules/video_capture/windows/video_capture_mf.h +++ b/modules/video_capture/windows/video_capture_mf.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ +#ifndef MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ +#define MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ -#include "webrtc/modules/video_capture/video_capture_impl.h" +#include "modules/video_capture/video_capture_impl.h" namespace webrtc { namespace videocapturemodule { @@ -40,4 +40,4 @@ class VideoCaptureMF : public VideoCaptureImpl { } // namespace videocapturemodule } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ +#endif // MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_ diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 3d3a3af342..985002bb38 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -367,10 +367,10 @@ if (rtc_include_tests) { } video_coding_modules_tests_resources = [ - "../../../resources/foreman_128x96.yuv", - "../../../resources/foreman_160x120.yuv", - "../../../resources/foreman_176x144.yuv", - "../../../resources/foreman_320x240.yuv", + "../../resources/foreman_128x96.yuv", + "../../resources/foreman_160x120.yuv", + "../../resources/foreman_176x144.yuv", + "../../resources/foreman_320x240.yuv", ] if (is_ios || is_mac) { diff --git a/modules/video_coding/DEPS b/modules/video_coding/DEPS index 068c0ae206..af1a6e7f98 100644 --- a/modules/video_coding/DEPS +++ b/modules/video_coding/DEPS @@ -2,22 +2,22 @@ include_rules = [ "+third_party/ffmpeg", "+third_party/openh264", "+vpx", - "+webrtc/call", - "+webrtc/common_video", - "+webrtc/system_wrappers", - "+webrtc/rtc_tools", + "+call", + "+common_video", + "+system_wrappers", + "+rtc_tools", ] specific_include_rules = { "android_test_initializer\.cc": [ "+base/android", - "+webrtc/sdk", + "+sdk", ], "(.*test\.cc|.*test\.h|.*test\.mm)": [ - "+webrtc/media/engine", - "+webrtc/sdk", + "+media/engine", + "+sdk", ], ".*h264\.h": [ - "+webrtc/media/base/codec.h" + "+media/base/codec.h" ], } diff --git a/modules/video_coding/codec_database.cc b/modules/video_coding/codec_database.cc index ffcdb6706f..18e6cc1b90 100644 --- a/modules/video_coding/codec_database.cc +++ b/modules/video_coding/codec_database.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codec_database.h" +#include "modules/video_coding/codec_database.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/i420/include/i420.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/i420/include/i420.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "modules/video_coding/internal_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace { const size_t kDefaultPayloadSize = 1440; diff --git a/modules/video_coding/codec_database.h b/modules/video_coding/codec_database.h index 4032558eac..1b9a5c2f66 100644 --- a/modules/video_coding/codec_database.h +++ b/modules/video_coding/codec_database.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ +#ifndef MODULES_VIDEO_CODING_CODEC_DATABASE_H_ +#define MODULES_VIDEO_CODING_CODEC_DATABASE_H_ #include #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/generic_decoder.h" -#include "webrtc/modules/video_coding/generic_encoder.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/generic_decoder.h" +#include "modules/video_coding/generic_encoder.h" +#include "typedefs.h" namespace webrtc { @@ -150,4 +150,4 @@ class VCMCodecDataBase { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ +#endif // MODULES_VIDEO_CODING_CODEC_DATABASE_H_ diff --git a/modules/video_coding/codec_timer.cc b/modules/video_coding/codec_timer.cc index 0fdf1a692e..5a9b6e4e78 100644 --- a/modules/video_coding/codec_timer.cc +++ b/modules/video_coding/codec_timer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codec_timer.h" +#include "modules/video_coding/codec_timer.h" namespace webrtc { diff --git a/modules/video_coding/codec_timer.h b/modules/video_coding/codec_timer.h index 7736d71f5d..7a365223db 100644 --- a/modules/video_coding/codec_timer.h +++ b/modules/video_coding/codec_timer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ +#ifndef MODULES_VIDEO_CODING_CODEC_TIMER_H_ +#define MODULES_VIDEO_CODING_CODEC_TIMER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/numerics/percentile_filter.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/numerics/percentile_filter.h" +#include "typedefs.h" namespace webrtc { @@ -48,4 +48,4 @@ class VCMCodecTimer { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ +#endif // MODULES_VIDEO_CODING_CODEC_TIMER_H_ diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc index aa9dbe5ee3..471ca24984 100644 --- a/modules/video_coding/codecs/h264/h264.cc +++ b/modules/video_coding/codecs/h264/h264.cc @@ -9,15 +9,15 @@ * */ -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/h264/include/h264.h" #if defined(WEBRTC_USE_H264) -#include "webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h" -#include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h" +#include "modules/video_coding/codecs/h264/h264_decoder_impl.h" +#include "modules/video_coding/codecs/h264/h264_encoder_impl.h" #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc index b71347e87e..4506d8aaef 100644 --- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc @@ -9,7 +9,7 @@ * */ -#include "webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h" +#include "modules/video_coding/codecs/h264/h264_decoder_impl.h" #include #include @@ -20,13 +20,13 @@ extern "C" { #include "third_party/ffmpeg/libavutil/imgutils.h" } // extern "C" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "api/video/i420_buffer.h" +#include "common_video/include/video_frame_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.h b/modules/video_coding/codecs/h264/h264_decoder_impl.h index 44c2acb2e0..74633e3584 100644 --- a/modules/video_coding/codecs/h264/h264_decoder_impl.h +++ b/modules/video_coding/codecs/h264/h264_decoder_impl.h @@ -9,19 +9,19 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ +#define MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ #include -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/h264/include/h264.h" extern "C" { #include "third_party/ffmpeg/libavcodec/avcodec.h" } // extern "C" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/common_video/include/i420_buffer_pool.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "common_video/include/i420_buffer_pool.h" namespace webrtc { @@ -84,4 +84,4 @@ class H264DecoderImpl : public H264Decoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ +#endif // MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index f5a1910984..0b964e05c9 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -9,7 +9,7 @@ * */ -#include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h" +#include "modules/video_coding/codecs/h264/h264_encoder_impl.h" #include #include @@ -19,11 +19,11 @@ #include "third_party/openh264/src/codec/api/svc/codec_def.h" #include "third_party/openh264/src/codec/api/svc/codec_ver.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h index a455259bf2..c9b45d0a62 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.h +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.h @@ -9,15 +9,15 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ +#define MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ #include #include -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/utility/quality_scaler.h" #include "third_party/openh264/src/codec/api/svc/codec_app_def.h" @@ -101,4 +101,4 @@ class H264EncoderImpl : public H264Encoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ +#endif // MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_ diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc b/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc index 2d236cf1f9..f143c9e849 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc @@ -9,9 +9,9 @@ * */ -#include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h" +#include "modules/video_coding/codecs/h264/h264_encoder_impl.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/codecs/h264/include/h264.h b/modules/video_coding/codecs/h264/include/h264.h index 2d92473ab5..d4c8c21613 100644 --- a/modules/video_coding/codecs/h264/include/h264.h +++ b/modules/video_coding/codecs/h264/include/h264.h @@ -9,11 +9,11 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ +#define MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ -#include "webrtc/media/base/codec.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "media/base/codec.h" +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { @@ -42,4 +42,4 @@ class H264Decoder : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ +#endif // MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ diff --git a/modules/video_coding/codecs/h264/include/h264_globals.h b/modules/video_coding/codecs/h264/include/h264_globals.h index 8f0d9fe159..cae270cc39 100644 --- a/modules/video_coding/codecs/h264/include/h264_globals.h +++ b/modules/video_coding/codecs/h264/include/h264_globals.h @@ -11,8 +11,8 @@ // This file contains codec dependent definitions that are needed in // order to compile the WebRTC codebase, even if this codec is not used. -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ +#define MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ namespace webrtc { @@ -79,4 +79,4 @@ struct RTPVideoHeaderH264 { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_GLOBALS_H_ diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc index 806b5ac06b..255b2c309e 100644 --- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc +++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/test/video_codec_test.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/test/video_codec_test.h" namespace webrtc { diff --git a/modules/video_coding/codecs/i420/i420.cc b/modules/video_coding/codecs/i420/i420.cc index 4f62fae4f4..2749d0e297 100644 --- a/modules/video_coding/codecs/i420/i420.cc +++ b/modules/video_coding/codecs/i420/i420.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/i420/include/i420.h" +#include "modules/video_coding/codecs/i420/include/i420.h" #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "api/video/i420_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" namespace { const size_t kI420HeaderSize = 4; diff --git a/modules/video_coding/codecs/i420/include/i420.h b/modules/video_coding/codecs/i420/include/i420.h index 6c182d09e2..f1d1dc1239 100644 --- a/modules/video_coding/codecs/i420/include/i420.h +++ b/modules/video_coding/codecs/i420/include/i420.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ +#define MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "typedefs.h" namespace webrtc { @@ -139,4 +139,4 @@ class I420Decoder : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ +#endif // MODULES_VIDEO_CODING_CODECS_I420_INCLUDE_I420_H_ diff --git a/modules/video_coding/codecs/interface/common_constants.h b/modules/video_coding/codecs/interface/common_constants.h index 8ed26c4216..2fdcb90ccf 100644 --- a/modules/video_coding/codecs/interface/common_constants.h +++ b/modules/video_coding/codecs/interface/common_constants.h @@ -11,8 +11,8 @@ // This file contains constants that are used by multiple global // codec definitions (modules/video_coding/codecs/*/include/*_globals.h) -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ +#define MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ namespace webrtc { @@ -23,4 +23,4 @@ const int kNoKeyIdx = -1; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ diff --git a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h index e58da7920b..a67150e4f4 100644 --- a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#define MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ #pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " "use video_coding/include") #include #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { @@ -78,4 +78,4 @@ class MockVideoDecoder : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/codecs/interface/video_codec_interface.h b/modules/video_coding/codecs/interface/video_codec_interface.h index 2b9d0549f2..682fde6962 100644 --- a/modules/video_coding/codecs/interface/video_codec_interface.h +++ b/modules/video_coding/codecs/interface/video_codec_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ +#define MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ #pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " "use video_coding/include") -#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_codec_interface.h" -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ +#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/codecs/interface/video_error_codes.h b/modules/video_coding/codecs/interface/video_error_codes.h index ea8829df80..582d3091a5 100644 --- a/modules/video_coding/codecs/interface/video_error_codes.h +++ b/modules/video_coding/codecs/interface/video_error_codes.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ +#define MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ #pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " "use video_coding/include") @@ -32,4 +32,4 @@ #define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13 #define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ +#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ diff --git a/modules/video_coding/codecs/test/android_test_initializer.cc b/modules/video_coding/codecs/test/android_test_initializer.cc index 81942a1568..43cf22aceb 100644 --- a/modules/video_coding/codecs/test/android_test_initializer.cc +++ b/modules/video_coding/codecs/test/android_test_initializer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/video_coding/codecs/test/android_test_initializer.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "modules/video_coding/codecs/test/android_test_initializer.h" +#include "rtc_base/ignore_wundef.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. @@ -23,7 +23,7 @@ RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/video_coding/codecs/test/android_test_initializer.h b/modules/video_coding/codecs/test/android_test_initializer.h index a4ec9d2012..2094b2d47f 100644 --- a/modules/video_coding/codecs/test/android_test_initializer.h +++ b/modules/video_coding/codecs/test/android_test_initializer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ namespace webrtc { @@ -17,4 +17,4 @@ void InitializeAndroidObjects(); } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_ANDROID_TEST_INITIALIZER_H_ diff --git a/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h b/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h index a086a88131..d337937a3c 100644 --- a/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h +++ b/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ #include -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" -#include "webrtc/common_video/include/video_frame.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "test/gmock.h" +#include "typedefs.h" +#include "common_video/include/video_frame.h" namespace webrtc { namespace test { @@ -29,4 +29,4 @@ class MockPacketManipulator : public PacketManipulator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ diff --git a/modules/video_coding/codecs/test/objc_codec_h264_test.h b/modules/video_coding/codecs/test/objc_codec_h264_test.h index 0b82e927d6..69b65c4267 100644 --- a/modules/video_coding/codecs/test/objc_codec_h264_test.h +++ b/modules/video_coding/codecs/test/objc_codec_h264_test.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ #include -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" namespace webrtc { @@ -23,4 +23,4 @@ std::unique_ptr CreateObjCDecoderFactory(); } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_ diff --git a/modules/video_coding/codecs/test/objc_codec_h264_test.mm b/modules/video_coding/codecs/test/objc_codec_h264_test.mm index ceb661a694..85ca9df6ae 100644 --- a/modules/video_coding/codecs/test/objc_codec_h264_test.mm +++ b/modules/video_coding/codecs/test/objc_codec_h264_test.mm @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h" +#include "modules/video_coding/codecs/test/objc_codec_h264_test.h" #import "WebRTC/RTCVideoCodecH264.h" -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" namespace webrtc { diff --git a/modules/video_coding/codecs/test/packet_manipulator.cc b/modules/video_coding/codecs/test/packet_manipulator.cc index 37da9dbfa9..42e6ab539e 100644 --- a/modules/video_coding/codecs/test/packet_manipulator.cc +++ b/modules/video_coding/codecs/test/packet_manipulator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" #include #include -#include "webrtc/rtc_base/format_macros.h" +#include "rtc_base/format_macros.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/packet_manipulator.h b/modules/video_coding/codecs/test/packet_manipulator.h index 0067fa93cb..be00b236f2 100644 --- a/modules/video_coding/codecs/test/packet_manipulator.h +++ b/modules/video_coding/codecs/test/packet_manipulator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/test/testsupport/packet_reader.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/criticalsection.h" +#include "test/testsupport/packet_reader.h" namespace webrtc { namespace test { @@ -112,4 +112,4 @@ class PacketManipulatorImpl : public PacketManipulator { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ diff --git a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc index 69598e26a7..152433c053 100644 --- a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc +++ b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" #include -#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/unittest_utils.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/codecs/test/predictive_packet_manipulator.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/gtest.h" +#include "test/testsupport/unittest_utils.h" +#include "typedefs.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/predictive_packet_manipulator.cc b/modules/video_coding/codecs/test/predictive_packet_manipulator.cc index 9eba205a88..d2544d0daf 100644 --- a/modules/video_coding/codecs/test/predictive_packet_manipulator.cc +++ b/modules/video_coding/codecs/test/predictive_packet_manipulator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" +#include "modules/video_coding/codecs/test/predictive_packet_manipulator.h" #include #include -#include "webrtc/test/testsupport/packet_reader.h" +#include "test/testsupport/packet_reader.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/predictive_packet_manipulator.h b/modules/video_coding/codecs/test/predictive_packet_manipulator.h index 45c7848c67..2a44cc81c5 100644 --- a/modules/video_coding/codecs/test/predictive_packet_manipulator.h +++ b/modules/video_coding/codecs/test/predictive_packet_manipulator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ #include -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" -#include "webrtc/test/testsupport/packet_reader.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "test/testsupport/packet_reader.h" namespace webrtc { namespace test { @@ -43,4 +43,4 @@ class PredictivePacketManipulator : public PacketManipulatorImpl { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_PREDICTIVE_PACKET_MANIPULATOR_H_ diff --git a/modules/video_coding/codecs/test/stats.cc b/modules/video_coding/codecs/test/stats.cc index b2950ae35d..490d2d5161 100644 --- a/modules/video_coding/codecs/test/stats.cc +++ b/modules/video_coding/codecs/test/stats.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/stats.h" +#include "modules/video_coding/codecs/test/stats.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/stats.h b/modules/video_coding/codecs/test/stats.h index a0bd112980..42f4b01d6a 100644 --- a/modules/video_coding/codecs/test/stats.h +++ b/modules/video_coding/codecs/test/stats.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { namespace test { @@ -73,4 +73,4 @@ class Stats { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_STATS_H_ diff --git a/modules/video_coding/codecs/test/stats_unittest.cc b/modules/video_coding/codecs/test/stats_unittest.cc index 24fe265407..87727e2889 100644 --- a/modules/video_coding/codecs/test/stats_unittest.cc +++ b/modules/video_coding/codecs/test/stats_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/stats.h" +#include "modules/video_coding/codecs/test/stats.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/video_codec_test.cc b/modules/video_coding/codecs/test/video_codec_test.cc index 1a14750f22..85d76c3a37 100644 --- a/modules/video_coding/codecs/test/video_codec_test.cc +++ b/modules/video_coding/codecs/test/video_codec_test.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/video_codec_test.h" +#include "modules/video_coding/codecs/test/video_codec_test.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/video/i420_buffer.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "test/frame_utils.h" +#include "test/testsupport/fileutils.h" static const int kEncodeTimeoutMs = 100; static const int kDecodeTimeoutMs = 25; diff --git a/modules/video_coding/codecs/test/video_codec_test.h b/modules/video_coding/codecs/test/video_codec_test.h index ed2c1a312f..eb43cd00cc 100644 --- a/modules/video_coding/codecs/test/video_codec_test.h +++ b/modules/video_coding/codecs/test/video_codec_test.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ #include -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/test/gtest.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/thread_annotations.h" +#include "test/gtest.h" namespace webrtc { @@ -108,4 +108,4 @@ class VideoCodecTest : public ::testing::Test { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_ diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc index 0641a87d68..60b90a5f31 100644 --- a/modules/video_coding/codecs/test/videoprocessor.cc +++ b/modules/video_coding/codecs/test/videoprocessor.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" +#include "modules/video_coding/codecs/test/videoprocessor.h" #include @@ -17,16 +17,16 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/cpu_info.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "common_types.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/cpu_info.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h index 295d012356..08a565436a 100644 --- a/modules/video_coding/codecs/test/videoprocessor.h +++ b/modules/video_coding/codecs/test/videoprocessor.h @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ #include #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" -#include "webrtc/modules/video_coding/codecs/test/stats.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/testsupport/frame_reader.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "api/video/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "modules/video_coding/codecs/test/stats.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/ivf_file_writer.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "test/testsupport/frame_reader.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { @@ -310,4 +310,4 @@ class VideoProcessor { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index 508316b7fa..5bafd89a18 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -8,33 +8,33 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h" +#include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" #include #if defined(WEBRTC_ANDROID) -#include "webrtc/modules/video_coding/codecs/test/android_test_initializer.h" -#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" -#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" +#include "modules/video_coding/codecs/test/android_test_initializer.h" +#include "sdk/android/src/jni/androidmediadecoder_jni.h" +#include "sdk/android/src/jni/androidmediaencoder_jni.h" #elif defined(WEBRTC_IOS) -#include "webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h" +#include "modules/video_coding/codecs/test/objc_codec_h264_test.h" #endif -#include "webrtc/media/engine/internaldecoderfactory.h" -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/metrics/video_metrics.h" -#include "webrtc/test/video_codec_settings.h" +#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internalencoderfactory.h" +#include "media/engine/videoencodersoftwarefallbackwrapper.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/file.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "system_wrappers/include/sleep.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/metrics/video_metrics.h" +#include "test/video_codec_settings.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/modules/video_coding/codecs/test/videoprocessor_integrationtest.h index 0efb9694b7..bd0a3bdc94 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.h +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ +#define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" -#include "webrtc/modules/video_coding/codecs/test/stats.h" -#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/frame_reader.h" -#include "webrtc/test/testsupport/frame_writer.h" -#include "webrtc/test/testsupport/packet_reader.h" +#include "common_types.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "modules/video_coding/codecs/test/stats.h" +#include "modules/video_coding/codecs/test/videoprocessor.h" +#include "modules/video_coding/utility/ivf_file_writer.h" +#include "test/gtest.h" +#include "test/testsupport/frame_reader.h" +#include "test/testsupport/frame_writer.h" +#include "test/testsupport/packet_reader.h" namespace webrtc { namespace test { @@ -189,4 +189,4 @@ class VideoProcessorIntegrationTest : public testing::Test { } // namespace test } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ +#endif // MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTEST_H_ diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc index 163c6f1b5a..9f3c1d3149 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h" +#include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" #include -#include "webrtc/test/testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc index 47734d79a5..aba7657846 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h" +#include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" #include -#include "webrtc/test/field_trial.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/field_trial.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc index a5f82619de..e6db027e1d 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h" +#include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" #include -#include "webrtc/test/testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc index 1a1555856b..4bd5fec78f 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h" +#include "modules/video_coding/codecs/test/videoprocessor_integrationtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index 9474760299..7fc7775e61 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -10,21 +10,21 @@ #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" -#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" -#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/mock/mock_frame_reader.h" -#include "webrtc/test/testsupport/mock/mock_frame_writer.h" -#include "webrtc/test/testsupport/packet_reader.h" -#include "webrtc/test/testsupport/unittest_utils.h" -#include "webrtc/test/video_codec_settings.h" -#include "webrtc/typedefs.h" +#include "api/video/i420_buffer.h" +#include "common_types.h" +#include "modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" +#include "modules/video_coding/codecs/test/videoprocessor.h" +#include "modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "modules/video_coding/include/video_coding.h" +#include "rtc_base/ptr_util.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/mock/mock_frame_reader.h" +#include "test/testsupport/mock/mock_frame_writer.h" +#include "test/testsupport/packet_reader.h" +#include "test/testsupport/unittest_utils.h" +#include "test/video_codec_settings.h" +#include "typedefs.h" using ::testing::_; using ::testing::AtLeast; diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc index 02c3f1541f..6757ba26b3 100644 --- a/modules/video_coding/codecs/vp8/default_temporal_layers.cc +++ b/modules/video_coding/codecs/vp8/default_temporal_layers.cc @@ -7,7 +7,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" +#include "modules/video_coding/codecs/vp8/default_temporal_layers.h" #include #include @@ -15,11 +15,11 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/field_trial.h" #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.h b/modules/video_coding/codecs/vp8/default_temporal_layers.h index 985874b620..e1a5987dec 100644 --- a/modules/video_coding/codecs/vp8/default_temporal_layers.h +++ b/modules/video_coding/codecs/vp8/default_temporal_layers.h @@ -9,14 +9,14 @@ /* * This file defines classes for doing temporal layers with VP8. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ #include -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -60,4 +60,4 @@ class DefaultTemporalLayers : public TemporalLayers { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc index 0075fd51b1..d28b67ff89 100644 --- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" +#include "modules/video_coding/codecs/vp8/default_temporal_layers.h" #include "vpx/vp8cx.h" #include "vpx/vpx_encoder.h" -#include "webrtc/modules/video_coding/codecs/vp8/vp8_impl.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/codecs/vp8/vp8_impl.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/vp8/include/vp8.h b/modules/video_coding/codecs/vp8/include/vp8.h index dd3514235d..a5d3fb3fe7 100644 --- a/modules/video_coding/codecs/vp8/include/vp8.h +++ b/modules/video_coding/codecs/vp8/include/vp8.h @@ -10,10 +10,10 @@ * WEBRTC VP8 wrapper interface */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ -#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { @@ -32,4 +32,4 @@ class VP8Decoder : public VideoDecoder { }; // end of VP8Decoder class } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ diff --git a/modules/video_coding/codecs/vp8/include/vp8_common_types.h b/modules/video_coding/codecs/vp8/include/vp8_common_types.h index 67888f7a21..4d69551e33 100644 --- a/modules/video_coding/codecs/vp8/include/vp8_common_types.h +++ b/modules/video_coding/codecs/vp8/include/vp8_common_types.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -26,4 +26,4 @@ static const float }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_COMMON_TYPES_H_ diff --git a/modules/video_coding/codecs/vp8/include/vp8_globals.h b/modules/video_coding/codecs/vp8/include/vp8_globals.h index 938e199126..1fab5f45a6 100644 --- a/modules/video_coding/codecs/vp8/include/vp8_globals.h +++ b/modules/video_coding/codecs/vp8/include/vp8_globals.h @@ -11,10 +11,10 @@ // This file contains codec dependent definitions that are needed in // order to compile the WebRTC codebase, even if this codec is not used. -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ -#include "webrtc/modules/video_coding/codecs/interface/common_constants.h" +#include "modules/video_coding/codecs/interface/common_constants.h" namespace webrtc { @@ -46,4 +46,4 @@ struct RTPVideoHeaderVP8 { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_ diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc index d81447bb5d..1d8b6de7bd 100644 --- a/modules/video_coding/codecs/vp8/screenshare_layers.cc +++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc @@ -7,7 +7,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" +#include "modules/video_coding/codecs/vp8/screenshare_layers.h" #include @@ -15,10 +15,10 @@ #include "vpx/vp8cx.h" #include "vpx/vpx_encoder.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h index dcf6eab984..775f6a0bde 100644 --- a/modules/video_coding/codecs/vp8/screenshare_layers.h +++ b/modules/video_coding/codecs/vp8/screenshare_layers.h @@ -6,16 +6,16 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ #include -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/utility/frame_dropper.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/utility/frame_dropper.h" +#include "rtc_base/rate_statistics.h" +#include "rtc_base/timeutils.h" +#include "typedefs.h" namespace webrtc { @@ -124,4 +124,4 @@ class ScreenshareLayers : public TemporalLayers { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_SCREENSHARE_LAYERS_H_ diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc index 8335bb9ec1..54f19b8c56 100644 --- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc +++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc @@ -13,14 +13,14 @@ #include "vpx/vp8cx.h" #include "vpx/vpx_encoder.h" -#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" -#include "webrtc/modules/video_coding/codecs/vp8/vp8_impl.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/codecs/vp8/screenshare_layers.h" +#include "modules/video_coding/codecs/vp8/vp8_impl.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/mock/mock_frame_dropper.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" using ::testing::_; using ::testing::ElementsAre; diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc index edd5c1377c..b2b3334815 100644 --- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc +++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" #include #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h index c6c2fb3fee..929abba413 100644 --- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h +++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ #include #include #include -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/video_codecs/video_encoder.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -48,4 +48,4 @@ class SimulcastRateAllocator : public VideoBitrateAllocator, } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_RATE_ALLOCATOR_H_ diff --git a/modules/video_coding/codecs/vp8/simulcast_test_utility.h b/modules/video_coding/codecs/vp8/simulcast_test_utility.h index 7d1cabf1a7..dd22af8cd2 100644 --- a/modules/video_coding/codecs/vp8/simulcast_test_utility.h +++ b/modules/video_coding/codecs/vp8/simulcast_test_utility.h @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ #include #include #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "common_video/include/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" using ::testing::_; using ::testing::AllOf; @@ -752,4 +752,4 @@ class TestVp8Simulcast : public ::testing::Test { } // namespace testing } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_UTILITY_H_ diff --git a/modules/video_coding/codecs/vp8/simulcast_unittest.cc b/modules/video_coding/codecs/vp8/simulcast_unittest.cc index 1120fe07e4..d8b44f48cf 100644 --- a/modules/video_coding/codecs/vp8/simulcast_unittest.cc +++ b/modules/video_coding/codecs/vp8/simulcast_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_test_utility.h" +#include "modules/video_coding/codecs/vp8/simulcast_test_utility.h" namespace webrtc { namespace testing { diff --git a/modules/video_coding/codecs/vp8/temporal_layers.h b/modules/video_coding/codecs/vp8/temporal_layers.h index 9c4dd57044..79bf7dfc48 100644 --- a/modules/video_coding/codecs/vp8/temporal_layers.h +++ b/modules/video_coding/codecs/vp8/temporal_layers.h @@ -9,12 +9,12 @@ /* * This file defines the interface for doing temporal layers with VP8. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" struct vpx_codec_enc_cfg; typedef struct vpx_codec_enc_cfg vpx_codec_enc_cfg_t; @@ -148,4 +148,4 @@ class TemporalLayersListener { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index 3eb04be037..f6a266ac91 100644 --- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -12,19 +12,19 @@ #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/test/video_codec_test.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/video_codec_settings.h" +#include "api/optional.h" +#include "api/video/i420_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/test/video_codec_test.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" +#include "test/field_trial.h" +#include "test/frame_utils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/video_codec_settings.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp8/vp8_impl.cc b/modules/video_coding/codecs/vp8/vp8_impl.cc index 8d10594da9..0d6201ecf1 100644 --- a/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/vp8_impl.h" +#include "modules/video_coding/codecs/vp8/vp8_impl.h" #include #include @@ -20,22 +20,22 @@ #include "libyuv/scale.h" // NOLINT #include "libyuv/convert.h" // NOLINT -#include "webrtc/common_types.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "common_types.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/codecs/vp8/screenshare_layers.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/random.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/modules/video_coding/codecs/vp8/vp8_impl.h b/modules/video_coding/codecs/vp8/vp8_impl.h index 30a4a1a642..069cca9de2 100644 --- a/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/modules/video_coding/codecs/vp8/vp8_impl.h @@ -10,8 +10,8 @@ * WEBRTC VP8 wrapper interface */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ +#define MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ #include #include @@ -23,13 +23,13 @@ #include "vpx/vp8cx.h" #include "vpx/vp8dx.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "api/video/video_frame.h" +#include "common_video/include/i420_buffer_pool.h" +#include "common_video/include/video_frame.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/quality_scaler.h" namespace webrtc { @@ -164,4 +164,4 @@ class VP8DecoderImpl : public VP8Decoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP8_VP8_IMPL_H_ diff --git a/modules/video_coding/codecs/vp9/include/vp9.h b/modules/video_coding/codecs/vp9/include/vp9.h index 3b726a0cc5..53cc3c0646 100644 --- a/modules/video_coding/codecs/vp9/include/vp9.h +++ b/modules/video_coding/codecs/vp9/include/vp9.h @@ -9,10 +9,10 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ +#define MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ -#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { @@ -33,4 +33,4 @@ class VP9Decoder : public VideoDecoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ diff --git a/modules/video_coding/codecs/vp9/include/vp9_globals.h b/modules/video_coding/codecs/vp9/include/vp9_globals.h index f429bdab3c..945eb0cfcd 100644 --- a/modules/video_coding/codecs/vp9/include/vp9_globals.h +++ b/modules/video_coding/codecs/vp9/include/vp9_globals.h @@ -11,10 +11,10 @@ // This file contains codec dependent definitions that are needed in // order to compile the WebRTC codebase, even if this codec is not used. -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ -#include "webrtc/modules/video_coding/codecs/interface/common_constants.h" +#include "modules/video_coding/codecs/interface/common_constants.h" namespace webrtc { @@ -207,4 +207,4 @@ struct RTPVideoHeaderVP9 { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ diff --git a/modules/video_coding/codecs/vp9/screenshare_layers.cc b/modules/video_coding/codecs/vp9/screenshare_layers.cc index 461b357c9a..158b0e52dc 100644 --- a/modules/video_coding/codecs/vp9/screenshare_layers.cc +++ b/modules/video_coding/codecs/vp9/screenshare_layers.cc @@ -7,9 +7,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" +#include "modules/video_coding/codecs/vp9/screenshare_layers.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/screenshare_layers.h b/modules/video_coding/codecs/vp9/screenshare_layers.h index 5a901ae359..6725ab76f9 100644 --- a/modules/video_coding/codecs/vp9/screenshare_layers.h +++ b/modules/video_coding/codecs/vp9/screenshare_layers.h @@ -7,10 +7,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ +#define MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ -#include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h" +#include "modules/video_coding/codecs/vp9/vp9_impl.h" namespace webrtc { @@ -63,4 +63,4 @@ class ScreenshareLayersVP9 { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP9_SCREENSHARE_LAYERS_H_ diff --git a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc index 50de7fd213..45a88b1f1d 100644 --- a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc +++ b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/modules/video_coding/codecs/test/video_codec_test.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "modules/video_coding/codecs/test/video_codec_test.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc index ff821b94d3..0e819231a5 100644 --- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc +++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc @@ -9,14 +9,14 @@ * */ -#include "webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h" +#include "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_decoder.h" #include "vpx/vpx_frame_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h index d75f67436e..fcb30af560 100644 --- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h +++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h @@ -9,16 +9,16 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ +#define MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" struct vpx_codec_ctx; struct vpx_codec_frame_buffer; @@ -121,4 +121,4 @@ class Vp9FrameBufferPool { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP9_VP9_FRAME_BUFFER_POOL_H_ diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index dc8bba22e0..b33ea8e0b2 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -9,7 +9,7 @@ * */ -#include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h" +#include "modules/video_coding/codecs/vp9/vp9_impl.h" #include #include @@ -21,15 +21,15 @@ #include "vpx/vp8cx.h" #include "vpx/vp8dx.h" -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "common_video/include/video_frame_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/vp9/screenshare_layers.h" +#include "rtc_base/checks.h" +#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/logging.h" +#include "rtc_base/random.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_impl.h b/modules/video_coding/codecs/vp9/vp9_impl.h index 7555ccbf58..d2f7822713 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.h +++ b/modules/video_coding/codecs/vp9/vp9_impl.h @@ -9,14 +9,14 @@ * */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ +#ifndef MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ +#define MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ #include #include -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h" #include "vpx/vp8cx.h" #include "vpx/vpx_decoder.h" @@ -169,4 +169,4 @@ class VP9DecoderImpl : public VP9Decoder { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ +#endif // MODULES_VIDEO_CODING_CODECS_VP9_VP9_IMPL_H_ diff --git a/modules/video_coding/codecs/vp9/vp9_noop.cc b/modules/video_coding/codecs/vp9/vp9_noop.cc index 7566a50a19..4522273141 100644 --- a/modules/video_coding/codecs/vp9/vp9_noop.cc +++ b/modules/video_coding/codecs/vp9/vp9_noop.cc @@ -13,8 +13,8 @@ #error #endif // !defined(RTC_DISABLE_VP9) -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc index c8205b283f..5ef7470c3b 100644 --- a/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc +++ b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc @@ -12,11 +12,11 @@ #include #include "vpx/vp8cx.h" -#include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" -#include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/codecs/vp9/screenshare_layers.h" +#include "modules/video_coding/codecs/vp9/vp9_impl.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/decoding_state.cc b/modules/video_coding/decoding_state.cc index f57250e901..01ba86016a 100644 --- a/modules/video_coding/decoding_state.cc +++ b/modules/video_coding/decoding_state.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/decoding_state.h" +#include "modules/video_coding/decoding_state.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/frame_buffer.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/h264/h264_common.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/frame_buffer.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/packet.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/decoding_state.h b/modules/video_coding/decoding_state.h index c7340809a7..b0f11ffc35 100644 --- a/modules/video_coding/decoding_state.h +++ b/modules/video_coding/decoding_state.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_DECODING_STATE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_DECODING_STATE_H_ +#ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_ +#define MODULES_VIDEO_CODING_DECODING_STATE_H_ #include #include #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -87,4 +87,4 @@ class VCMDecodingState { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_DECODING_STATE_H_ +#endif // MODULES_VIDEO_CODING_DECODING_STATE_H_ diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc index 1edd1e3839..96ba32fb36 100644 --- a/modules/video_coding/decoding_state_unittest.cc +++ b/modules/video_coding/decoding_state_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/decoding_state.h" -#include "webrtc/modules/video_coding/frame_buffer.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/test/gtest.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/decoding_state.h" +#include "modules/video_coding/frame_buffer.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/packet.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/encoded_frame.cc b/modules/video_coding/encoded_frame.cc index bd407c733f..8abea7e704 100644 --- a/modules/video_coding/encoded_frame.cc +++ b/modules/video_coding/encoded_frame.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/generic_encoder.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/generic_encoder.h" +#include "modules/video_coding/jitter_buffer_common.h" namespace webrtc { diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h index 7956485f21..5a91d7eb7e 100644 --- a/modules/video_coding/encoded_frame.h +++ b/modules/video_coding/encoded_frame.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_ENCODED_FRAME_H_ -#define WEBRTC_MODULES_VIDEO_CODING_ENCODED_FRAME_H_ +#ifndef MODULES_VIDEO_CODING_ENCODED_FRAME_H_ +#define MODULES_VIDEO_CODING_ENCODED_FRAME_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "common_types.h" +#include "common_video/include/video_frame.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" namespace webrtc { @@ -138,4 +138,4 @@ class VCMEncodedFrame : protected EncodedImage { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_ENCODED_FRAME_H_ +#endif // MODULES_VIDEO_CODING_ENCODED_FRAME_H_ diff --git a/modules/video_coding/fec_rate_table.h b/modules/video_coding/fec_rate_table.h index 18f10e0591..91ec0ce159 100644 --- a/modules/video_coding/fec_rate_table.h +++ b/modules/video_coding/fec_rate_table.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ +#ifndef MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ +#define MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ // This is a private header for media_opt_util.cc. // It should not be included by other files. @@ -458,4 +458,4 @@ static const unsigned char kFecRateTable[kFecRateTableSize] = { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ +#endif // MODULES_VIDEO_CODING_FEC_RATE_TABLE_H_ diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc index 41c7fc8825..207c5be328 100644 --- a/modules/video_coding/frame_buffer.cc +++ b/modules/video_coding/frame_buffer.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/frame_buffer.h" +#include "modules/video_coding/frame_buffer.h" #include #include -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" +#include "modules/video_coding/packet.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index 95c598534c..3a76d5174c 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ +#ifndef MODULES_VIDEO_CODING_FRAME_BUFFER_H_ +#define MODULES_VIDEO_CODING_FRAME_BUFFER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/session_info.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/session_info.h" +#include "typedefs.h" namespace webrtc { @@ -93,4 +93,4 @@ class VCMFrameBuffer : public VCMEncodedFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ +#endif // MODULES_VIDEO_CODING_FRAME_BUFFER_H_ diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc index 5b81c5f997..50c3763dc1 100644 --- a/modules/video_coding/frame_buffer2.cc +++ b/modules/video_coding/frame_buffer2.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/frame_buffer2.h" +#include "modules/video_coding/frame_buffer2.h" #include #include #include -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/jitter_estimator.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h index 77fe485627..32eba8a3cb 100644 --- a/modules/video_coding/frame_buffer2.h +++ b/modules/video_coding/frame_buffer2.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ -#define WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ +#ifndef MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ +#define MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ #include #include #include #include -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/inter_frame_delay.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/inter_frame_delay.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -186,4 +186,4 @@ class FrameBuffer { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ +#endif // MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc index 1ae38c673b..7d792180d4 100644 --- a/modules/video_coding/frame_buffer2_unittest.cc +++ b/modules/video_coding/frame_buffer2_unittest.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/frame_buffer2.h" +#include "modules/video_coding/frame_buffer2.h" #include #include #include #include -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/jitter_estimator.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/sequence_number_util.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::Return; diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc index 86bcffb092..7a724a8f34 100644 --- a/modules/video_coding/frame_object.cc +++ b/modules/video_coding/frame_object.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/video_coding/frame_object.h" +#include "common_video/h264/h264_common.h" +#include "modules/video_coding/packet_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h index 69ab6f03c8..56577a138a 100644 --- a/modules/video_coding/frame_object.h +++ b/modules/video_coding/frame_object.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ -#define WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ +#ifndef MODULES_VIDEO_CODING_FRAME_OBJECT_H_ +#define MODULES_VIDEO_CODING_FRAME_OBJECT_H_ -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/encoded_frame.h" +#include "api/optional.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/encoded_frame.h" namespace webrtc { namespace video_coding { @@ -101,4 +101,4 @@ class RtpFrameObject : public FrameObject { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ +#endif // MODULES_VIDEO_CODING_FRAME_OBJECT_H_ diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc index 3b2a620e12..f67c01786f 100644 --- a/modules/video_coding/generic_decoder.cc +++ b/modules/video_coding/generic_decoder.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/generic_decoder.h" +#include "modules/video_coding/generic_decoder.h" #include -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/internal_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h index c8122da2d8..2c1206feab 100644 --- a/modules/video_coding/generic_decoder.h +++ b/modules/video_coding/generic_decoder.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ +#ifndef MODULES_VIDEO_CODING_GENERIC_DECODER_H_ +#define MODULES_VIDEO_CODING_GENERIC_DECODER_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/timestamp_map.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/timestamp_map.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -114,4 +114,4 @@ class VCMGenericDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ +#endif // MODULES_VIDEO_CODING_GENERIC_DECODER_H_ diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc index 142c885901..c4affcf414 100644 --- a/modules/video_coding/generic_encoder.cc +++ b/modules/video_coding/generic_encoder.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/generic_encoder.h" +#include "modules/video_coding/generic_encoder.h" #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/media_optimization.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/optional.h" +#include "api/video/i420_buffer.h" +#include "modules/pacing/alr_detector.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/media_optimization.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/video_coding/generic_encoder.h b/modules/video_coding/generic_encoder.h index 050d60d0b3..9b003d6dee 100644 --- a/modules/video_coding/generic_encoder.h +++ b/modules/video_coding/generic_encoder.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ +#ifndef MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ +#define MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ #include #include #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/race_checker.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/race_checker.h" namespace webrtc { @@ -127,4 +127,4 @@ class VCMGenericEncoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ +#endif // MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ diff --git a/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc index 2a5aeff85d..90d3c05b88 100644 --- a/modules/video_coding/generic_encoder_unittest.cc +++ b/modules/video_coding/generic_encoder_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/generic_encoder.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/generic_encoder.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc index c5451030b3..3229f0fb58 100644 --- a/modules/video_coding/h264_sprop_parameter_sets.cc +++ b/modules/video_coding/h264_sprop_parameter_sets.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" +#include "modules/video_coding/h264_sprop_parameter_sets.h" #include #include -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/base64.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/logging.h" namespace { diff --git a/modules/video_coding/h264_sprop_parameter_sets.h b/modules/video_coding/h264_sprop_parameter_sets.h index 714a29e2a1..62f5ed10bd 100644 --- a/modules/video_coding/h264_sprop_parameter_sets.h +++ b/modules/video_coding/h264_sprop_parameter_sets.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ +#ifndef MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ +#define MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -33,4 +33,4 @@ class H264SpropParameterSets { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ +#endif // MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ diff --git a/modules/video_coding/h264_sprop_parameter_sets_unittest.cc b/modules/video_coding/h264_sprop_parameter_sets_unittest.cc index 6455670b0c..3c367c6927 100644 --- a/modules/video_coding/h264_sprop_parameter_sets_unittest.cc +++ b/modules/video_coding/h264_sprop_parameter_sets_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" +#include "modules/video_coding/h264_sprop_parameter_sets.h" #include #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/h264_sps_pps_tracker.cc b/modules/video_coding/h264_sps_pps_tracker.cc index 40284c7748..2346120116 100644 --- a/modules/video_coding/h264_sps_pps_tracker.cc +++ b/modules/video_coding/h264_sps_pps_tracker.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h" +#include "modules/video_coding/h264_sps_pps_tracker.h" #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/common_video/h264/pps_parser.h" -#include "webrtc/common_video/h264/sps_parser.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/h264/h264_common.h" +#include "common_video/h264/pps_parser.h" +#include "common_video/h264/sps_parser.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/packet_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/h264_sps_pps_tracker.h b/modules/video_coding/h264_sps_pps_tracker.h index 7f8bc04416..61c548cf49 100644 --- a/modules/video_coding/h264_sps_pps_tracker.h +++ b/modules/video_coding/h264_sps_pps_tracker.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ +#ifndef MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ +#define MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ #include #include #include #include -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { @@ -54,4 +54,4 @@ class H264SpsPpsTracker { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ +#endif // MODULES_VIDEO_CODING_H264_SPS_PPS_TRACKER_H_ diff --git a/modules/video_coding/h264_sps_pps_tracker_unittest.cc b/modules/video_coding/h264_sps_pps_tracker_unittest.cc index 0aa1351440..918686911b 100644 --- a/modules/video_coding/h264_sps_pps_tracker_unittest.cc +++ b/modules/video_coding/h264_sps_pps_tracker_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h" +#include "modules/video_coding/h264_sps_pps_tracker.h" #include -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/test/gtest.h" -#include "webrtc/common_video/h264/h264_common.h" +#include "modules/video_coding/packet.h" +#include "test/gtest.h" +#include "common_video/h264/h264_common.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/histogram.cc b/modules/video_coding/histogram.cc index f862faf0bb..d4c46da623 100644 --- a/modules/video_coding/histogram.cc +++ b/modules/video_coding/histogram.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/histogram.h" +#include "modules/video_coding/histogram.h" #include -#include "webrtc/modules/video_coding/sequence_number_util.h" +#include "modules/video_coding/sequence_number_util.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/histogram.h b/modules/video_coding/histogram.h index 7a99a1c012..aa8d44d80f 100644 --- a/modules/video_coding/histogram.h +++ b/modules/video_coding/histogram.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_HISTOGRAM_H_ -#define WEBRTC_MODULES_VIDEO_CODING_HISTOGRAM_H_ +#ifndef MODULES_VIDEO_CODING_HISTOGRAM_H_ +#define MODULES_VIDEO_CODING_HISTOGRAM_H_ #include #include @@ -43,4 +43,4 @@ class Histogram { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_HISTOGRAM_H_ +#endif // MODULES_VIDEO_CODING_HISTOGRAM_H_ diff --git a/modules/video_coding/histogram_unittest.cc b/modules/video_coding/histogram_unittest.cc index 953f7db947..773bcc1a4b 100644 --- a/modules/video_coding/histogram_unittest.cc +++ b/modules/video_coding/histogram_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/histogram.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/histogram.h" +#include "test/gtest.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/include/mock/mock_vcm_callbacks.h b/modules/video_coding/include/mock/mock_vcm_callbacks.h index 21b154f8d1..8256c5c702 100644 --- a/modules/video_coding/include/mock/mock_vcm_callbacks.h +++ b/modules/video_coding/include/mock/mock_vcm_callbacks.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ +#define MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { @@ -42,4 +42,4 @@ class MockVCMReceiveCallback : public VCMReceiveCallback { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ diff --git a/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h index bbf3098b65..ead90af454 100644 --- a/modules/video_coding/include/mock/mock_video_codec_interface.h +++ b/modules/video_coding/include/mock/mock_video_codec_interface.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#define MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ #include #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { @@ -84,4 +84,4 @@ class MockVideoDecoder : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h index ef3ff9c1f2..078d7ab327 100644 --- a/modules/video_coding/include/video_codec_initializer.h +++ b/modules/video_coding/include/video_codec_initializer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ +#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ #include #include #include -#include "webrtc/call/video_send_stream.h" +#include "call/video_send_stream.h" namespace webrtc { @@ -58,4 +58,4 @@ class VideoCodecInitializer { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INITIALIZER_H_ diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h index 0bef7dacd0..399e3eb19d 100644 --- a/modules/video_coding/include/video_codec_interface.h +++ b/modules/video_coding/include/video_codec_interface.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ +#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "typedefs.h" namespace webrtc { @@ -92,4 +92,4 @@ struct CodecSpecificInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index 93220a27e8..d204f192fe 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ +#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ #if defined(WEBRTC_WIN) // This is a workaround on Windows due to the fact that some Windows @@ -21,11 +21,11 @@ #include #endif -#include "webrtc/api/video/video_frame.h" -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "api/video/video_frame.h" +#include "modules/include/module.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { @@ -418,4 +418,4 @@ class VideoCodingModule : public Module { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h index 499aba7e17..820db6e90e 100644 --- a/modules/video_coding/include/video_coding_defines.h +++ b/modules/video_coding/include/video_coding_defines.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ +#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ #include #include -#include "webrtc/api/video/video_frame.h" +#include "api/video/video_frame.h" // For EncodedImage -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "common_video/include/video_frame.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -173,4 +173,4 @@ class KeyFrameRequestSender { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ diff --git a/modules/video_coding/include/video_error_codes.h b/modules/video_coding/include/video_error_codes.h index 360aa87744..e40c8b2d44 100644 --- a/modules/video_coding/include/video_error_codes.h +++ b/modules/video_coding/include/video_error_codes.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ +#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ +#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ // NOTE: in sync with video_coding_module_defines.h @@ -29,4 +29,4 @@ #define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13 #define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 -#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ +#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ diff --git a/modules/video_coding/inter_frame_delay.cc b/modules/video_coding/inter_frame_delay.cc index fb3b54d204..b34f9f5ae6 100644 --- a/modules/video_coding/inter_frame_delay.cc +++ b/modules/video_coding/inter_frame_delay.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/inter_frame_delay.h" +#include "modules/video_coding/inter_frame_delay.h" namespace webrtc { diff --git a/modules/video_coding/inter_frame_delay.h b/modules/video_coding/inter_frame_delay.h index 94b73908bb..53fc19b68f 100644 --- a/modules/video_coding/inter_frame_delay.h +++ b/modules/video_coding/inter_frame_delay.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ +#ifndef MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ +#define MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -64,4 +64,4 @@ class VCMInterFrameDelay { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ +#endif // MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ diff --git a/modules/video_coding/internal_defines.h b/modules/video_coding/internal_defines.h index e225726dea..77b78dc5a5 100644 --- a/modules/video_coding/internal_defines.h +++ b/modules/video_coding/internal_defines.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ +#ifndef MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ +#define MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -38,4 +38,4 @@ inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ +#endif // MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc index a5560808dd..0b65333558 100644 --- a/modules/video_coding/jitter_buffer.cc +++ b/modules/video_coding/jitter_buffer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/jitter_buffer.h" #include @@ -15,21 +15,21 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/frame_buffer.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/inter_frame_delay.h" -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/jitter_estimator.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/video_coding/frame_buffer.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/inter_frame_delay.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/packet.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { // Interval for updating SS data. diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index 04fc0cd8f4..72c3646644 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ +#ifndef MODULES_VIDEO_CODING_JITTER_BUFFER_H_ +#define MODULES_VIDEO_CODING_JITTER_BUFFER_H_ #include #include @@ -17,19 +17,19 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/decoding_state.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/inter_frame_delay.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/jitter_estimator.h" -#include "webrtc/modules/video_coding/nack_module.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/utility/include/process_thread.h" +#include "modules/video_coding/decoding_state.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/inter_frame_delay.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/nack_module.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -378,4 +378,4 @@ class VCMJitterBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ +#endif // MODULES_VIDEO_CODING_JITTER_BUFFER_H_ diff --git a/modules/video_coding/jitter_buffer_common.h b/modules/video_coding/jitter_buffer_common.h index 65356f1d1b..8eb94017ba 100644 --- a/modules/video_coding/jitter_buffer_common.h +++ b/modules/video_coding/jitter_buffer_common.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ -#define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ +#ifndef MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ +#define MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ enum VCMNaluCompleteness { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ +#endif // MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc index bc5201a3d0..451dcf5203 100644 --- a/modules/video_coding/jitter_buffer_unittest.cc +++ b/modules/video_coding/jitter_buffer_unittest.cc @@ -14,21 +14,21 @@ #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/video_coding/frame_buffer.h" -#include "webrtc/modules/video_coding/jitter_buffer.h" -#include "webrtc/modules/video_coding/media_opt_util.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/test/stream_generator.h" -#include "webrtc/modules/video_coding/test/test_util.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "common_video/h264/h264_common.h" +#include "modules/video_coding/frame_buffer.h" +#include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/media_opt_util.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/test/stream_generator.h" +#include "modules/video_coding/test/test_util.h" +#include "rtc_base/location.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/field_trial.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/jitter_estimator.cc b/modules/video_coding/jitter_estimator.cc index b92ed67e11..41db158cca 100644 --- a/modules/video_coding/jitter_estimator.cc +++ b/modules/video_coding/jitter_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/jitter_estimator.h" #include #include @@ -16,10 +16,10 @@ #include #include -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/modules/video_coding/rtt_filter.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/rtt_filter.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h index c50c34ea50..16ef0d3fdc 100644 --- a/modules/video_coding/jitter_estimator.h +++ b/modules/video_coding/jitter_estimator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ +#ifndef MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ +#define MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ -#include "webrtc/modules/video_coding/rtt_filter.h" -#include "webrtc/rtc_base/rollingaccumulator.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/rtt_filter.h" +#include "rtc_base/rollingaccumulator.h" +#include "typedefs.h" namespace webrtc { @@ -167,4 +167,4 @@ class VCMJitterEstimator { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ +#endif // MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc index 04480a7c2f..f00e1ef6da 100644 --- a/modules/video_coding/jitter_estimator_tests.cc +++ b/modules/video_coding/jitter_estimator_tests.cc @@ -7,10 +7,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/jitter_estimator.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/media_opt_util.cc b/modules/video_coding/media_opt_util.cc index 3edd054108..e3083b0504 100644 --- a/modules/video_coding/media_opt_util.cc +++ b/modules/video_coding/media_opt_util.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/media_opt_util.h" +#include "modules/video_coding/media_opt_util.h" #include #include @@ -17,11 +17,11 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/fec_rate_table.h" -#include "webrtc/modules/video_coding/nack_fec_tables.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/fec_rate_table.h" +#include "modules/video_coding/nack_fec_tables.h" namespace webrtc { // Max value of loss rates in off-line model diff --git a/modules/video_coding/media_opt_util.h b/modules/video_coding/media_opt_util.h index 7b4c4d10bd..b843402552 100644 --- a/modules/video_coding/media_opt_util.h +++ b/modules/video_coding/media_opt_util.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ +#ifndef MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ +#define MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ #include #include #include -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/internal_defines.h" +#include "rtc_base/numerics/exp_filter.h" +#include "typedefs.h" namespace webrtc { namespace media_optimization { @@ -357,4 +357,4 @@ class VCMLossProtectionLogic { } // namespace media_optimization } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ +#endif // MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ diff --git a/modules/video_coding/media_optimization.cc b/modules/video_coding/media_optimization.cc index d73fdfe1f0..4cf2fd3fd5 100644 --- a/modules/video_coding/media_optimization.cc +++ b/modules/video_coding/media_optimization.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/media_optimization.h" +#include "modules/video_coding/media_optimization.h" #include -#include "webrtc/modules/video_coding/utility/frame_dropper.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/video_coding/utility/frame_dropper.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace media_optimization { diff --git a/modules/video_coding/media_optimization.h b/modules/video_coding/media_optimization.h index bbd018ef42..fae4877b00 100644 --- a/modules/video_coding/media_optimization.h +++ b/modules/video_coding/media_optimization.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ +#ifndef MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ +#define MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/media_opt_util.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/media_opt_util.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -108,4 +108,4 @@ class MediaOptimization { } // namespace media_optimization } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ +#endif // MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ diff --git a/modules/video_coding/nack_fec_tables.h b/modules/video_coding/nack_fec_tables.h index f9f5ad97ac..e57656e783 100644 --- a/modules/video_coding/nack_fec_tables.h +++ b/modules/video_coding/nack_fec_tables.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ +#ifndef MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ +#define MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ namespace webrtc { @@ -28,4 +28,4 @@ const uint16_t VCMNackFecTable[100] = { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ +#endif // MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ diff --git a/modules/video_coding/nack_module.cc b/modules/video_coding/nack_module.cc index e3808c29f1..dad4e2250f 100644 --- a/modules/video_coding/nack_module.cc +++ b/modules/video_coding/nack_module.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/modules/video_coding/nack_module.h" +#include "modules/video_coding/nack_module.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h index df04a6b251..8eda719d9d 100644 --- a/modules/video_coding/nack_module.h +++ b/modules/video_coding/nack_module.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_NACK_MODULE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_NACK_MODULE_H_ +#ifndef MODULES_VIDEO_CODING_NACK_MODULE_H_ +#define MODULES_VIDEO_CODING_NACK_MODULE_H_ #include #include #include -#include "webrtc/modules/include/module.h" -#include "webrtc/modules/video_coding/histogram.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/include/module.h" +#include "modules/video_coding/histogram.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -99,4 +99,4 @@ class NackModule : public Module { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_NACK_MODULE_H_ +#endif // MODULES_VIDEO_CODING_NACK_MODULE_H_ diff --git a/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc index bb581fe002..b8b1355756 100644 --- a/modules/video_coding/nack_module_unittest.cc +++ b/modules/video_coding/nack_module_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/nack_module.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/nack_module.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { class TestNackModule : public ::testing::Test, diff --git a/modules/video_coding/packet.cc b/modules/video_coding/packet.cc index 7bc4d94603..f176194be2 100644 --- a/modules/video_coding/packet.cc +++ b/modules/video_coding/packet.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/packet.h" +#include "modules/video_coding/packet.h" #include -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { diff --git a/modules/video_coding/packet.h b/modules/video_coding/packet.h index f31c513f68..38e422b5ae 100644 --- a/modules/video_coding/packet.h +++ b/modules/video_coding/packet.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ -#define WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ +#ifndef MODULES_VIDEO_CODING_PACKET_H_ +#define MODULES_VIDEO_CODING_PACKET_H_ -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ class VCMPacket { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ +#endif // MODULES_VIDEO_CODING_PACKET_H_ diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc index 4859a852fa..7b9b659543 100644 --- a/modules/video_coding/packet_buffer.cc +++ b/modules/video_coding/packet_buffer.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/packet_buffer.h" +#include "modules/video_coding/packet_buffer.h" #include #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_video/h264/h264_common.h" +#include "modules/video_coding/frame_object.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h index 56e2363382..6604c362d0 100644 --- a/modules/video_coding/packet_buffer.h +++ b/modules/video_coding/packet_buffer.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ +#ifndef MODULES_VIDEO_CODING_PACKET_BUFFER_H_ +#define MODULES_VIDEO_CODING_PACKET_BUFFER_H_ #include #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/rtp_frame_reference_finder.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -166,4 +166,4 @@ class PacketBuffer { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ +#endif // MODULES_VIDEO_CODING_PACKET_BUFFER_H_ diff --git a/modules/video_coding/protection_bitrate_calculator.cc b/modules/video_coding/protection_bitrate_calculator.cc index 411ed1a95c..490a36298a 100644 --- a/modules/video_coding/protection_bitrate_calculator.cc +++ b/modules/video_coding/protection_bitrate_calculator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/protection_bitrate_calculator.h" +#include "modules/video_coding/protection_bitrate_calculator.h" namespace webrtc { diff --git a/modules/video_coding/protection_bitrate_calculator.h b/modules/video_coding/protection_bitrate_calculator.h index d6496958c8..be20391891 100644 --- a/modules/video_coding/protection_bitrate_calculator.h +++ b/modules/video_coding/protection_bitrate_calculator.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ +#ifndef MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ +#define MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/media_opt_util.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/media_opt_util.h" +#include "rtc_base/criticalsection.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -76,4 +76,4 @@ class ProtectionBitrateCalculator { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ +#endif // MODULES_VIDEO_CODING_PROTECTION_BITRATE_CALCULATOR_H_ diff --git a/modules/video_coding/protection_bitrate_calculator_unittest.cc b/modules/video_coding/protection_bitrate_calculator_unittest.cc index 718929cafd..66e2fa6f84 100644 --- a/modules/video_coding/protection_bitrate_calculator_unittest.cc +++ b/modules/video_coding/protection_bitrate_calculator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/protection_bitrate_calculator.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/protection_bitrate_calculator.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/qp_parser.cc b/modules/video_coding/qp_parser.cc index 26b46f17fb..bfaa856f59 100644 --- a/modules/video_coding/qp_parser.cc +++ b/modules/video_coding/qp_parser.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/qp_parser.h" +#include "modules/video_coding/qp_parser.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "common_types.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" namespace webrtc { diff --git a/modules/video_coding/qp_parser.h b/modules/video_coding/qp_parser.h index c41bf57ed7..a6dbf5368d 100644 --- a/modules/video_coding/qp_parser.h +++ b/modules/video_coding/qp_parser.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_QP_PARSER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_QP_PARSER_H_ +#ifndef MODULES_VIDEO_CODING_QP_PARSER_H_ +#define MODULES_VIDEO_CODING_QP_PARSER_H_ -#include "webrtc/modules/video_coding/encoded_frame.h" +#include "modules/video_coding/encoded_frame.h" namespace webrtc { @@ -27,4 +27,4 @@ class QpParser { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_QP_PARSER_H_ +#endif // MODULES_VIDEO_CODING_QP_PARSER_H_ diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc index 0c559e0751..1bf90f304c 100644 --- a/modules/video_coding/receiver.cc +++ b/modules/video_coding/receiver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/receiver.h" +#include "modules/video_coding/receiver.h" #include @@ -16,12 +16,12 @@ #include #include -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/modules/video_coding/media_opt_util.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/media_opt_util.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h index 4ef253fb44..91e264533e 100644 --- a/modules/video_coding/receiver.h +++ b/modules/video_coding/receiver.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ +#ifndef MODULES_VIDEO_CODING_RECEIVER_H_ +#define MODULES_VIDEO_CODING_RECEIVER_H_ #include #include -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/jitter_buffer.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -101,4 +101,4 @@ class VCMReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ +#endif // MODULES_VIDEO_CODING_RECEIVER_H_ diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc index 83fdff2896..5920f800a5 100644 --- a/modules/video_coding/receiver_unittest.cc +++ b/modules/video_coding/receiver_unittest.cc @@ -14,15 +14,15 @@ #include #include -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/receiver.h" -#include "webrtc/modules/video_coding/test/stream_generator.h" -#include "webrtc/modules/video_coding/test/test_util.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/receiver.h" +#include "modules/video_coding/test/stream_generator.h" +#include "modules/video_coding/test/test_util.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc index e167e15c52..b62d4971ea 100644 --- a/modules/video_coding/rtp_frame_reference_finder.cc +++ b/modules/video_coding/rtp_frame_reference_finder.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" +#include "modules/video_coding/rtp_frame_reference_finder.h" #include #include -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/packet_buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h index f309a5eea2..2addc59a17 100644 --- a/modules/video_coding/rtp_frame_reference_finder.h +++ b/modules/video_coding/rtp_frame_reference_finder.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ +#ifndef MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ +#define MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ #include #include @@ -18,10 +18,10 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { namespace video_coding { @@ -227,4 +227,4 @@ class RtpFrameReferenceFinder { } // namespace video_coding } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ +#endif // MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_ diff --git a/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc index a40a727647..bd21ff1308 100644 --- a/modules/video_coding/rtp_frame_reference_finder_unittest.cc +++ b/modules/video_coding/rtp_frame_reference_finder_unittest.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/packet_buffer.h" +#include "rtc_base/random.h" +#include "rtc_base/refcount.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/rtt_filter.cc b/modules/video_coding/rtt_filter.cc index 742f70f1c1..9760929a2f 100644 --- a/modules/video_coding/rtt_filter.cc +++ b/modules/video_coding/rtt_filter.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/rtt_filter.h" +#include "modules/video_coding/rtt_filter.h" #include #include #include -#include "webrtc/modules/video_coding/internal_defines.h" +#include "modules/video_coding/internal_defines.h" namespace webrtc { diff --git a/modules/video_coding/rtt_filter.h b/modules/video_coding/rtt_filter.h index f5de532cfc..51d51ef5f8 100644 --- a/modules/video_coding/rtt_filter.h +++ b/modules/video_coding/rtt_filter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ +#ifndef MODULES_VIDEO_CODING_RTT_FILTER_H_ +#define MODULES_VIDEO_CODING_RTT_FILTER_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -63,4 +63,4 @@ class VCMRttFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ +#endif // MODULES_VIDEO_CODING_RTT_FILTER_H_ diff --git a/modules/video_coding/sequence_number_util.h b/modules/video_coding/sequence_number_util.h index 053f9d0e49..b710b8f12d 100644 --- a/modules/video_coding/sequence_number_util.h +++ b/modules/video_coding/sequence_number_util.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ +#ifndef MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ +#define MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/mod_ops.h" -#include "webrtc/rtc_base/safe_compare.h" +#include "api/optional.h" +#include "rtc_base/mod_ops.h" +#include "rtc_base/safe_compare.h" namespace webrtc { @@ -125,4 +125,4 @@ class SeqNumUnwrapper { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ +#endif // MODULES_VIDEO_CODING_SEQUENCE_NUMBER_UTIL_H_ diff --git a/modules/video_coding/sequence_number_util_unittest.cc b/modules/video_coding/sequence_number_util_unittest.cc index 8555fc2da1..ad68820271 100644 --- a/modules/video_coding/sequence_number_util_unittest.cc +++ b/modules/video_coding/sequence_number_util_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/sequence_number_util.h" +#include "test/gtest.h" namespace webrtc { class TestSeqNumUtil : public ::testing::Test { diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc index 08e0f7b599..c0a294d4ed 100644 --- a/modules/video_coding/session_info.cc +++ b/modules/video_coding/session_info.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/session_info.h" +#include "modules/video_coding/session_info.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/video_coding/packet.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/session_info.h b/modules/video_coding/session_info.h index a4eb405d0b..365bf3cc7d 100644 --- a/modules/video_coding/session_info.h +++ b/modules/video_coding/session_info.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ +#ifndef MODULES_VIDEO_CODING_SESSION_INFO_H_ +#define MODULES_VIDEO_CODING_SESSION_INFO_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/typedefs.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/packet.h" +#include "typedefs.h" namespace webrtc { // Used to pass data from jitter buffer to session info. @@ -163,4 +163,4 @@ class VCMSessionInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ +#endif // MODULES_VIDEO_CODING_SESSION_INFO_H_ diff --git a/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc index 6705a78282..1863ad7eef 100644 --- a/modules/video_coding/session_info_unittest.cc +++ b/modules/video_coding/session_info_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/session_info.h" -#include "webrtc/test/gtest.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/session_info.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc index ad95dc0c9e..9933c21e78 100644 --- a/modules/video_coding/test/stream_generator.cc +++ b/modules/video_coding/test/stream_generator.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/test/stream_generator.h" +#include "modules/video_coding/test/stream_generator.h" #include #include -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/packet.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h index eded9f49ff..00bdba97a5 100644 --- a/modules/video_coding/test/stream_generator.h +++ b/modules/video_coding/test/stream_generator.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ +#ifndef MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ +#define MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ #include -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/packet.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ class StreamGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ +#endif // MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ diff --git a/modules/video_coding/test/test_util.h b/modules/video_coding/test/test_util.h index 8424533639..404e49ebcf 100644 --- a/modules/video_coding/test/test_util.h +++ b/modules/video_coding/test/test_util.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ +#ifndef MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ +#define MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/event_wrapper.h" class NullEventFactory : public webrtc::EventFactory { public: @@ -30,4 +30,4 @@ class NullEventFactory : public webrtc::EventFactory { }; }; -#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ +#endif // MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ diff --git a/modules/video_coding/timestamp_map.cc b/modules/video_coding/timestamp_map.cc index 97d2777658..4124d48cab 100644 --- a/modules/video_coding/timestamp_map.cc +++ b/modules/video_coding/timestamp_map.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/timestamp_map.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/timestamp_map.h" namespace webrtc { diff --git a/modules/video_coding/timestamp_map.h b/modules/video_coding/timestamp_map.h index 8ec902938d..eca820cdf7 100644 --- a/modules/video_coding/timestamp_map.h +++ b/modules/video_coding/timestamp_map.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ -#define WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ +#ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ +#define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -45,4 +45,4 @@ class VCMTimestampMap { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ +#endif // MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ diff --git a/modules/video_coding/timing.cc b/modules/video_coding/timing.cc index 340f2c187f..f991a7f496 100644 --- a/modules/video_coding/timing.cc +++ b/modules/video_coding/timing.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/timing.h" +#include "modules/video_coding/timing.h" #include -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/modules/video_coding/jitter_buffer_common.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/jitter_buffer_common.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/timestamp_extrapolator.h" namespace webrtc { diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing.h index bbbb65fbd8..266f2b7071 100644 --- a/modules/video_coding/timing.h +++ b/modules/video_coding/timing.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ -#define WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ +#ifndef MODULES_VIDEO_CODING_TIMING_H_ +#define MODULES_VIDEO_CODING_TIMING_H_ #include -#include "webrtc/modules/video_coding/codec_timer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/codec_timer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -144,4 +144,4 @@ class VCMTiming { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ +#endif // MODULES_VIDEO_CODING_TIMING_H_ diff --git a/modules/video_coding/timing_unittest.cc b/modules/video_coding/timing_unittest.cc index 602bd770a2..40c9f1f38d 100644 --- a/modules/video_coding/timing_unittest.cc +++ b/modules/video_coding/timing_unittest.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/internal_defines.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/timing.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.cc b/modules/video_coding/utility/default_video_bitrate_allocator.cc index a914e8a44a..5e3b3a2c5d 100644 --- a/modules/video_coding/utility/default_video_bitrate_allocator.cc +++ b/modules/video_coding/utility/default_video_bitrate_allocator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.h b/modules/video_coding/utility/default_video_bitrate_allocator.h index f254e8d4b1..0ef709efa7 100644 --- a/modules/video_coding/utility/default_video_bitrate_allocator.h +++ b/modules/video_coding/utility/default_video_bitrate_allocator.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ +#define MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ -#include "webrtc/common_video/include/video_bitrate_allocator.h" +#include "common_video/include/video_bitrate_allocator.h" namespace webrtc { @@ -30,4 +30,4 @@ class DefaultVideoBitrateAllocator : public VideoBitrateAllocator { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ diff --git a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc index df5643353e..695ac689e8 100644 --- a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc +++ b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/test/gtest.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/video_coding/utility/frame_dropper.cc b/modules/video_coding/utility/frame_dropper.cc index 73d641055f..29f2774e20 100644 --- a/modules/video_coding/utility/frame_dropper.cc +++ b/modules/video_coding/utility/frame_dropper.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/frame_dropper.h" +#include "modules/video_coding/utility/frame_dropper.h" #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/utility/frame_dropper.h b/modules/video_coding/utility/frame_dropper.h index bf31f39c56..fe8de38c04 100644 --- a/modules/video_coding/utility/frame_dropper.h +++ b/modules/video_coding/utility/frame_dropper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ +#define MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ #include -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/typedefs.h" +#include "rtc_base/numerics/exp_filter.h" +#include "typedefs.h" namespace webrtc { @@ -96,4 +96,4 @@ class FrameDropper { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ diff --git a/modules/video_coding/utility/frame_dropper_unittest.cc b/modules/video_coding/utility/frame_dropper_unittest.cc index c33ed8504a..7346f21b6d 100644 --- a/modules/video_coding/utility/frame_dropper_unittest.cc +++ b/modules/video_coding/utility/frame_dropper_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/frame_dropper.h" +#include "modules/video_coding/utility/frame_dropper.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/logging.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/utility/ivf_file_writer.cc b/modules/video_coding/utility/ivf_file_writer.cc index 78e956aacd..8e40635126 100644 --- a/modules/video_coding/utility/ivf_file_writer.cc +++ b/modules/video_coding/utility/ivf_file_writer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" +#include "modules/video_coding/utility/ivf_file_writer.h" #include #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" // TODO(palmkvist): make logging more informative in the absence of a file name // (or get one) diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h index 07a8581467..7d917ed35e 100644 --- a/modules/video_coding/utility/ivf_file_writer.h +++ b/modules/video_coding/utility/ivf_file_writer.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ +#define MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ #include #include -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/timeutils.h" +#include "common_video/include/video_frame.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/file.h" +#include "rtc_base/timeutils.h" namespace webrtc { @@ -57,4 +57,4 @@ class IvfFileWriter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc index b7a9b413b4..2172b00bba 100644 --- a/modules/video_coding/utility/ivf_file_writer_unittest.cc +++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" +#include "modules/video_coding/utility/ivf_file_writer.h" #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/video_coding/utility/mock/mock_frame_dropper.h b/modules/video_coding/utility/mock/mock_frame_dropper.h index c5521b88d1..8b632dfaf9 100644 --- a/modules/video_coding/utility/mock/mock_frame_dropper.h +++ b/modules/video_coding/utility/mock/mock_frame_dropper.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ +#define MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ #include -#include "webrtc/modules/video_coding/utility/frame_dropper.h" -#include "webrtc/test/gmock.h" -#include "webrtc/typedefs.h" +#include "modules/video_coding/utility/frame_dropper.h" +#include "test/gmock.h" +#include "typedefs.h" namespace webrtc { @@ -31,4 +31,4 @@ class MockFrameDropper : public FrameDropper { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_ diff --git a/modules/video_coding/utility/moving_average.cc b/modules/video_coding/utility/moving_average.cc index 34e7bb60e8..d72c465a0d 100644 --- a/modules/video_coding/utility/moving_average.cc +++ b/modules/video_coding/utility/moving_average.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/moving_average.h" +#include "modules/video_coding/utility/moving_average.h" #include diff --git a/modules/video_coding/utility/moving_average.h b/modules/video_coding/utility/moving_average.h index 0f2c4cc3c8..7df3d3dad6 100644 --- a/modules/video_coding/utility/moving_average.h +++ b/modules/video_coding/utility/moving_average.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ +#define MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { class MovingAverage { @@ -32,4 +32,4 @@ class MovingAverage { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_ diff --git a/modules/video_coding/utility/moving_average_unittest.cc b/modules/video_coding/utility/moving_average_unittest.cc index 77c3adf1c5..72fc775a82 100644 --- a/modules/video_coding/utility/moving_average_unittest.cc +++ b/modules/video_coding/utility/moving_average_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/moving_average.h" +#include "modules/video_coding/utility/moving_average.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" TEST(MovingAverageTest, EmptyAverage) { webrtc::MovingAverage moving_average(1); diff --git a/modules/video_coding/utility/quality_scaler.cc b/modules/video_coding/utility/quality_scaler.cc index 760ebd7b51..aed2b0c9ad 100644 --- a/modules/video_coding/utility/quality_scaler.cc +++ b/modules/video_coding/utility/quality_scaler.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "modules/video_coding/utility/quality_scaler.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/task_queue.h" // TODO(kthelgason): Some versions of Android have issues with log2. // See https://code.google.com/p/android/issues/detail?id=212634 for details diff --git a/modules/video_coding/utility/quality_scaler.h b/modules/video_coding/utility/quality_scaler.h index abe6d72bd4..09abe3e1c2 100644 --- a/modules/video_coding/utility/quality_scaler.h +++ b/modules/video_coding/utility/quality_scaler.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ +#define MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/utility/moving_average.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "api/optional.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "modules/video_coding/utility/moving_average.h" +#include "rtc_base/sequenced_task_checker.h" namespace webrtc { @@ -84,4 +84,4 @@ class QualityScaler { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ diff --git a/modules/video_coding/utility/quality_scaler_unittest.cc b/modules/video_coding/utility/quality_scaler_unittest.cc index 37a986c694..d9da1b4b33 100644 --- a/modules/video_coding/utility/quality_scaler_unittest.cc +++ b/modules/video_coding/utility/quality_scaler_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "modules/video_coding/utility/quality_scaler.h" #include -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/event.h" +#include "rtc_base/task_queue.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc index e0aac1056b..15ac938ae5 100644 --- a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc +++ b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" #include #include #include #include -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/modules/video_coding/utility/vp8_header_parser.cc b/modules/video_coding/utility/vp8_header_parser.cc index 78ae69c022..a8bfc5575f 100644 --- a/modules/video_coding/utility/vp8_header_parser.cc +++ b/modules/video_coding/utility/vp8_header_parser.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/utility/vp8_header_parser.h b/modules/video_coding/utility/vp8_header_parser.h index b0c684c578..637bc5c87b 100644 --- a/modules/video_coding/utility/vp8_header_parser.h +++ b/modules/video_coding/utility/vp8_header_parser.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ +#define MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ #include #include @@ -65,4 +65,4 @@ bool GetQp(const uint8_t* buf, size_t length, int* qp); } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_ diff --git a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc index 301ed34d55..c35c0afae9 100644 --- a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc +++ b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/utility/vp9_uncompressed_header_parser.h b/modules/video_coding/utility/vp9_uncompressed_header_parser.h index f529a66ec2..69e8de87df 100644 --- a/modules/video_coding/utility/vp9_uncompressed_header_parser.h +++ b/modules/video_coding/utility/vp9_uncompressed_header_parser.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ +#ifndef MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ +#define MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ #include #include @@ -26,4 +26,4 @@ bool GetQp(const uint8_t* buf, size_t length, int* qp); } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ +#endif // MODULES_VIDEO_CODING_UTILITY_VP9_UNCOMPRESSED_HEADER_PARSER_H_ diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc index d274bf16a7..a96933e82b 100644 --- a/modules/video_coding/video_codec_initializer.cc +++ b/modules/video_coding/video_codec_initializer.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "modules/video_coding/codecs/vp8/screenshare_layers.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace { diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc index cd269f46e0..72982ee35f 100644 --- a/modules/video_coding/video_codec_initializer_unittest.cc +++ b/modules/video_coding/video_codec_initializer_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/test/gtest.h" +#include "api/video_codecs/video_encoder.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "common_types.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_codec_initializer.h" +#include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index 7551214f1b..509707f155 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/video_coding_impl.h" +#include "modules/video_coding/video_coding_impl.h" #include #include -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/jitter_buffer.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace vcm { diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h index 3f4d6abeed..d46f9cd558 100644 --- a/modules/video_coding/video_coding_impl.h +++ b/modules/video_coding/video_coding_impl.h @@ -8,30 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ -#define WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ +#ifndef MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ +#define MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ -#include "webrtc/modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_coding.h" #include #include #include -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/modules/video_coding/codec_database.h" -#include "webrtc/modules/video_coding/frame_buffer.h" -#include "webrtc/modules/video_coding/generic_decoder.h" -#include "webrtc/modules/video_coding/generic_encoder.h" -#include "webrtc/modules/video_coding/jitter_buffer.h" -#include "webrtc/modules/video_coding/media_optimization.h" -#include "webrtc/modules/video_coding/qp_parser.h" -#include "webrtc/modules/video_coding/receiver.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_video/include/frame_callback.h" +#include "modules/video_coding/codec_database.h" +#include "modules/video_coding/frame_buffer.h" +#include "modules/video_coding/generic_decoder.h" +#include "modules/video_coding/generic_encoder.h" +#include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/media_optimization.h" +#include "modules/video_coding/qp_parser.h" +#include "modules/video_coding/receiver.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/onetimeevent.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -234,4 +234,4 @@ class VideoReceiver : public Module { } // namespace vcm } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ +#endif // MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ diff --git a/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc index ec377e9132..4d6a52e9c2 100644 --- a/modules/video_coding/video_packet_buffer_unittest.cc +++ b/modules/video_coding/video_packet_buffer_unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "common_video/h264/h264_common.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/packet_buffer.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index de6764f9b5..3df0e093bd 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_types.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/jitter_buffer.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_types.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace vcm { diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc index 48ecdc20a7..917cdc1113 100644 --- a/modules/video_coding/video_receiver_unittest.cc +++ b/modules/video_coding/video_receiver_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" -#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/test/test_util.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/video_codec_settings.h" +#include "modules/video_coding/include/mock/mock_vcm_callbacks.h" +#include "modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/test/test_util.h" +#include "modules/video_coding/timing.h" +#include "modules/video_coding/video_coding_impl.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" +#include "test/video_codec_settings.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc index f60b6873fb..f67210c4ba 100644 --- a/modules/video_coding/video_sender.cc +++ b/modules/video_coding/video_sender.cc @@ -11,18 +11,18 @@ #include // std::max -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/encoded_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "modules/video_coding/utility/quality_scaler.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace vcm { diff --git a/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc index 7faaf15a35..1a51a4063a 100644 --- a/modules/video_coding/video_sender_unittest.cc +++ b/modules/video_coding/video_sender_unittest.cc @@ -11,21 +11,21 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" -#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/video_codec_settings.h" +#include "api/video/i420_buffer.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/mock/mock_vcm_callbacks.h" +#include "modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/video_coding_impl.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "system_wrappers/include/clock.h" +#include "test/frame_generator.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/video_codec_settings.h" using ::testing::_; using ::testing::AllOf; diff --git a/modules/video_processing/DEPS b/modules/video_processing/DEPS index a0dd9c33be..e9017d6b27 100644 --- a/modules/video_processing/DEPS +++ b/modules/video_processing/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+webrtc/common_audio", - "+webrtc/common_video", - "+webrtc/system_wrappers", + "+common_audio", + "+common_video", + "+system_wrappers", ] diff --git a/modules/video_processing/test/denoiser_test.cc b/modules/video_processing/test/denoiser_test.cc index b27e5fc566..601ae0ed4a 100644 --- a/modules/video_processing/test/denoiser_test.cc +++ b/modules/video_processing/test/denoiser_test.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/modules/video_processing/video_denoiser.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_video/include/i420_buffer_pool.h" +#include "modules/video_processing/video_denoiser.h" +#include "test/gtest.h" +#include "test/frame_utils.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/modules/video_processing/util/denoiser_filter.cc b/modules/video_processing/util/denoiser_filter.cc index d088ddab1c..cf666332a4 100644 --- a/modules/video_processing/util/denoiser_filter.cc +++ b/modules/video_processing/util/denoiser_filter.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_processing/util/denoiser_filter.h" -#include "webrtc/modules/video_processing/util/denoiser_filter_c.h" -#include "webrtc/modules/video_processing/util/denoiser_filter_neon.h" -#include "webrtc/modules/video_processing/util/denoiser_filter_sse2.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/denoiser_filter_c.h" +#include "modules/video_processing/util/denoiser_filter_neon.h" +#include "modules/video_processing/util/denoiser_filter_sse2.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/modules/video_processing/util/denoiser_filter.h b/modules/video_processing/util/denoiser_filter.h index 2fdcca03dd..7be201d5ed 100644 --- a/modules/video_processing/util/denoiser_filter.h +++ b/modules/video_processing/util/denoiser_filter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ #include #include -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" namespace webrtc { @@ -53,4 +53,4 @@ class DenoiserFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ diff --git a/modules/video_processing/util/denoiser_filter_c.cc b/modules/video_processing/util/denoiser_filter_c.cc index 8f4212193f..435f4f09d2 100644 --- a/modules/video_processing/util/denoiser_filter_c.cc +++ b/modules/video_processing/util/denoiser_filter_c.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/modules/video_processing/util/denoiser_filter_c.h" +#include "modules/video_processing/util/denoiser_filter_c.h" namespace webrtc { diff --git a/modules/video_processing/util/denoiser_filter_c.h b/modules/video_processing/util/denoiser_filter_c.h index 859c6f43e6..e8bd2b0d1a 100644 --- a/modules/video_processing/util/denoiser_filter_c.h +++ b/modules/video_processing/util/denoiser_filter_c.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ -#include "webrtc/modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { @@ -39,4 +39,4 @@ class DenoiserFilterC : public DenoiserFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ diff --git a/modules/video_processing/util/denoiser_filter_neon.cc b/modules/video_processing/util/denoiser_filter_neon.cc index b9e6b8c859..de41fb6708 100644 --- a/modules/video_processing/util/denoiser_filter_neon.cc +++ b/modules/video_processing/util/denoiser_filter_neon.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/modules/video_processing/util/denoiser_filter_neon.h" +#include "modules/video_processing/util/denoiser_filter_neon.h" namespace webrtc { diff --git a/modules/video_processing/util/denoiser_filter_neon.h b/modules/video_processing/util/denoiser_filter_neon.h index 076cb7902e..decbd41c0d 100644 --- a/modules/video_processing/util/denoiser_filter_neon.h +++ b/modules/video_processing/util/denoiser_filter_neon.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ -#include "webrtc/modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { @@ -39,4 +39,4 @@ class DenoiserFilterNEON : public DenoiserFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_NEON_H_ diff --git a/modules/video_processing/util/denoiser_filter_sse2.cc b/modules/video_processing/util/denoiser_filter_sse2.cc index 2e59e36d28..83b7e54feb 100644 --- a/modules/video_processing/util/denoiser_filter_sse2.cc +++ b/modules/video_processing/util/denoiser_filter_sse2.cc @@ -9,7 +9,7 @@ */ #include -#include "webrtc/modules/video_processing/util/denoiser_filter_sse2.h" +#include "modules/video_processing/util/denoiser_filter_sse2.h" namespace webrtc { diff --git a/modules/video_processing/util/denoiser_filter_sse2.h b/modules/video_processing/util/denoiser_filter_sse2.h index 5b2d957ad0..5add52ce40 100644 --- a/modules/video_processing/util/denoiser_filter_sse2.h +++ b/modules/video_processing/util/denoiser_filter_sse2.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ -#include "webrtc/modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { @@ -39,4 +39,4 @@ class DenoiserFilterSSE2 : public DenoiserFilter { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ diff --git a/modules/video_processing/util/noise_estimation.cc b/modules/video_processing/util/noise_estimation.cc index 3b0d59ef71..c72f764901 100644 --- a/modules/video_processing/util/noise_estimation.cc +++ b/modules/video_processing/util/noise_estimation.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_processing/util/noise_estimation.h" +#include "modules/video_processing/util/noise_estimation.h" #if DISPLAYNEON #include #endif diff --git a/modules/video_processing/util/noise_estimation.h b/modules/video_processing/util/noise_estimation.h index f414a47872..81e2a1b466 100644 --- a/modules/video_processing/util/noise_estimation.h +++ b/modules/video_processing/util/noise_estimation.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_processing/util/denoiser_filter.h" +#include "modules/include/module_common_types.h" +#include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { @@ -60,4 +60,4 @@ class NoiseEstimation { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ diff --git a/modules/video_processing/util/skin_detection.cc b/modules/video_processing/util/skin_detection.cc index ac9a81fa7b..8eaa2c5a9c 100644 --- a/modules/video_processing/util/skin_detection.cc +++ b/modules/video_processing/util/skin_detection.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/modules/video_processing/util/skin_detection.h" +#include "modules/video_processing/util/skin_detection.h" namespace webrtc { diff --git a/modules/video_processing/util/skin_detection.h b/modules/video_processing/util/skin_detection.h index f925d33d76..7be791f2d8 100755 --- a/modules/video_processing/util/skin_detection.h +++ b/modules/video_processing/util/skin_detection.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ +#ifndef MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ +#define MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ namespace webrtc { @@ -27,4 +27,4 @@ bool MbHasSkinColor(const uint8_t* y_src, } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ +#endif // MODULES_VIDEO_PROCESSING_UTIL_SKIN_DETECTION_H_ diff --git a/modules/video_processing/video_denoiser.cc b/modules/video_processing/video_denoiser.cc index a926bf47f3..185a1fe11b 100644 --- a/modules/video_processing/video_denoiser.cc +++ b/modules/video_processing/video_denoiser.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_processing/video_denoiser.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_processing/video_denoiser.h" #include "libyuv/planar_functions.h" namespace webrtc { diff --git a/modules/video_processing/video_denoiser.h b/modules/video_processing/video_denoiser.h index e8cd22dcf9..dc89ead05f 100644 --- a/modules/video_processing/video_denoiser.h +++ b/modules/video_processing/video_denoiser.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ -#define WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ +#ifndef MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ +#define MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ #include -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/modules/video_processing/util/denoiser_filter.h" -#include "webrtc/modules/video_processing/util/noise_estimation.h" -#include "webrtc/modules/video_processing/util/skin_detection.h" +#include "common_video/include/i420_buffer_pool.h" +#include "modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/noise_estimation.h" +#include "modules/video_processing/util/skin_detection.h" namespace webrtc { @@ -81,4 +81,4 @@ class VideoDenoiser { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ +#endif // MODULES_VIDEO_PROCESSING_VIDEO_DENOISER_H_ diff --git a/ortc/DEPS b/ortc/DEPS index b72aa6b9e0..bebf030b82 100644 --- a/ortc/DEPS +++ b/ortc/DEPS @@ -1,17 +1,17 @@ include_rules = [ - "+webrtc/api", - "+webrtc/call", - "+webrtc/logging/rtc_event_log", - "+webrtc/media", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_processing", - "+webrtc/p2p", - "+webrtc/pc", + "+api", + "+call", + "+logging/rtc_event_log", + "+media", + "+modules/audio_coding", + "+modules/audio_processing", + "+p2p", + "+pc", - "+webrtc/modules/rtp_rtcp", - "+webrtc/system_wrappers", + "+modules/rtp_rtcp", + "+system_wrappers", - "+webrtc/modules/audio_device", - "+webrtc/modules/video_coding", - "+webrtc/modules/video_render", + "+modules/audio_device", + "+modules/video_coding", + "+modules/video_render", ] diff --git a/ortc/ortcfactory.cc b/ortc/ortcfactory.cc index d8b117bd2e..2fbf8ec2e3 100644 --- a/ortc/ortcfactory.cc +++ b/ortc/ortcfactory.cc @@ -8,38 +8,38 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/ortcfactory.h" +#include "ortc/ortcfactory.h" #include #include // For std::move. #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/api/mediastreamtrackproxy.h" -#include "webrtc/api/proxy.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/ortc/ortcrtpreceiveradapter.h" -#include "webrtc/ortc/ortcrtpsenderadapter.h" -#include "webrtc/ortc/rtpparametersconversion.h" -#include "webrtc/ortc/rtptransportadapter.h" -#include "webrtc/ortc/rtptransportcontrolleradapter.h" -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/udptransport.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/localaudiosource.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/mediastreamtrackproxy.h" +#include "api/proxy.h" +#include "api/rtcerror.h" +#include "api/videosourceproxy.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/mediaconstants.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "ortc/ortcrtpreceiveradapter.h" +#include "ortc/ortcrtpsenderadapter.h" +#include "ortc/rtpparametersconversion.h" +#include "ortc/rtptransportadapter.h" +#include "ortc/rtptransportcontrolleradapter.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/udptransport.h" +#include "pc/audiotrack.h" +#include "pc/channelmanager.h" +#include "pc/localaudiosource.h" +#include "pc/videocapturertracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" namespace { diff --git a/ortc/ortcfactory.h b/ortc/ortcfactory.h index f93cb637dc..89f1ee009b 100644 --- a/ortc/ortcfactory.h +++ b/ortc/ortcfactory.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_ORTCFACTORY_H_ -#define WEBRTC_ORTC_ORTCFACTORY_H_ +#ifndef ORTC_ORTCFACTORY_H_ +#define ORTC_ORTCFACTORY_H_ #include #include -#include "webrtc/api/ortc/ortcfactoryinterface.h" -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/ortc/ortcfactoryinterface.h" +#include "media/base/mediaengine.h" +#include "media/engine/webrtcmediaengine.h" +#include "pc/channelmanager.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -151,4 +151,4 @@ class OrtcFactory : public OrtcFactoryInterface { } // namespace webrtc -#endif // WEBRTC_ORTC_ORTCFACTORY_H_ +#endif // ORTC_ORTCFACTORY_H_ diff --git a/ortc/ortcfactory_integrationtest.cc b/ortc/ortcfactory_integrationtest.cc index 513e972bdb..d2d5eacafc 100644 --- a/ortc/ortcfactory_integrationtest.cc +++ b/ortc/ortcfactory_integrationtest.cc @@ -11,16 +11,16 @@ #include #include // For std::pair, std::move. -#include "webrtc/api/ortc/ortcfactoryinterface.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/udptransport.h" -#include "webrtc/pc/test/fakeaudiocapturemodule.h" -#include "webrtc/pc/test/fakeperiodicvideocapturer.h" -#include "webrtc/pc/test/fakevideotrackrenderer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "api/ortc/ortcfactoryinterface.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/udptransport.h" +#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakeperiodicvideocapturer.h" +#include "pc/test/fakevideotrackrenderer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/gunit.h" +#include "rtc_base/virtualsocketserver.h" namespace { diff --git a/ortc/ortcfactory_unittest.cc b/ortc/ortcfactory_unittest.cc index ba8dfe9465..649dafbdf1 100644 --- a/ortc/ortcfactory_unittest.cc +++ b/ortc/ortcfactory_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/gunit.h" +#include "rtc_base/virtualsocketserver.h" namespace webrtc { diff --git a/ortc/ortcrtpreceiver_unittest.cc b/ortc/ortcrtpreceiver_unittest.cc index 0e2b722b79..47a3d76edb 100644 --- a/ortc/ortcrtpreceiver_unittest.cc +++ b/ortc/ortcrtpreceiver_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "pc/test/fakevideotracksource.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/ortcrtpreceiveradapter.cc b/ortc/ortcrtpreceiveradapter.cc index 4e8c89b3bf..b30f63c515 100644 --- a/ortc/ortcrtpreceiveradapter.cc +++ b/ortc/ortcrtpreceiveradapter.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/ortcrtpreceiveradapter.h" +#include "ortc/ortcrtpreceiveradapter.h" #include -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/ortc/rtptransportadapter.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" // For "CreateRandomX". +#include "media/base/mediaconstants.h" +#include "ortc/rtptransportadapter.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" // For "CreateRandomX". namespace { diff --git a/ortc/ortcrtpreceiveradapter.h b/ortc/ortcrtpreceiveradapter.h index 2fb793fb16..4e0a40672c 100644 --- a/ortc/ortcrtpreceiveradapter.h +++ b/ortc/ortcrtpreceiveradapter.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_ORTCRTPRECEIVERADAPTER_H_ -#define WEBRTC_ORTC_ORTCRTPRECEIVERADAPTER_H_ +#ifndef ORTC_ORTCRTPRECEIVERADAPTER_H_ +#define ORTC_ORTCRTPRECEIVERADAPTER_H_ #include -#include "webrtc/api/ortc/ortcrtpreceiverinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/ortc/rtptransportcontrolleradapter.h" -#include "webrtc/pc/rtpreceiver.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "api/ortc/ortcrtpreceiverinterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" +#include "ortc/rtptransportcontrolleradapter.h" +#include "pc/rtpreceiver.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -76,4 +76,4 @@ class OrtcRtpReceiverAdapter : public OrtcRtpReceiverInterface { } // namespace webrtc -#endif // WEBRTC_ORTC_ORTCRTPRECEIVERADAPTER_H_ +#endif // ORTC_ORTCRTPRECEIVERADAPTER_H_ diff --git a/ortc/ortcrtpsender_unittest.cc b/ortc/ortcrtpsender_unittest.cc index a94ed76ecb..233c8fadc7 100644 --- a/ortc/ortcrtpsender_unittest.cc +++ b/ortc/ortcrtpsender_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "pc/test/fakevideotracksource.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/ortcrtpsenderadapter.cc b/ortc/ortcrtpsenderadapter.cc index 0bce591942..2f1a42eba9 100644 --- a/ortc/ortcrtpsenderadapter.cc +++ b/ortc/ortcrtpsenderadapter.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/ortcrtpsenderadapter.h" +#include "ortc/ortcrtpsenderadapter.h" #include -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/ortc/rtptransportadapter.h" -#include "webrtc/rtc_base/checks.h" +#include "media/base/mediaconstants.h" +#include "ortc/rtptransportadapter.h" +#include "rtc_base/checks.h" namespace { diff --git a/ortc/ortcrtpsenderadapter.h b/ortc/ortcrtpsenderadapter.h index 92051e7307..e1f096f6d3 100644 --- a/ortc/ortcrtpsenderadapter.h +++ b/ortc/ortcrtpsenderadapter.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_ORTCRTPSENDERADAPTER_H_ -#define WEBRTC_ORTC_ORTCRTPSENDERADAPTER_H_ +#ifndef ORTC_ORTCRTPSENDERADAPTER_H_ +#define ORTC_ORTCRTPSENDERADAPTER_H_ #include -#include "webrtc/api/ortc/ortcrtpsenderinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/ortc/rtptransportcontrolleradapter.h" -#include "webrtc/pc/rtpsender.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/ortc/ortcrtpsenderinterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" +#include "ortc/rtptransportcontrolleradapter.h" +#include "pc/rtpsender.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -76,4 +76,4 @@ class OrtcRtpSenderAdapter : public OrtcRtpSenderInterface { } // namespace webrtc -#endif // WEBRTC_ORTC_ORTCRTPSENDERADAPTER_H_ +#endif // ORTC_ORTCRTPSENDERADAPTER_H_ diff --git a/ortc/rtpparametersconversion.cc b/ortc/rtpparametersconversion.cc index 083c3b09c4..0376abda18 100644 --- a/ortc/rtpparametersconversion.cc +++ b/ortc/rtpparametersconversion.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/rtpparametersconversion.h" +#include "ortc/rtpparametersconversion.h" #include #include #include -#include "webrtc/media/base/rtputils.h" +#include "media/base/rtputils.h" namespace webrtc { diff --git a/ortc/rtpparametersconversion.h b/ortc/rtpparametersconversion.h index 072aaf2264..c75e35440f 100644 --- a/ortc/rtpparametersconversion.h +++ b/ortc/rtpparametersconversion.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ -#define WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ +#ifndef ORTC_RTPPARAMETERSCONVERSION_H_ +#define ORTC_RTPPARAMETERSCONVERSION_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/pc/mediasession.h" +#include "api/optional.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" +#include "media/base/codec.h" +#include "pc/mediasession.h" namespace webrtc { @@ -105,4 +105,4 @@ RtpParameters ToRtpParameters( } // namespace webrtc -#endif // WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ +#endif // ORTC_RTPPARAMETERSCONVERSION_H_ diff --git a/ortc/rtpparametersconversion_unittest.cc b/ortc/rtpparametersconversion_unittest.cc index f6e48a9cbe..2dbd6da83f 100644 --- a/ortc/rtpparametersconversion_unittest.cc +++ b/ortc/rtpparametersconversion_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/ortc/rtpparametersconversion.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/rtc_base/gunit.h" +#include "ortc/rtpparametersconversion.h" +#include "ortc/testrtpparameters.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/rtptransport_unittest.cc b/ortc/rtptransport_unittest.cc index 95ee1c79ac..46c3965d92 100644 --- a/ortc/rtptransport_unittest.cc +++ b/ortc/rtptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/rtptransportadapter.cc b/ortc/rtptransportadapter.cc index 10e5e8fefc..0509cad2c8 100644 --- a/ortc/rtptransportadapter.cc +++ b/ortc/rtptransportadapter.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/rtptransportadapter.h" +#include "ortc/rtptransportadapter.h" #include // For std::find. #include #include #include // For std::move. -#include "webrtc/api/proxy.h" -#include "webrtc/rtc_base/logging.h" +#include "api/proxy.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/ortc/rtptransportadapter.h b/ortc/rtptransportadapter.h index c71a4f41cf..2c98f5df87 100644 --- a/ortc/rtptransportadapter.h +++ b/ortc/rtptransportadapter.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_RTPTRANSPORTADAPTER_H_ -#define WEBRTC_ORTC_RTPTRANSPORTADAPTER_H_ +#ifndef ORTC_RTPTRANSPORTADAPTER_H_ +#define ORTC_RTPTRANSPORTADAPTER_H_ #include #include -#include "webrtc/api/ortc/srtptransportinterface.h" -#include "webrtc/api/rtcerror.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/ortc/rtptransportcontrolleradapter.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/ortc/srtptransportinterface.h" +#include "api/rtcerror.h" +#include "media/base/streamparams.h" +#include "ortc/rtptransportcontrolleradapter.h" +#include "pc/channel.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -106,4 +106,4 @@ class RtpTransportAdapter : public SrtpTransportInterface { } // namespace webrtc -#endif // WEBRTC_ORTC_RTPTRANSPORTADAPTER_H_ +#endif // ORTC_RTPTRANSPORTADAPTER_H_ diff --git a/ortc/rtptransportcontroller_unittest.cc b/ortc/rtptransportcontroller_unittest.cc index 56bf8a6adc..ff07627fdf 100644 --- a/ortc/rtptransportcontroller_unittest.cc +++ b/ortc/rtptransportcontroller_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/rtptransportcontrolleradapter.cc b/ortc/rtptransportcontrolleradapter.cc index f2ad995ab3..eaf5232369 100644 --- a/ortc/rtptransportcontrolleradapter.cc +++ b/ortc/rtptransportcontrolleradapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/rtptransportcontrolleradapter.h" +#include "ortc/rtptransportcontrolleradapter.h" #include // For "remove", "find". #include @@ -16,13 +16,13 @@ #include #include // For std::move. -#include "webrtc/api/proxy.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/ortc/ortcrtpreceiveradapter.h" -#include "webrtc/ortc/ortcrtpsenderadapter.h" -#include "webrtc/ortc/rtpparametersconversion.h" -#include "webrtc/ortc/rtptransportadapter.h" -#include "webrtc/rtc_base/checks.h" +#include "api/proxy.h" +#include "media/base/mediaconstants.h" +#include "ortc/ortcrtpreceiveradapter.h" +#include "ortc/ortcrtpsenderadapter.h" +#include "ortc/rtpparametersconversion.h" +#include "ortc/rtptransportadapter.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/ortc/rtptransportcontrolleradapter.h b/ortc/rtptransportcontrolleradapter.h index d4494d0d6c..ec30687979 100644 --- a/ortc/rtptransportcontrolleradapter.h +++ b/ortc/rtptransportcontrolleradapter.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ -#define WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ +#ifndef ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ +#define ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ #include #include #include #include -#include "webrtc/api/ortc/ortcrtpreceiverinterface.h" -#include "webrtc/api/ortc/ortcrtpsenderinterface.h" -#include "webrtc/api/ortc/rtptransportcontrollerinterface.h" -#include "webrtc/api/ortc/srtptransportinterface.h" -#include "webrtc/call/call.h" -#include "webrtc/call/rtp_transport_controller_send.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/mediachannel.h" // For MediaConfig. -#include "webrtc/pc/channelmanager.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "api/ortc/ortcrtpreceiverinterface.h" +#include "api/ortc/ortcrtpsenderinterface.h" +#include "api/ortc/rtptransportcontrollerinterface.h" +#include "api/ortc/srtptransportinterface.h" +#include "call/call.h" +#include "call/rtp_transport_controller_send.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/mediachannel.h" // For MediaConfig. +#include "pc/channelmanager.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -221,4 +221,4 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface, } // namespace webrtc -#endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ +#endif // ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ diff --git a/ortc/srtptransport_unittest.cc b/ortc/srtptransport_unittest.cc index ea9b28a0c5..0a2532c94a 100644 --- a/ortc/srtptransport_unittest.cc +++ b/ortc/srtptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/ortc/ortcfactory.h" -#include "webrtc/ortc/testrtpparameters.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "ortc/ortcfactory.h" +#include "ortc/testrtpparameters.h" +#include "p2p/base/fakepackettransport.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/ortc/testrtpparameters.cc b/ortc/testrtpparameters.cc index 5d1cdf9635..82d96590fb 100644 --- a/ortc/testrtpparameters.cc +++ b/ortc/testrtpparameters.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/ortc/testrtpparameters.h" +#include "ortc/testrtpparameters.h" #include #include diff --git a/ortc/testrtpparameters.h b/ortc/testrtpparameters.h index 042dab2738..47e51e1408 100644 --- a/ortc/testrtpparameters.h +++ b/ortc/testrtpparameters.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_ORTC_TESTRTPPARAMETERS_H_ -#define WEBRTC_ORTC_TESTRTPPARAMETERS_H_ +#ifndef ORTC_TESTRTPPARAMETERS_H_ +#define ORTC_TESTRTPPARAMETERS_H_ -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/api/rtpparameters.h" +#include "api/ortc/rtptransportinterface.h" +#include "api/rtpparameters.h" namespace webrtc { @@ -69,4 +69,4 @@ RtpParameters MakeFullVp9Parameters(); } // namespace webrtc -#endif // WEBRTC_ORTC_TESTRTPPARAMETERS_H_ +#endif // ORTC_TESTRTPPARAMETERS_H_ diff --git a/p2p/DEPS b/p2p/DEPS index 083e8d49d1..94f4bcb2ad 100644 --- a/p2p/DEPS +++ b/p2p/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+net", - "+webrtc/system_wrappers", + "+system_wrappers", ] diff --git a/p2p/base/asyncstuntcpsocket.cc b/p2p/base/asyncstuntcpsocket.cc index 38dd65bb4c..ef9d3c5f13 100644 --- a/p2p/base/asyncstuntcpsocket.cc +++ b/p2p/base/asyncstuntcpsocket.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/asyncstuntcpsocket.h" +#include "p2p/base/asyncstuntcpsocket.h" #include -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/base/stun.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/asyncstuntcpsocket.h b/p2p/base/asyncstuntcpsocket.h index b578f3109b..0ff179dcd2 100644 --- a/p2p/base/asyncstuntcpsocket.h +++ b/p2p/base/asyncstuntcpsocket.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ -#define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_ -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/socketfactory.h" namespace cricket { @@ -47,4 +47,4 @@ class AsyncStunTCPSocket : public rtc::AsyncTCPSocketBase { } // namespace cricket -#endif // WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#endif // P2P_BASE_ASYNCSTUNTCPSOCKET_H_ diff --git a/p2p/base/asyncstuntcpsocket_unittest.cc b/p2p/base/asyncstuntcpsocket_unittest.cc index 5dd9661056..806b43b2db 100644 --- a/p2p/base/asyncstuntcpsocket_unittest.cc +++ b/p2p/base/asyncstuntcpsocket_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/p2p/base/asyncstuntcpsocket.h" -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/asyncstuntcpsocket.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/virtualsocketserver.h" namespace cricket { diff --git a/p2p/base/basicpacketsocketfactory.cc b/p2p/base/basicpacketsocketfactory.cc index b0f464b494..eb36bc2dd7 100644 --- a/p2p/base/basicpacketsocketfactory.cc +++ b/p2p/base/basicpacketsocketfactory.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/basicpacketsocketfactory.h" #include -#include "webrtc/p2p/base/asyncstuntcpsocket.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/asyncstuntcpsocket.h" +#include "p2p/base/stun.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/p2p/base/basicpacketsocketfactory.h b/p2p/base/basicpacketsocketfactory.h index 3cb3304adf..b3ae2f05ed 100644 --- a/p2p/base/basicpacketsocketfactory.h +++ b/p2p/base/basicpacketsocketfactory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ -#define WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#ifndef P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_ -#include "webrtc/p2p/base/packetsocketfactory.h" +#include "p2p/base/packetsocketfactory.h" namespace rtc { @@ -66,4 +66,4 @@ class BasicPacketSocketFactory : public PacketSocketFactory { } // namespace rtc -#endif // WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#endif // P2P_BASE_BASICPACKETSOCKETFACTORY_H_ diff --git a/p2p/base/candidate.h b/p2p/base/candidate.h index 474d7fb4d3..87f24d22b8 100644 --- a/p2p/base/candidate.h +++ b/p2p/base/candidate.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_CANDIDATE_H_ -#define WEBRTC_P2P_BASE_CANDIDATE_H_ +#ifndef P2P_BASE_CANDIDATE_H_ +#define P2P_BASE_CANDIDATE_H_ #include #include @@ -20,11 +20,11 @@ #include #include -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "p2p/base/p2pconstants.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/network.h" +#include "rtc_base/socketaddress.h" namespace cricket { @@ -304,4 +304,4 @@ class CandidateTranslator { } // namespace cricket -#endif // WEBRTC_P2P_BASE_CANDIDATE_H_ +#endif // P2P_BASE_CANDIDATE_H_ diff --git a/p2p/base/candidatepairinterface.h b/p2p/base/candidatepairinterface.h index 1d11c22a52..ff0bfcbdde 100644 --- a/p2p/base/candidatepairinterface.h +++ b/p2p/base/candidatepairinterface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_CANDIDATEPAIRINTERFACE_H_ -#define WEBRTC_P2P_BASE_CANDIDATEPAIRINTERFACE_H_ +#ifndef P2P_BASE_CANDIDATEPAIRINTERFACE_H_ +#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_ namespace cricket { @@ -25,4 +25,4 @@ class CandidatePairInterface { } // namespace cricket -#endif // WEBRTC_P2P_BASE_CANDIDATEPAIRINTERFACE_H_ +#endif // P2P_BASE_CANDIDATEPAIRINTERFACE_H_ diff --git a/p2p/base/common.h b/p2p/base/common.h index 5dbe491f09..ce9264227c 100644 --- a/p2p/base/common.h +++ b/p2p/base/common.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_COMMON_H_ -#define WEBRTC_P2P_BASE_COMMON_H_ +#ifndef P2P_BASE_COMMON_H_ +#define P2P_BASE_COMMON_H_ -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" // Common log description format for jingle messages #define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": " #define LOG_JV(sev, obj) LOG_V(sev) << "Jingle:" << obj->ToString() << ": " -#endif // WEBRTC_P2P_BASE_COMMON_H_ +#endif // P2P_BASE_COMMON_H_ diff --git a/p2p/base/dtlstransport.cc b/p2p/base/dtlstransport.cc index 5f32a9b70b..fbbb95840b 100644 --- a/p2p/base/dtlstransport.cc +++ b/p2p/base/dtlstransport.cc @@ -12,17 +12,17 @@ #include #include -#include "webrtc/p2p/base/dtlstransport.h" +#include "p2p/base/dtlstransport.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/common.h" +#include "p2p/base/packettransportinternal.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/dscp.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stream.h" +#include "rtc_base/thread.h" namespace cricket { diff --git a/p2p/base/dtlstransport.h b/p2p/base/dtlstransport.h index 4c0432c3d7..00a4b4a303 100644 --- a/p2p/base/dtlstransport.h +++ b/p2p/base/dtlstransport.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ -#define WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ +#ifndef P2P_BASE_DTLSTRANSPORT_H_ +#define P2P_BASE_DTLSTRANSPORT_H_ #include #include #include -#include "webrtc/p2p/base/dtlstransportinternal.h" -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/bufferqueue.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" +#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/icetransportinternal.h" +#include "rtc_base/buffer.h" +#include "rtc_base/bufferqueue.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stream.h" namespace rtc { class PacketTransportInternal; @@ -236,4 +236,4 @@ class DtlsTransport : public DtlsTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_DTLSTRANSPORT_H_ +#endif // P2P_BASE_DTLSTRANSPORT_H_ diff --git a/p2p/base/dtlstransport_unittest.cc b/p2p/base/dtlstransport_unittest.cc index adad443040..fbc86f3d31 100644 --- a/p2p/base/dtlstransport_unittest.cc +++ b/p2p/base/dtlstransport_unittest.cc @@ -12,17 +12,17 @@ #include #include -#include "webrtc/p2p/base/dtlstransport.h" -#include "webrtc/p2p/base/fakeicetransport.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stringutils.h" +#include "p2p/base/dtlstransport.h" +#include "p2p/base/fakeicetransport.h" +#include "p2p/base/packettransportinternal.h" +#include "rtc_base/checks.h" +#include "rtc_base/dscp.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringutils.h" #define MAYBE_SKIP_TEST(feature) \ if (!(rtc::SSLStreamAdapter::feature())) { \ diff --git a/p2p/base/dtlstransportinternal.h b/p2p/base/dtlstransportinternal.h index b77ae077bb..e7343140ad 100644 --- a/p2p/base/dtlstransportinternal.h +++ b/p2p/base/dtlstransportinternal.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORTINTERNAL_H_ -#define WEBRTC_P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_ #include #include #include -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stringencode.h" +#include "p2p/base/icetransportinternal.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/packettransportinternal.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringencode.h" namespace cricket { @@ -107,4 +107,4 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#endif // P2P_BASE_DTLSTRANSPORTINTERNAL_H_ diff --git a/p2p/base/fakecandidatepair.h b/p2p/base/fakecandidatepair.h index 73e6c6794d..17387892fb 100644 --- a/p2p/base/fakecandidatepair.h +++ b/p2p/base/fakecandidatepair.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKECANDIDATEPAIR_H_ -#define WEBRTC_P2P_BASE_FAKECANDIDATEPAIR_H_ +#ifndef P2P_BASE_FAKECANDIDATEPAIR_H_ +#define P2P_BASE_FAKECANDIDATEPAIR_H_ #include -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/candidatepairinterface.h" +#include "p2p/base/candidate.h" +#include "p2p/base/candidatepairinterface.h" namespace cricket { @@ -51,4 +51,4 @@ class FakeCandidatePair : public CandidatePairInterface { } // namespace cricket -#endif // WEBRTC_P2P_BASE_FAKECANDIDATEPAIR_H_ +#endif // P2P_BASE_FAKECANDIDATEPAIR_H_ diff --git a/p2p/base/fakedtlstransport.h b/p2p/base/fakedtlstransport.h index e78c7fc76c..01a4ed8dfb 100644 --- a/p2p/base/fakedtlstransport.h +++ b/p2p/base/fakedtlstransport.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKEDTLSTRANSPORT_H_ -#define WEBRTC_P2P_BASE_FAKEDTLSTRANSPORT_H_ +#ifndef P2P_BASE_FAKEDTLSTRANSPORT_H_ +#define P2P_BASE_FAKEDTLSTRANSPORT_H_ #include #include #include -#include "webrtc/p2p/base/dtlstransportinternal.h" -#include "webrtc/p2p/base/fakeicetransport.h" -#include "webrtc/rtc_base/fakesslidentity.h" +#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/fakeicetransport.h" +#include "rtc_base/fakesslidentity.h" namespace cricket { @@ -251,4 +251,4 @@ class FakeDtlsTransport : public DtlsTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_FAKEDTLSTRANSPORT_H_ +#endif // P2P_BASE_FAKEDTLSTRANSPORT_H_ diff --git a/p2p/base/fakeicetransport.h b/p2p/base/fakeicetransport.h index eff246e0cf..c5ce8a339b 100644 --- a/p2p/base/fakeicetransport.h +++ b/p2p/base/fakeicetransport.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_ -#define WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_ +#ifndef P2P_BASE_FAKEICETRANSPORT_H_ +#define P2P_BASE_FAKEICETRANSPORT_H_ #include -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "p2p/base/icetransportinternal.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/copyonwritebuffer.h" namespace cricket { @@ -248,4 +248,4 @@ class FakeIceTransport : public IceTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_ +#endif // P2P_BASE_FAKEICETRANSPORT_H_ diff --git a/p2p/base/fakepackettransport.h b/p2p/base/fakepackettransport.h index 82d39c2364..2af14c1bda 100644 --- a/p2p/base/fakepackettransport.h +++ b/p2p/base/fakepackettransport.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKEPACKETTRANSPORT_H_ -#define WEBRTC_P2P_BASE_FAKEPACKETTRANSPORT_H_ +#ifndef P2P_BASE_FAKEPACKETTRANSPORT_H_ +#define P2P_BASE_FAKEPACKETTRANSPORT_H_ #include -#include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "api/ortc/packettransportinterface.h" +#include "p2p/base/packettransportinternal.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/copyonwritebuffer.h" namespace rtc { @@ -128,4 +128,4 @@ class FakePacketTransport : public PacketTransportInternal { } // namespace rtc -#endif // WEBRTC_P2P_BASE_FAKEPACKETTRANSPORT_H_ +#endif // P2P_BASE_FAKEPACKETTRANSPORT_H_ diff --git a/p2p/base/fakeportallocator.h b/p2p/base/fakeportallocator.h index d7c30f0a6e..3f0a1d4f8c 100644 --- a/p2p/base/fakeportallocator.h +++ b/p2p/base/fakeportallocator.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKEPORTALLOCATOR_H_ -#define WEBRTC_P2P_BASE_FAKEPORTALLOCATOR_H_ +#ifndef P2P_BASE_FAKEPORTALLOCATOR_H_ +#define P2P_BASE_FAKEPORTALLOCATOR_H_ #include #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/p2p/base/udpport.h" -#include "webrtc/rtc_base/nethelpers.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/udpport.h" +#include "rtc_base/nethelpers.h" namespace rtc { class SocketFactory; @@ -250,4 +250,4 @@ class FakePortAllocator : public cricket::PortAllocator { } // namespace cricket -#endif // WEBRTC_P2P_BASE_FAKEPORTALLOCATOR_H_ +#endif // P2P_BASE_FAKEPORTALLOCATOR_H_ diff --git a/p2p/base/faketransportcontroller.h b/p2p/base/faketransportcontroller.h index 0c784754a6..f795ce8e70 100644 --- a/p2p/base/faketransportcontroller.h +++ b/p2p/base/faketransportcontroller.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_ -#define WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_ +#ifndef P2P_BASE_FAKETRANSPORTCONTROLLER_H_ +#define P2P_BASE_FAKETRANSPORTCONTROLLER_H_ #include #include #include -#include "webrtc/p2p/base/fakedtlstransport.h" -#include "webrtc/p2p/base/fakeicetransport.h" -#include "webrtc/p2p/base/transportcontroller.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/sslfingerprint.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/fakedtlstransport.h" +#include "p2p/base/fakeicetransport.h" +#include "p2p/base/transportcontroller.h" +#include "rtc_base/bind.h" +#include "rtc_base/sslfingerprint.h" +#include "rtc_base/thread.h" namespace cricket { @@ -156,4 +156,4 @@ class FakeTransportController : public TransportController { } // namespace cricket -#endif // WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_ +#endif // P2P_BASE_FAKETRANSPORTCONTROLLER_H_ diff --git a/p2p/base/icetransportinternal.h b/p2p/base/icetransportinternal.h index 435a081161..5c67df9da6 100644 --- a/p2p/base/icetransportinternal.h +++ b/p2p/base/icetransportinternal.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ -#define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_ICETRANSPORTINTERNAL_H_ +#define P2P_BASE_ICETRANSPORTINTERNAL_H_ #include -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/candidatepairinterface.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/rtc_base/stringencode.h" +#include "p2p/base/candidate.h" +#include "p2p/base/candidatepairinterface.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/packettransportinternal.h" +#include "p2p/base/transportdescription.h" +#include "rtc_base/stringencode.h" namespace webrtc { class MetricsObserverInterface; @@ -147,4 +147,4 @@ class IceTransportInternal : public rtc::PacketTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ +#endif // P2P_BASE_ICETRANSPORTINTERNAL_H_ diff --git a/p2p/base/jseptransport.cc b/p2p/base/jseptransport.cc index 191d34fcad..cd564b20aa 100644 --- a/p2p/base/jseptransport.cc +++ b/p2p/base/jseptransport.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/jseptransport.h" +#include "p2p/base/jseptransport.h" #include #include // for std::pair -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/dtlstransport.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/p2p/base/port.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/base/candidate.h" +#include "p2p/base/dtlstransport.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/port.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/jseptransport.h b/p2p/base/jseptransport.h index f680646e16..3486342a84 100644 --- a/p2p/base/jseptransport.h +++ b/p2p/base/jseptransport.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_JSEPTRANSPORT_H_ -#define WEBRTC_P2P_BASE_JSEPTRANSPORT_H_ +#ifndef P2P_BASE_JSEPTRANSPORT_H_ +#define P2P_BASE_JSEPTRANSPORT_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/p2p/base/transportinfo.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "api/optional.h" +#include "p2p/base/candidate.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/sessiondescription.h" +#include "p2p/base/transportinfo.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/sslstreamadapter.h" namespace cricket { @@ -380,4 +380,4 @@ class JsepTransport : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_JSEPTRANSPORT_H_ +#endif // P2P_BASE_JSEPTRANSPORT_H_ diff --git a/p2p/base/jseptransport_unittest.cc b/p2p/base/jseptransport_unittest.cc index 56b61eca3b..644bcd90b0 100644 --- a/p2p/base/jseptransport_unittest.cc +++ b/p2p/base/jseptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/p2p/base/fakedtlstransport.h" -#include "webrtc/p2p/base/fakeicetransport.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/network.h" +#include "p2p/base/fakedtlstransport.h" +#include "p2p/base/fakeicetransport.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/network.h" using cricket::JsepTransport; using cricket::TransportChannel; diff --git a/p2p/base/mockicetransport.h b/p2p/base/mockicetransport.h index 92d0373fc9..4ea1869370 100644 --- a/p2p/base/mockicetransport.h +++ b/p2p/base/mockicetransport.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_MOCKICETRANSPORT_H_ -#define WEBRTC_P2P_BASE_MOCKICETRANSPORT_H_ +#ifndef P2P_BASE_MOCKICETRANSPORT_H_ +#define P2P_BASE_MOCKICETRANSPORT_H_ #include #include #include -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/test/gmock.h" +#include "p2p/base/icetransportinternal.h" +#include "rtc_base/gunit.h" +#include "test/gmock.h" using testing::_; using testing::Return; @@ -78,4 +78,4 @@ class MockIceTransport : public IceTransportInternal { } // namespace cricket -#endif // WEBRTC_P2P_BASE_MOCKICETRANSPORT_H_ +#endif // P2P_BASE_MOCKICETRANSPORT_H_ diff --git a/p2p/base/p2pconstants.cc b/p2p/base/p2pconstants.cc index 64e5a13cf8..dd6f25f1b6 100644 --- a/p2p/base/p2pconstants.cc +++ b/p2p/base/p2pconstants.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/p2pconstants.h" +#include "p2p/base/p2pconstants.h" #include diff --git a/p2p/base/p2pconstants.h b/p2p/base/p2pconstants.h index a36cd889d0..b72d025774 100644 --- a/p2p/base/p2pconstants.h +++ b/p2p/base/p2pconstants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_P2PCONSTANTS_H_ -#define WEBRTC_P2P_BASE_P2PCONSTANTS_H_ +#ifndef P2P_BASE_P2PCONSTANTS_H_ +#define P2P_BASE_P2PCONSTANTS_H_ #include @@ -50,4 +50,4 @@ extern const char CONNECTIONROLE_HOLDCONN_STR[]; } // namespace cricket -#endif // WEBRTC_P2P_BASE_P2PCONSTANTS_H_ +#endif // P2P_BASE_P2PCONSTANTS_H_ diff --git a/p2p/base/p2ptransportchannel.cc b/p2p/base/p2ptransportchannel.cc index 90fe07c275..44f8eee8ef 100644 --- a/p2p/base/p2ptransportchannel.cc +++ b/p2p/base/p2ptransportchannel.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/p2ptransportchannel.h" +#include "p2p/base/p2ptransportchannel.h" #include #include #include -#include "webrtc/api/umametrics.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/candidatepairinterface.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/relayport.h" // For RELAY_PORT_TYPE. -#include "webrtc/p2p/base/stunport.h" // For STUN_PORT_TYPE. -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/umametrics.h" +#include "p2p/base/candidate.h" +#include "p2p/base/candidatepairinterface.h" +#include "p2p/base/common.h" +#include "p2p/base/relayport.h" // For RELAY_PORT_TYPE. +#include "p2p/base/stunport.h" // For STUN_PORT_TYPE. +#include "rtc_base/checks.h" +#include "rtc_base/crc32.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" namespace { diff --git a/p2p/base/p2ptransportchannel.h b/p2p/base/p2ptransportchannel.h index d2461dec3d..b6a84bec94 100644 --- a/p2p/base/p2ptransportchannel.h +++ b/p2p/base/p2ptransportchannel.h @@ -17,8 +17,8 @@ // When all of the available connections become invalid (non-writable), we // kick off a process of determining more candidates and more connections. // -#ifndef WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ -#define WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ +#ifndef P2P_BASE_P2PTRANSPORTCHANNEL_H_ +#define P2P_BASE_P2PTRANSPORTCHANNEL_H_ #include #include @@ -26,15 +26,15 @@ #include #include -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/candidatepairinterface.h" -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/p2p/base/portinterface.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/sigslot.h" +#include "p2p/base/candidate.h" +#include "p2p/base/candidatepairinterface.h" +#include "p2p/base/icetransportinternal.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/portinterface.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/random.h" +#include "rtc_base/sigslot.h" namespace cricket { @@ -407,4 +407,4 @@ class P2PTransportChannel : public IceTransportInternal, } // namespace cricket -#endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ +#endif // P2P_BASE_P2PTRANSPORTCHANNEL_H_ diff --git a/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc index 62fddb2b58..ca1156cfc4 100644 --- a/p2p/base/p2ptransportchannel_unittest.cc +++ b/p2p/base/p2ptransportchannel_unittest.cc @@ -11,31 +11,31 @@ #include #include -#include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/p2p/base/testrelayserver.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/firewallsocketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/proxyserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "api/fakemetricsobserver.h" +#include "p2p/base/fakeportallocator.h" +#include "p2p/base/icetransportinternal.h" +#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/packettransportinternal.h" +#include "p2p/base/testrelayserver.h" +#include "p2p/base/teststunserver.h" +#include "p2p/base/testturnserver.h" +#include "p2p/client/basicportallocator.h" +#include "rtc_base/checks.h" +#include "rtc_base/dscp.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/natsocketfactory.h" +#include "rtc_base/proxyserver.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" namespace { diff --git a/p2p/base/packetlossestimator.cc b/p2p/base/packetlossestimator.cc index 7990119c1a..d146c8a5dc 100644 --- a/p2p/base/packetlossestimator.cc +++ b/p2p/base/packetlossestimator.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/p2p/base/packetlossestimator.h" +#include "p2p/base/packetlossestimator.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/p2p/base/packetlossestimator.h b/p2p/base/packetlossestimator.h index dfc5fe50e9..8b8bb2b394 100644 --- a/p2p/base/packetlossestimator.h +++ b/p2p/base/packetlossestimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PACKETLOSSESTIMATOR_H_ -#define WEBRTC_P2P_BASE_PACKETLOSSESTIMATOR_H_ +#ifndef P2P_BASE_PACKETLOSSESTIMATOR_H_ +#define P2P_BASE_PACKETLOSSESTIMATOR_H_ #include #include @@ -83,4 +83,4 @@ class PacketLossEstimator { } // namespace cricket -#endif // WEBRTC_P2P_BASE_PACKETLOSSESTIMATOR_H_ +#endif // P2P_BASE_PACKETLOSSESTIMATOR_H_ diff --git a/p2p/base/packetlossestimator_unittest.cc b/p2p/base/packetlossestimator_unittest.cc index 642dcc2e0a..e8b09321b3 100644 --- a/p2p/base/packetlossestimator_unittest.cc +++ b/p2p/base/packetlossestimator_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/p2p/base/packetlossestimator.h" -#include "webrtc/rtc_base/gunit.h" +#include "p2p/base/packetlossestimator.h" +#include "rtc_base/gunit.h" using cricket::PacketLossEstimator; diff --git a/p2p/base/packetsocketfactory.h b/p2p/base/packetsocketfactory.h index 8ae0bd3319..9e43e9aefe 100644 --- a/p2p/base/packetsocketfactory.h +++ b/p2p/base/packetsocketfactory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_ -#define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_ +#ifndef P2P_BASE_PACKETSOCKETFACTORY_H_ +#define P2P_BASE_PACKETSOCKETFACTORY_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/proxyinfo.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/proxyinfo.h" namespace rtc { @@ -83,4 +83,4 @@ class PacketSocketFactory { } // namespace rtc -#endif // WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_ +#endif // P2P_BASE_PACKETSOCKETFACTORY_H_ diff --git a/p2p/base/packettransportinterface.h b/p2p/base/packettransportinterface.h index 05ca746b24..f957ae6613 100644 --- a/p2p/base/packettransportinterface.h +++ b/p2p/base/packettransportinterface.h @@ -12,10 +12,10 @@ // uses it. // TODO(deadbeef): Update chromium and remove this file. -#ifndef WEBRTC_P2P_BASE_PACKETTRANSPORTINTERFACE_H_ -#define WEBRTC_P2P_BASE_PACKETTRANSPORTINTERFACE_H_ +#ifndef P2P_BASE_PACKETTRANSPORTINTERFACE_H_ +#define P2P_BASE_PACKETTRANSPORTINTERFACE_H_ -#include "webrtc/p2p/base/packettransportinternal.h" +#include "p2p/base/packettransportinternal.h" namespace rtc { typedef PacketTransportInternal PacketTransportInterface; diff --git a/p2p/base/packettransportinternal.h b/p2p/base/packettransportinternal.h index 3dc27d58fd..c5be54302f 100644 --- a/p2p/base/packettransportinternal.h +++ b/p2p/base/packettransportinternal.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PACKETTRANSPORTINTERNAL_H_ -#define WEBRTC_P2P_BASE_PACKETTRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_PACKETTRANSPORTINTERNAL_H_ +#define P2P_BASE_PACKETTRANSPORTINTERNAL_H_ #include #include // This is included for PacketOptions. -#include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" +#include "api/ortc/packettransportinterface.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socket.h" namespace cricket { class TransportChannel; @@ -97,4 +97,4 @@ class PacketTransportInternal : public virtual webrtc::PacketTransportInterface, } // namespace rtc -#endif // WEBRTC_P2P_BASE_PACKETTRANSPORTINTERNAL_H_ +#endif // P2P_BASE_PACKETTRANSPORTINTERNAL_H_ diff --git a/p2p/base/port.cc b/p2p/base/port.cc index 40b2502f65..a1b478d116 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/port.h" +#include "p2p/base/port.h" #include #include -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "p2p/base/common.h" +#include "p2p/base/portallocator.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" +#include "rtc_base/crc32.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/network.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" namespace { diff --git a/p2p/base/port.h b/p2p/base/port.h index 76a3deaa49..65f4d79f12 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PORT_H_ -#define WEBRTC_P2P_BASE_PORT_H_ +#ifndef P2P_BASE_PORT_H_ +#define P2P_BASE_PORT_H_ #include #include @@ -17,23 +17,23 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/candidatepairinterface.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/packetlossestimator.h" -#include "webrtc/p2p/base/packetsocketfactory.h" -#include "webrtc/p2p/base/portinterface.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/p2p/base/stunrequest.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/proxyinfo.h" -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "api/optional.h" +#include "p2p/base/candidate.h" +#include "p2p/base/candidatepairinterface.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/packetlossestimator.h" +#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/portinterface.h" +#include "p2p/base/stun.h" +#include "p2p/base/stunrequest.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/network.h" +#include "rtc_base/proxyinfo.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" namespace cricket { @@ -754,4 +754,4 @@ class ProxyConnection : public Connection { } // namespace cricket -#endif // WEBRTC_P2P_BASE_PORT_H_ +#endif // P2P_BASE_PORT_H_ diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc index f47751fb08..36af5de2cb 100644 --- a/p2p/base/port_unittest.cc +++ b/p2p/base/port_unittest.cc @@ -11,29 +11,29 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/relayport.h" -#include "webrtc/p2p/base/stunport.h" -#include "webrtc/p2p/base/tcpport.h" -#include "webrtc/p2p/base/testrelayserver.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/base/turnport.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/relayport.h" +#include "p2p/base/stunport.h" +#include "p2p/base/tcpport.h" +#include "p2p/base/testrelayserver.h" +#include "p2p/base/teststunserver.h" +#include "p2p/base/testturnserver.h" +#include "p2p/base/turnport.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/buffer.h" +#include "rtc_base/crc32.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/natsocketfactory.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::AsyncPacketSocket; using rtc::Buffer; diff --git a/p2p/base/portallocator.cc b/p2p/base/portallocator.cc index dd776e7584..97dedc5e66 100644 --- a/p2p/base/portallocator.cc +++ b/p2p/base/portallocator.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/rtc_base/checks.h" +#include "p2p/base/portallocator.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/p2p/base/portallocator.h b/p2p/base/portallocator.h index 63d7c71325..ec8da796ce 100644 --- a/p2p/base/portallocator.h +++ b/p2p/base/portallocator.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PORTALLOCATOR_H_ -#define WEBRTC_P2P_BASE_PORTALLOCATOR_H_ +#ifndef P2P_BASE_PORTALLOCATOR_H_ +#define P2P_BASE_PORTALLOCATOR_H_ #include #include #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/base/portinterface.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/proxyinfo.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/port.h" +#include "p2p/base/portinterface.h" +#include "rtc_base/helpers.h" +#include "rtc_base/proxyinfo.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace webrtc { class MetricsObserverInterface; @@ -510,4 +510,4 @@ class PortAllocator : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_PORTALLOCATOR_H_ +#endif // P2P_BASE_PORTALLOCATOR_H_ diff --git a/p2p/base/portallocator_unittest.cc b/p2p/base/portallocator_unittest.cc index 4845f7cc93..3887a90db1 100644 --- a/p2p/base/portallocator_unittest.cc +++ b/p2p/base/portallocator_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/fakeportallocator.h" +#include "p2p/base/portallocator.h" +#include "rtc_base/gunit.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" static const char kContentName[] = "test content"; // Based on ICE_UFRAG_LENGTH diff --git a/p2p/base/portinterface.h b/p2p/base/portinterface.h index 7cb8429509..2da8e21f0d 100644 --- a/p2p/base/portinterface.h +++ b/p2p/base/portinterface.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PORTINTERFACE_H_ -#define WEBRTC_P2P_BASE_PORTINTERFACE_H_ +#ifndef P2P_BASE_PORTINTERFACE_H_ +#define P2P_BASE_PORTINTERFACE_H_ #include -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "p2p/base/jseptransport.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/socketaddress.h" namespace rtc { class Network; @@ -129,4 +129,4 @@ class PortInterface { } // namespace cricket -#endif // WEBRTC_P2P_BASE_PORTINTERFACE_H_ +#endif // P2P_BASE_PORTINTERFACE_H_ diff --git a/p2p/base/pseudotcp.cc b/p2p/base/pseudotcp.cc index 55935e3809..33ece445ed 100644 --- a/p2p/base/pseudotcp.cc +++ b/p2p/base/pseudotcp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/pseudotcp.h" +#include "p2p/base/pseudotcp.h" #include #include @@ -17,16 +17,16 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" +#include "rtc_base/socket.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" // The following logging is for detailed (packet-level) analysis only. #define _DBG_NONE 0 diff --git a/p2p/base/pseudotcp.h b/p2p/base/pseudotcp.h index 134bc00578..b36a7d9ddb 100644 --- a/p2p/base/pseudotcp.h +++ b/p2p/base/pseudotcp.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PSEUDOTCP_H_ -#define WEBRTC_P2P_BASE_PSEUDOTCP_H_ +#ifndef P2P_BASE_PSEUDOTCP_H_ +#define P2P_BASE_PSEUDOTCP_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/stream.h" namespace cricket { @@ -239,4 +239,4 @@ class PseudoTcp { } // namespace cricket -#endif // WEBRTC_P2P_BASE_PSEUDOTCP_H_ +#endif // P2P_BASE_PSEUDOTCP_H_ diff --git a/p2p/base/pseudotcp_unittest.cc b/p2p/base/pseudotcp_unittest.cc index 157f456573..d26f261b93 100644 --- a/p2p/base/pseudotcp_unittest.cc +++ b/p2p/base/pseudotcp_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/p2p/base/pseudotcp.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "p2p/base/pseudotcp.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/stream.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" using cricket::PseudoTcp; diff --git a/p2p/base/relayport.cc b/p2p/base/relayport.cc index 387ec4b9fc..e3b7a7f065 100644 --- a/p2p/base/relayport.cc +++ b/p2p/base/relayport.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/p2p/base/relayport.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/base/relayport.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/relayport.h b/p2p/base/relayport.h index e2e6800710..f12ba116d7 100644 --- a/p2p/base/relayport.h +++ b/p2p/base/relayport.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_RELAYPORT_H_ -#define WEBRTC_P2P_BASE_RELAYPORT_H_ +#ifndef P2P_BASE_RELAYPORT_H_ +#define P2P_BASE_RELAYPORT_H_ #include #include #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/base/stunrequest.h" +#include "p2p/base/port.h" +#include "p2p/base/stunrequest.h" namespace cricket { @@ -119,4 +119,4 @@ class RelayPort : public Port { } // namespace cricket -#endif // WEBRTC_P2P_BASE_RELAYPORT_H_ +#endif // P2P_BASE_RELAYPORT_H_ diff --git a/p2p/base/relayport_unittest.cc b/p2p/base/relayport_unittest.cc index a5d919a678..9747b4372d 100644 --- a/p2p/base/relayport_unittest.cc +++ b/p2p/base/relayport_unittest.cc @@ -10,17 +10,17 @@ #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/relayport.h" -#include "webrtc/p2p/base/relayserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/relayport.h" +#include "p2p/base/relayserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::SocketAddress; diff --git a/p2p/base/relayserver.cc b/p2p/base/relayserver.cc index 3a97d4e664..831c6d78a6 100644 --- a/p2p/base/relayserver.cc +++ b/p2p/base/relayserver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/relayserver.h" +#include "p2p/base/relayserver.h" #ifdef WEBRTC_POSIX #include @@ -16,11 +16,11 @@ #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketadapters.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketadapters.h" namespace cricket { diff --git a/p2p/base/relayserver.h b/p2p/base/relayserver.h index 579b01417f..1b299bfd9d 100644 --- a/p2p/base/relayserver.h +++ b/p2p/base/relayserver.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_RELAYSERVER_H_ -#define WEBRTC_P2P_BASE_RELAYSERVER_H_ +#ifndef P2P_BASE_RELAYSERVER_H_ +#define P2P_BASE_RELAYSERVER_H_ #include #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/socketaddresspair.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "p2p/base/port.h" +#include "p2p/base/stun.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/socketaddresspair.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace cricket { @@ -233,4 +233,4 @@ class RelayServerBinding : public rtc::MessageHandler { } // namespace cricket -#endif // WEBRTC_P2P_BASE_RELAYSERVER_H_ +#endif // P2P_BASE_RELAYSERVER_H_ diff --git a/p2p/base/relayserver_unittest.cc b/p2p/base/relayserver_unittest.cc index 7c1b29e0ac..0dddbd2a43 100644 --- a/p2p/base/relayserver_unittest.cc +++ b/p2p/base/relayserver_unittest.cc @@ -11,16 +11,16 @@ #include #include -#include "webrtc/p2p/base/relayserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/relayserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/testclient.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::SocketAddress; using namespace cricket; diff --git a/p2p/base/sessiondescription.cc b/p2p/base/sessiondescription.cc index 1e69c83e76..26989c042a 100644 --- a/p2p/base/sessiondescription.cc +++ b/p2p/base/sessiondescription.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/sessiondescription.h" +#include "p2p/base/sessiondescription.h" namespace cricket { diff --git a/p2p/base/sessiondescription.h b/p2p/base/sessiondescription.h index df9348d581..d1b11cfbfc 100644 --- a/p2p/base/sessiondescription.h +++ b/p2p/base/sessiondescription.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_ -#define WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_ +#ifndef P2P_BASE_SESSIONDESCRIPTION_H_ +#define P2P_BASE_SESSIONDESCRIPTION_H_ #include #include -#include "webrtc/p2p/base/transportinfo.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "p2p/base/transportinfo.h" +#include "rtc_base/constructormagic.h" namespace cricket { @@ -203,4 +203,4 @@ enum ContentSource { } // namespace cricket -#endif // WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_ +#endif // P2P_BASE_SESSIONDESCRIPTION_H_ diff --git a/p2p/base/stun.cc b/p2p/base/stun.cc index 56b4ee1965..9ac2554cf9 100644 --- a/p2p/base/stun.cc +++ b/p2p/base/stun.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/stun.h" +#include "p2p/base/stun.h" #include #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/crc32.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/stringencode.h" using rtc::ByteBufferReader; using rtc::ByteBufferWriter; diff --git a/p2p/base/stun.h b/p2p/base/stun.h index 4a44dcbc2f..9eb89e62f9 100644 --- a/p2p/base/stun.h +++ b/p2p/base/stun.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_STUN_H_ -#define WEBRTC_P2P_BASE_STUN_H_ +#ifndef P2P_BASE_STUN_H_ +#define P2P_BASE_STUN_H_ // This file contains classes for dealing with the STUN protocol, as specified // in RFC 5389, and its descendants. @@ -17,9 +17,9 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/socketaddress.h" namespace cricket { @@ -641,4 +641,4 @@ class IceMessage : public StunMessage { } // namespace cricket -#endif // WEBRTC_P2P_BASE_STUN_H_ +#endif // P2P_BASE_STUN_H_ diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc index ef387a1b33..38f29bbff8 100644 --- a/p2p/base/stun_unittest.cc +++ b/p2p/base/stun_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "p2p/base/stun.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketaddress.h" namespace cricket { diff --git a/p2p/base/stunport.cc b/p2p/base/stunport.cc index 5f6889e6dc..a5765fab7a 100644 --- a/p2p/base/stunport.cc +++ b/p2p/base/stunport.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/stunport.h" +#include "p2p/base/stunport.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" +#include "p2p/base/common.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/stun.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" namespace cricket { diff --git a/p2p/base/stunport.h b/p2p/base/stunport.h index 8fbc0d52fa..53fc125d97 100644 --- a/p2p/base/stunport.h +++ b/p2p/base/stunport.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_STUNPORT_H_ -#define WEBRTC_P2P_BASE_STUNPORT_H_ +#ifndef P2P_BASE_STUNPORT_H_ +#define P2P_BASE_STUNPORT_H_ #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/base/stunrequest.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "p2p/base/port.h" +#include "p2p/base/stunrequest.h" +#include "rtc_base/asyncpacketsocket.h" // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h. namespace rtc { @@ -305,4 +305,4 @@ class StunPort : public UDPPort { } // namespace cricket -#endif // WEBRTC_P2P_BASE_STUNPORT_H_ +#endif // P2P_BASE_STUNPORT_H_ diff --git a/p2p/base/stunport_unittest.cc b/p2p/base/stunport_unittest.cc index e994f67832..3df13e8a85 100644 --- a/p2p/base/stunport_unittest.cc +++ b/p2p/base/stunport_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/stunport.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/stunport.h" +#include "p2p/base/teststunserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/virtualsocketserver.h" using cricket::ServerAddresses; using rtc::SocketAddress; diff --git a/p2p/base/stunrequest.cc b/p2p/base/stunrequest.cc index cace17f299..8afd1a03c9 100644 --- a/p2p/base/stunrequest.cc +++ b/p2p/base/stunrequest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/stunrequest.h" +#include "p2p/base/stunrequest.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/stringencode.h" namespace cricket { diff --git a/p2p/base/stunrequest.h b/p2p/base/stunrequest.h index a1c6930688..00f317fb93 100644 --- a/p2p/base/stunrequest.h +++ b/p2p/base/stunrequest.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_STUNREQUEST_H_ -#define WEBRTC_P2P_BASE_STUNREQUEST_H_ +#ifndef P2P_BASE_STUNREQUEST_H_ +#define P2P_BASE_STUNREQUEST_H_ #include #include -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/stun.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace cricket { @@ -141,4 +141,4 @@ class StunRequest : public rtc::MessageHandler { } // namespace cricket -#endif // WEBRTC_P2P_BASE_STUNREQUEST_H_ +#endif // P2P_BASE_STUNREQUEST_H_ diff --git a/p2p/base/stunrequest_unittest.cc b/p2p/base/stunrequest_unittest.cc index a4f603bced..0b109b1544 100644 --- a/p2p/base/stunrequest_unittest.cc +++ b/p2p/base/stunrequest_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/stunrequest.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/timeutils.h" +#include "p2p/base/stunrequest.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/timeutils.h" using namespace cricket; diff --git a/p2p/base/stunserver.cc b/p2p/base/stunserver.cc index 3a3a0abf46..cfce926223 100644 --- a/p2p/base/stunserver.cc +++ b/p2p/base/stunserver.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/stunserver.h" +#include "p2p/base/stunserver.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/stunserver.h b/p2p/base/stunserver.h index 92707b0954..7489ce9416 100644 --- a/p2p/base/stunserver.h +++ b/p2p/base/stunserver.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_STUNSERVER_H_ -#define WEBRTC_P2P_BASE_STUNSERVER_H_ +#ifndef P2P_BASE_STUNSERVER_H_ +#define P2P_BASE_STUNSERVER_H_ #include -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/asyncudpsocket.h" +#include "p2p/base/stun.h" +#include "rtc_base/asyncudpsocket.h" namespace cricket { @@ -64,4 +64,4 @@ class StunServer : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_STUNSERVER_H_ +#endif // P2P_BASE_STUNSERVER_H_ diff --git a/p2p/base/stunserver_unittest.cc b/p2p/base/stunserver_unittest.cc index 66cb59f1b4..060305e6b3 100644 --- a/p2p/base/stunserver_unittest.cc +++ b/p2p/base/stunserver_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/p2p/base/stunserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/stunserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/testclient.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using namespace cricket; diff --git a/p2p/base/tcpport.cc b/p2p/base/tcpport.cc index cbb25b9192..31abf4b048 100644 --- a/p2p/base/tcpport.cc +++ b/p2p/base/tcpport.cc @@ -64,11 +64,11 @@ * */ -#include "webrtc/p2p/base/tcpport.h" +#include "p2p/base/tcpport.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/base/common.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/tcpport.h b/p2p/base/tcpport.h index a0a36df0e3..4a2b5f826d 100644 --- a/p2p/base/tcpport.h +++ b/p2p/base/tcpport.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TCPPORT_H_ -#define WEBRTC_P2P_BASE_TCPPORT_H_ +#ifndef P2P_BASE_TCPPORT_H_ +#define P2P_BASE_TCPPORT_H_ #include #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "p2p/base/port.h" +#include "rtc_base/asyncpacketsocket.h" namespace cricket { @@ -185,4 +185,4 @@ class TCPConnection : public Connection { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TCPPORT_H_ +#endif // P2P_BASE_TCPPORT_H_ diff --git a/p2p/base/tcpport_unittest.cc b/p2p/base/tcpport_unittest.cc index 884488efc3..7c426c0b93 100644 --- a/p2p/base/tcpport_unittest.cc +++ b/p2p/base/tcpport_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/tcpport.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/tcpport.h" +#include "rtc_base/gunit.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::SocketAddress; using cricket::Connection; diff --git a/p2p/base/testrelayserver.h b/p2p/base/testrelayserver.h index 27bc4c15ae..814929bb92 100644 --- a/p2p/base/testrelayserver.h +++ b/p2p/base/testrelayserver.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TESTRELAYSERVER_H_ -#define WEBRTC_P2P_BASE_TESTRELAYSERVER_H_ +#ifndef P2P_BASE_TESTRELAYSERVER_H_ +#define P2P_BASE_TESTRELAYSERVER_H_ #include -#include "webrtc/p2p/base/relayserver.h" -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/relayserver.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/thread.h" namespace cricket { @@ -99,4 +99,4 @@ class TestRelayServer : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TESTRELAYSERVER_H_ +#endif // P2P_BASE_TESTRELAYSERVER_H_ diff --git a/p2p/base/teststunserver.h b/p2p/base/teststunserver.h index 1a9e670810..7b3f098614 100644 --- a/p2p/base/teststunserver.h +++ b/p2p/base/teststunserver.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TESTSTUNSERVER_H_ -#define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_ +#ifndef P2P_BASE_TESTSTUNSERVER_H_ +#define P2P_BASE_TESTSTUNSERVER_H_ -#include "webrtc/p2p/base/stunserver.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/stunserver.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" namespace cricket { @@ -55,4 +55,4 @@ class TestStunServer : StunServer { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TESTSTUNSERVER_H_ +#endif // P2P_BASE_TESTSTUNSERVER_H_ diff --git a/p2p/base/testturnserver.h b/p2p/base/testturnserver.h index 4333be0965..0edc476511 100644 --- a/p2p/base/testturnserver.h +++ b/p2p/base/testturnserver.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TESTTURNSERVER_H_ -#define WEBRTC_P2P_BASE_TESTTURNSERVER_H_ +#ifndef P2P_BASE_TESTTURNSERVER_H_ +#define P2P_BASE_TESTTURNSERVER_H_ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/p2p/base/turnserver.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/stun.h" +#include "p2p/base/turnserver.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/thread.h" namespace cricket { @@ -135,4 +135,4 @@ class TestTurnServer : public TurnAuthInterface { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TESTTURNSERVER_H_ +#endif // P2P_BASE_TESTTURNSERVER_H_ diff --git a/p2p/base/transport.h b/p2p/base/transport.h index 0921a41aa9..009a2511f4 100644 --- a/p2p/base/transport.h +++ b/p2p/base/transport.h @@ -11,9 +11,9 @@ // Most of the contents of this header have moved to jseptransport.h. // TODO(deadbeef): Delete this file when downstream dependents are updated. -#ifndef WEBRTC_P2P_BASE_TRANSPORT_H_ -#define WEBRTC_P2P_BASE_TRANSPORT_H_ +#ifndef P2P_BASE_TRANSPORT_H_ +#define P2P_BASE_TRANSPORT_H_ -#include "webrtc/p2p/base/transport.h" +#include "p2p/base/transport.h" -#endif // WEBRTC_P2P_BASE_TRANSPORT_H_ +#endif // P2P_BASE_TRANSPORT_H_ diff --git a/p2p/base/transportchannelimpl.h b/p2p/base/transportchannelimpl.h index cf6e3629f6..151f6dd4f7 100644 --- a/p2p/base/transportchannelimpl.h +++ b/p2p/base/transportchannelimpl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTCHANNELIMPL_H_ -#define WEBRTC_P2P_BASE_TRANSPORTCHANNELIMPL_H_ +#ifndef P2P_BASE_TRANSPORTCHANNELIMPL_H_ +#define P2P_BASE_TRANSPORTCHANNELIMPL_H_ #include -#include "webrtc/p2p/base/icetransportinternal.h" -#include "webrtc/p2p/base/transportchannel.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "p2p/base/icetransportinternal.h" +#include "p2p/base/transportchannel.h" +#include "rtc_base/constructormagic.h" namespace webrtc { class MetricsObserverInterface; @@ -120,4 +120,4 @@ class TransportChannelImpl : public TransportChannel { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTCHANNELIMPL_H_ +#endif // P2P_BASE_TRANSPORTCHANNELIMPL_H_ diff --git a/p2p/base/transportcontroller.cc b/p2p/base/transportcontroller.cc index 8f6674e712..cfe43d23d4 100644 --- a/p2p/base/transportcontroller.cc +++ b/p2p/base/transportcontroller.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/transportcontroller.h" +#include "p2p/base/transportcontroller.h" #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/port.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/thread.h" namespace { diff --git a/p2p/base/transportcontroller.h b/p2p/base/transportcontroller.h index 108800e553..b7c38f3a07 100644 --- a/p2p/base/transportcontroller.h +++ b/p2p/base/transportcontroller.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ -#define WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ +#ifndef P2P_BASE_TRANSPORTCONTROLLER_H_ +#define P2P_BASE_TRANSPORTCONTROLLER_H_ #include #include #include #include -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/dtlstransport.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "p2p/base/candidate.h" +#include "p2p/base/dtlstransport.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/p2ptransportchannel.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/sslstreamadapter.h" namespace rtc { class Thread; @@ -276,4 +276,4 @@ class TransportController : public sigslot::has_slots<>, } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ +#endif // P2P_BASE_TRANSPORTCONTROLLER_H_ diff --git a/p2p/base/transportcontroller_unittest.cc b/p2p/base/transportcontroller_unittest.cc index 9352f150fb..2c70a84bd2 100644 --- a/p2p/base/transportcontroller_unittest.cc +++ b/p2p/base/transportcontroller_unittest.cc @@ -11,17 +11,17 @@ #include #include -#include "webrtc/p2p/base/dtlstransport.h" -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/p2p/base/transportcontroller.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/dtlstransport.h" +#include "p2p/base/fakeportallocator.h" +#include "p2p/base/faketransportcontroller.h" +#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/transportcontroller.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/thread.h" static const int kTimeout = 100; static const char kIceUfrag1[] = "TESTICEUFRAG0001"; diff --git a/p2p/base/transportdescription.cc b/p2p/base/transportdescription.cc index 7c0f1f51dc..7dd780c51f 100644 --- a/p2p/base/transportdescription.cc +++ b/p2p/base/transportdescription.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/transportdescription.h" +#include "p2p/base/transportdescription.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/stringutils.h" +#include "p2p/base/p2pconstants.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/stringutils.h" namespace cricket { diff --git a/p2p/base/transportdescription.h b/p2p/base/transportdescription.h index 670213197a..278c9d161f 100644 --- a/p2p/base/transportdescription.h +++ b/p2p/base/transportdescription.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ -#define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ +#ifndef P2P_BASE_TRANSPORTDESCRIPTION_H_ +#define P2P_BASE_TRANSPORTDESCRIPTION_H_ #include #include #include #include -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/rtc_base/sslfingerprint.h" +#include "p2p/base/p2pconstants.h" +#include "rtc_base/sslfingerprint.h" namespace cricket { @@ -178,4 +178,4 @@ struct TransportDescription { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ +#endif // P2P_BASE_TRANSPORTDESCRIPTION_H_ diff --git a/p2p/base/transportdescriptionfactory.cc b/p2p/base/transportdescriptionfactory.cc index 1c75b32292..78fbf541d1 100644 --- a/p2p/base/transportdescriptionfactory.cc +++ b/p2p/base/transportdescriptionfactory.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/transportdescriptionfactory.h" +#include "p2p/base/transportdescriptionfactory.h" #include -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sslfingerprint.h" +#include "p2p/base/transportdescription.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/sslfingerprint.h" namespace cricket { diff --git a/p2p/base/transportdescriptionfactory.h b/p2p/base/transportdescriptionfactory.h index b9b3c5b2d7..7f020e0862 100644 --- a/p2p/base/transportdescriptionfactory.h +++ b/p2p/base/transportdescriptionfactory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ -#define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ +#ifndef P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ +#define P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/rtc_base/rtccertificate.h" +#include "p2p/base/transportdescription.h" +#include "rtc_base/rtccertificate.h" namespace rtc { class SSLIdentity; @@ -75,4 +75,4 @@ class TransportDescriptionFactory { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ +#endif // P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ diff --git a/p2p/base/transportdescriptionfactory_unittest.cc b/p2p/base/transportdescriptionfactory_unittest.cc index f8f48bc1dc..df01871067 100644 --- a/p2p/base/transportdescriptionfactory_unittest.cc +++ b/p2p/base/transportdescriptionfactory_unittest.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/p2p/base/transportdescriptionfactory.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/transportdescription.h" +#include "p2p/base/transportdescriptionfactory.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ssladapter.h" using cricket::TransportDescriptionFactory; using cricket::TransportDescription; diff --git a/p2p/base/transportinfo.h b/p2p/base/transportinfo.h index c38bf2a300..3657b8dce5 100644 --- a/p2p/base/transportinfo.h +++ b/p2p/base/transportinfo.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTINFO_H_ -#define WEBRTC_P2P_BASE_TRANSPORTINFO_H_ +#ifndef P2P_BASE_TRANSPORTINFO_H_ +#define P2P_BASE_TRANSPORTINFO_H_ #include #include -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/rtc_base/helpers.h" +#include "p2p/base/candidate.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/transportdescription.h" +#include "rtc_base/helpers.h" namespace cricket { @@ -40,4 +40,4 @@ typedef std::vector TransportInfos; } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTINFO_H_ +#endif // P2P_BASE_TRANSPORTINFO_H_ diff --git a/p2p/base/turnport.cc b/p2p/base/turnport.cc index 71a0311d2a..0e68c4631b 100644 --- a/p2p/base/turnport.cc +++ b/p2p/base/turnport.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/turnport.h" +#include "p2p/base/turnport.h" #include #include -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stringencode.h" +#include "p2p/base/common.h" +#include "p2p/base/stun.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/stringencode.h" namespace cricket { diff --git a/p2p/base/turnport.h b/p2p/base/turnport.h index 4d9a811644..895055d5b1 100644 --- a/p2p/base/turnport.h +++ b/p2p/base/turnport.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TURNPORT_H_ -#define WEBRTC_P2P_BASE_TURNPORT_H_ +#ifndef P2P_BASE_TURNPORT_H_ +#define P2P_BASE_TURNPORT_H_ #include #include #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "p2p/base/port.h" +#include "p2p/client/basicportallocator.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/asyncpacketsocket.h" namespace rtc { class AsyncResolver; @@ -315,4 +315,4 @@ class TurnPort : public Port { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TURNPORT_H_ +#endif // P2P_BASE_TURNPORT_H_ diff --git a/p2p/base/turnport_unittest.cc b/p2p/base/turnport_unittest.cc index a8e2937ce4..d6082efd58 100644 --- a/p2p/base/turnport_unittest.cc +++ b/p2p/base/turnport_unittest.cc @@ -14,27 +14,27 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/p2p/base/tcpport.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/base/turnport.h" -#include "webrtc/p2p/base/udpport.h" -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/firewallsocketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/tcpport.h" +#include "p2p/base/testturnserver.h" +#include "p2p/base/turnport.h" +#include "p2p/base/udpport.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/dscp.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::SocketAddress; diff --git a/p2p/base/turnserver.cc b/p2p/base/turnserver.cc index afc5f1d7c2..7e4c43672f 100644 --- a/p2p/base/turnserver.cc +++ b/p2p/base/turnserver.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/turnserver.h" +#include "p2p/base/turnserver.h" #include // for std::tie -#include "webrtc/p2p/base/asyncstuntcpsocket.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/packetsocketfactory.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/asyncstuntcpsocket.h" +#include "p2p/base/common.h" +#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/stun.h" +#include "rtc_base/bind.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread.h" namespace cricket { diff --git a/p2p/base/turnserver.h b/p2p/base/turnserver.h index 0a59f270a5..1e06a93753 100644 --- a/p2p/base/turnserver.h +++ b/p2p/base/turnserver.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TURNSERVER_H_ -#define WEBRTC_P2P_BASE_TURNSERVER_H_ +#ifndef P2P_BASE_TURNSERVER_H_ +#define P2P_BASE_TURNSERVER_H_ #include #include @@ -18,12 +18,12 @@ #include #include -#include "webrtc/p2p/base/portinterface.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "p2p/base/portinterface.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" namespace rtc { class ByteBufferWriter; @@ -301,4 +301,4 @@ class TurnServer : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TURNSERVER_H_ +#endif // P2P_BASE_TURNSERVER_H_ diff --git a/p2p/base/turnserver_unittest.cc b/p2p/base/turnserver_unittest.cc index cac0a5c541..dcd124341d 100644 --- a/p2p/base/turnserver_unittest.cc +++ b/p2p/base/turnserver_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/turnserver.h" -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/turnserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "rtc_base/gunit.h" +#include "rtc_base/virtualsocketserver.h" // NOTE: This is a work in progress. Currently this file only has tests for // TurnServerConnection, a primitive class used by TurnServer. diff --git a/p2p/base/udpport.h b/p2p/base/udpport.h index 9f868644ee..ce55101102 100644 --- a/p2p/base/udpport.h +++ b/p2p/base/udpport.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_UDPPORT_H_ -#define WEBRTC_P2P_BASE_UDPPORT_H_ +#ifndef P2P_BASE_UDPPORT_H_ +#define P2P_BASE_UDPPORT_H_ // StunPort will be handling UDPPort functionality. -#include "webrtc/p2p/base/stunport.h" +#include "p2p/base/stunport.h" -#endif // WEBRTC_P2P_BASE_UDPPORT_H_ +#endif // P2P_BASE_UDPPORT_H_ diff --git a/p2p/base/udptransport.cc b/p2p/base/udptransport.cc index 3df47add4e..de102e2a49 100644 --- a/p2p/base/udptransport.cc +++ b/p2p/base/udptransport.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/udptransport.h" +#include "p2p/base/udptransport.h" #include #include // For std::move. -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_checker.h" namespace cricket { diff --git a/p2p/base/udptransport.h b/p2p/base/udptransport.h index 823c88fcab..f1bf81008d 100644 --- a/p2p/base/udptransport.h +++ b/p2p/base/udptransport.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_UDPTRANSPORT_H_ -#define WEBRTC_P2P_BASE_UDPTRANSPORT_H_ +#ifndef P2P_BASE_UDPTRANSPORT_H_ +#define P2P_BASE_UDPTRANSPORT_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/ortc/udptransportinterface.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" // For PacketOptions. -#include "webrtc/rtc_base/thread_checker.h" +#include "api/optional.h" +#include "api/ortc/udptransportinterface.h" +#include "p2p/base/packettransportinternal.h" +#include "rtc_base/asyncpacketsocket.h" // For PacketOptions. +#include "rtc_base/thread_checker.h" namespace rtc { class AsyncPacketSocket; @@ -86,4 +86,4 @@ class UdpTransport : public rtc::PacketTransportInternal, } // namespace cricket -#endif // WEBRTC_P2P_BASE_UDPTRANSPORT_H_ +#endif // P2P_BASE_UDPTRANSPORT_H_ diff --git a/p2p/base/udptransport_unittest.cc b/p2p/base/udptransport_unittest.cc index 27455e4f8c..d8507c4c6a 100644 --- a/p2p/base/udptransport_unittest.cc +++ b/p2p/base/udptransport_unittest.cc @@ -14,16 +14,16 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/p2p/base/udptransport.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/packettransportinternal.h" +#include "p2p/base/udptransport.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketserver.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" namespace cricket { diff --git a/p2p/client/basicportallocator.cc b/p2p/client/basicportallocator.cc index 992aee6acc..32941f3467 100644 --- a/p2p/client/basicportallocator.cc +++ b/p2p/client/basicportallocator.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/client/basicportallocator.h" +#include "p2p/client/basicportallocator.h" #include #include #include -#include "webrtc/api/umametrics.h" -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/p2p/base/port.h" -#include "webrtc/p2p/base/relayport.h" -#include "webrtc/p2p/base/stunport.h" -#include "webrtc/p2p/base/tcpport.h" -#include "webrtc/p2p/base/turnport.h" -#include "webrtc/p2p/base/udpport.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" +#include "api/umametrics.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/common.h" +#include "p2p/base/port.h" +#include "p2p/base/relayport.h" +#include "p2p/base/stunport.h" +#include "p2p/base/tcpport.h" +#include "p2p/base/turnport.h" +#include "p2p/base/udpport.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" using rtc::CreateRandomId; diff --git a/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h index 5a4999cce2..5ca1409fc0 100644 --- a/p2p/client/basicportallocator.h +++ b/p2p/client/basicportallocator.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_ -#define WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_ +#ifndef P2P_CLIENT_BASICPORTALLOCATOR_H_ +#define P2P_CLIENT_BASICPORTALLOCATOR_H_ #include #include #include -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/portallocator.h" +#include "rtc_base/checks.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/network.h" +#include "rtc_base/thread.h" namespace cricket { @@ -380,4 +380,4 @@ class AllocationSequence : public rtc::MessageHandler, } // namespace cricket -#endif // WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_ +#endif // P2P_CLIENT_BASICPORTALLOCATOR_H_ diff --git a/p2p/client/basicportallocator_unittest.cc b/p2p/client/basicportallocator_unittest.cc index 638a9c8e87..6977c59469 100644 --- a/p2p/client/basicportallocator_unittest.cc +++ b/p2p/client/basicportallocator_unittest.cc @@ -11,28 +11,28 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/p2p/base/testrelayserver.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/firewallsocketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/testrelayserver.h" +#include "p2p/base/teststunserver.h" +#include "p2p/base/testturnserver.h" +#include "p2p/client/basicportallocator.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/natsocketfactory.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/network.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using rtc::IPAddress; using rtc::SocketAddress; diff --git a/p2p/client/socketmonitor.cc b/p2p/client/socketmonitor.cc index 4e26e427e1..6bfa186fae 100644 --- a/p2p/client/socketmonitor.cc +++ b/p2p/client/socketmonitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/client/socketmonitor.h" +#include "p2p/client/socketmonitor.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/p2p/client/socketmonitor.h b/p2p/client/socketmonitor.h index 4cb1899570..57c6d72d1c 100644 --- a/p2p/client/socketmonitor.h +++ b/p2p/client/socketmonitor.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_CLIENT_SOCKETMONITOR_H_ -#define WEBRTC_P2P_CLIENT_SOCKETMONITOR_H_ +#ifndef P2P_CLIENT_SOCKETMONITOR_H_ +#define P2P_CLIENT_SOCKETMONITOR_H_ #include -#include "webrtc/p2p/base/jseptransport.h" // for ConnectionInfos -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/jseptransport.h" // for ConnectionInfos +#include "rtc_base/criticalsection.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" // TODO(pthatcher): Move these to connectionmonitor.h and // connectionmonitor.cc, or just move them into channel.cc @@ -59,4 +59,4 @@ public: } // namespace cricket -#endif // WEBRTC_P2P_CLIENT_SOCKETMONITOR_H_ +#endif // P2P_CLIENT_SOCKETMONITOR_H_ diff --git a/p2p/quic/quicconnectionhelper.cc b/p2p/quic/quicconnectionhelper.cc index 2b408200c5..015d3f202b 100644 --- a/p2p/quic/quicconnectionhelper.cc +++ b/p2p/quic/quicconnectionhelper.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quicconnectionhelper.h" +#include "p2p/quic/quicconnectionhelper.h" namespace cricket { diff --git a/p2p/quic/quicconnectionhelper.h b/p2p/quic/quicconnectionhelper.h index 07894f0d25..964fabb54b 100644 --- a/p2p/quic/quicconnectionhelper.h +++ b/p2p/quic/quicconnectionhelper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_QUIC_QUICCONNECTIONHELPER_H_ -#define WEBRTC_P2P_QUIC_QUICCONNECTIONHELPER_H_ +#ifndef P2P_QUIC_QUICCONNECTIONHELPER_H_ +#define P2P_QUIC_QUICCONNECTIONHELPER_H_ #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_alarm.h" #include "net/quic/quic_clock.h" #include "net/quic/quic_connection.h" #include "net/quic/quic_simple_buffer_allocator.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/thread.h" namespace cricket { @@ -69,4 +69,4 @@ class QuicConnectionHelper : public net::QuicConnectionHelperInterface { } // namespace cricket -#endif // WEBRTC_P2P_QUIC_QUICCONNECTIONHELPER_H_ +#endif // P2P_QUIC_QUICCONNECTIONHELPER_H_ diff --git a/p2p/quic/quicconnectionhelper_unittest.cc b/p2p/quic/quicconnectionhelper_unittest.cc index 910caca8b9..8b1b14abfe 100644 --- a/p2p/quic/quicconnectionhelper_unittest.cc +++ b/p2p/quic/quicconnectionhelper_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/p2p/quic/quicconnectionhelper.h" +#include "p2p/quic/quicconnectionhelper.h" #include "net/quic/quic_time.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" using cricket::QuicAlarm; using cricket::QuicConnectionHelper; diff --git a/p2p/quic/quicsession.cc b/p2p/quic/quicsession.cc index c7860ef060..36583dddeb 100644 --- a/p2p/quic/quicsession.cc +++ b/p2p/quic/quicsession.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quicsession.h" +#include "p2p/quic/quicsession.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" namespace cricket { diff --git a/p2p/quic/quicsession.h b/p2p/quic/quicsession.h index 99195a8d8f..9f6839a73e 100644 --- a/p2p/quic/quicsession.h +++ b/p2p/quic/quicsession.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_QUIC_QUICSESSION_H_ -#define WEBRTC_P2P_QUIC_QUICSESSION_H_ +#ifndef P2P_QUIC_QUICSESSION_H_ +#define P2P_QUIC_QUICSESSION_H_ #include #include @@ -18,10 +18,10 @@ #include "net/quic/quic_crypto_server_stream.h" #include "net/quic/quic_crypto_stream.h" #include "net/quic/quic_session.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "p2p/quic/reliablequicstream.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/sslidentity.h" namespace cricket { @@ -94,4 +94,4 @@ class QuicSession : public net::QuicSession, public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_QUIC_QUICSESSION_H_ +#endif // P2P_QUIC_QUICSESSION_H_ diff --git a/p2p/quic/quicsession_unittest.cc b/p2p/quic/quicsession_unittest.cc index 1e906fe24d..7762ba0e85 100644 --- a/p2p/quic/quicsession_unittest.cc +++ b/p2p/quic/quicsession_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quicsession.h" +#include "p2p/quic/quicsession.h" #include #include @@ -23,10 +23,10 @@ #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_crypto_server_stream.h" -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/p2p/quic/quicconnectionhelper.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/rtc_base/gunit.h" +#include "p2p/base/faketransportcontroller.h" +#include "p2p/quic/quicconnectionhelper.h" +#include "p2p/quic/reliablequicstream.h" +#include "rtc_base/gunit.h" using net::IPAddress; using net::IPEndPoint; diff --git a/p2p/quic/quictransport.cc b/p2p/quic/quictransport.cc index 8240f589fc..714c2676f2 100644 --- a/p2p/quic/quictransport.cc +++ b/p2p/quic/quictransport.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quictransport.h" +#include "p2p/quic/quictransport.h" -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/rtc_base/checks.h" +#include "p2p/base/p2ptransportchannel.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/p2p/quic/quictransport.h b/p2p/quic/quictransport.h index 5e834e02f5..6f81d0e273 100644 --- a/p2p/quic/quictransport.h +++ b/p2p/quic/quictransport.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_QUIC_QUICTRANSPORT_H_ -#define WEBRTC_P2P_QUIC_QUICTRANSPORT_H_ +#ifndef P2P_QUIC_QUICTRANSPORT_H_ +#define P2P_QUIC_QUICTRANSPORT_H_ #include #include #include -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/quic/quictransportchannel.h" +#include "p2p/base/jseptransport.h" +#include "p2p/quic/quictransportchannel.h" namespace cricket { @@ -65,4 +65,4 @@ class QuicTransport : public Transport { } // namespace cricket -#endif // WEBRTC_P2P_QUIC_QUICTRANSPORT_H_ +#endif // P2P_QUIC_QUICTRANSPORT_H_ diff --git a/p2p/quic/quictransport_unittest.cc b/p2p/quic/quictransport_unittest.cc index 3328556fc7..4fb566d07b 100644 --- a/p2p/quic/quictransport_unittest.cc +++ b/p2p/quic/quictransport_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quictransport.h" +#include "p2p/quic/quictransport.h" #include #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sslidentity.h" using cricket::TransportChannelImpl; using cricket::QuicTransport; diff --git a/p2p/quic/quictransportchannel.cc b/p2p/quic/quictransportchannel.cc index f875ab607e..1f32e2a794 100644 --- a/p2p/quic/quictransportchannel.cc +++ b/p2p/quic/quictransportchannel.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quictransportchannel.h" +#include "p2p/quic/quictransportchannel.h" #include @@ -21,12 +21,12 @@ #include "net/quic/quic_crypto_server_stream.h" #include "net/quic/quic_packet_writer.h" #include "net/quic/quic_protocol.h" -#include "webrtc/p2p/base/common.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/common.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/socket.h" +#include "rtc_base/thread.h" namespace { diff --git a/p2p/quic/quictransportchannel.h b/p2p/quic/quictransportchannel.h index 76560e9f03..2099bf9f4b 100644 --- a/p2p/quic/quictransportchannel.h +++ b/p2p/quic/quictransportchannel.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_QUIC_QUICTRANSPORTCHANNEL_H_ -#define WEBRTC_P2P_QUIC_QUICTRANSPORTCHANNEL_H_ +#ifndef P2P_QUIC_QUICTRANSPORTCHANNEL_H_ +#define P2P_QUIC_QUICTRANSPORTCHANNEL_H_ #include #include @@ -17,11 +17,11 @@ #include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_packet_writer.h" -#include "webrtc/api/optional.h" -#include "webrtc/p2p/base/transportchannelimpl.h" -#include "webrtc/p2p/quic/quicconnectionhelper.h" -#include "webrtc/p2p/quic/quicsession.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "p2p/base/transportchannelimpl.h" +#include "p2p/quic/quicconnectionhelper.h" +#include "p2p/quic/quicsession.h" +#include "rtc_base/constructormagic.h" namespace cricket { @@ -305,4 +305,4 @@ class QuicTransportChannel : public TransportChannelImpl, } // namespace cricket -#endif // WEBRTC_P2P_QUIC_QUICTRANSPORTCHANNEL_H_ +#endif // P2P_QUIC_QUICTRANSPORTCHANNEL_H_ diff --git a/p2p/quic/quictransportchannel_unittest.cc b/p2p/quic/quictransportchannel_unittest.cc index 9ed21f177f..4e583b5ab1 100644 --- a/p2p/quic/quictransportchannel_unittest.cc +++ b/p2p/quic/quictransportchannel_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/quictransportchannel.h" +#include "p2p/quic/quictransportchannel.h" #include #include #include #include -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "p2p/base/faketransportcontroller.h" +#include "rtc_base/gunit.h" +#include "rtc_base/sslidentity.h" using cricket::ConnectionRole; using cricket::IceRole; diff --git a/p2p/quic/reliablequicstream.cc b/p2p/quic/reliablequicstream.cc index 23c2df2455..3dadf337ef 100644 --- a/p2p/quic/reliablequicstream.cc +++ b/p2p/quic/reliablequicstream.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/reliablequicstream.h" +#include "p2p/quic/reliablequicstream.h" #include #include "net/quic/quic_session.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/p2p/quic/reliablequicstream.h b/p2p/quic/reliablequicstream.h index a2d0b57444..2fcc701a4d 100644 --- a/p2p/quic/reliablequicstream.h +++ b/p2p/quic/reliablequicstream.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_ -#define WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_ +#ifndef P2P_QUIC_RELIABLEQUICSTREAM_H_ +#define P2P_QUIC_RELIABLEQUICSTREAM_H_ #include "net/quic/reliable_quic_stream.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/stream.h" namespace cricket { @@ -53,4 +53,4 @@ class ReliableQuicStream : public net::ReliableQuicStream, } // namespace cricket -#endif // WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_ +#endif // P2P_QUIC_RELIABLEQUICSTREAM_H_ diff --git a/p2p/quic/reliablequicstream_unittest.cc b/p2p/quic/reliablequicstream_unittest.cc index 4357bcd74a..3f24001bff 100644 --- a/p2p/quic/reliablequicstream_unittest.cc +++ b/p2p/quic/reliablequicstream_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/quic/reliablequicstream.h" +#include "p2p/quic/reliablequicstream.h" #include #include @@ -17,11 +17,11 @@ #include "net/quic/quic_connection.h" #include "net/quic/quic_protocol.h" #include "net/quic/quic_session.h" -#include "webrtc/p2p/quic/quicconnectionhelper.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/stream.h" +#include "p2p/quic/quicconnectionhelper.h" +#include "rtc_base/buffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/stream.h" using cricket::QuicConnectionHelper; using cricket::ReliableQuicStream; diff --git a/p2p/stunprober/stunprober.cc b/p2p/stunprober/stunprober.cc index 54c8b1ccda..47e0bbe13b 100644 --- a/p2p/stunprober/stunprober.cc +++ b/p2p/stunprober/stunprober.cc @@ -13,18 +13,18 @@ #include #include -#include "webrtc/p2p/base/packetsocketfactory.h" -#include "webrtc/p2p/base/stun.h" -#include "webrtc/p2p/stunprober/stunprober.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/asyncresolverinterface.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/stun.h" +#include "p2p/stunprober/stunprober.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncresolverinterface.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace stunprober { diff --git a/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h index b32c8b2dcd..e78649d17f 100644 --- a/p2p/stunprober/stunprober.h +++ b/p2p/stunprober/stunprober.h @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_STUNPROBER_STUNPROBER_H_ -#define WEBRTC_P2P_STUNPROBER_STUNPROBER_H_ +#ifndef P2P_STUNPROBER_STUNPROBER_H_ +#define P2P_STUNPROBER_STUNPROBER_H_ #include #include #include -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/typedefs.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/callback.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/network.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_checker.h" +#include "typedefs.h" namespace rtc { class AsyncPacketSocket; @@ -253,4 +253,4 @@ class StunProber : public sigslot::has_slots<> { } // namespace stunprober -#endif // WEBRTC_P2P_STUNPROBER_STUNPROBER_H_ +#endif // P2P_STUNPROBER_STUNPROBER_H_ diff --git a/p2p/stunprober/stunprober_unittest.cc b/p2p/stunprober/stunprober_unittest.cc index 2252e617aa..9e87549773 100644 --- a/p2p/stunprober/stunprober_unittest.cc +++ b/p2p/stunprober/stunprober_unittest.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/p2p/stunprober/stunprober.h" -#include "webrtc/rtc_base/asyncresolverinterface.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/teststunserver.h" +#include "p2p/stunprober/stunprober.h" +#include "rtc_base/asyncresolverinterface.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/virtualsocketserver.h" using stunprober::StunProber; using stunprober::AsyncCallback; diff --git a/pc/DEPS b/pc/DEPS index 20bbba2cc6..dfadc23778 100644 --- a/pc/DEPS +++ b/pc/DEPS @@ -1,24 +1,24 @@ include_rules = [ "+third_party/libsrtp", - "+webrtc/api", - "+webrtc/call", - "+webrtc/common_video/h264", - "+webrtc/logging/rtc_event_log", - "+webrtc/logging/rtc_event_log", - "+webrtc/media", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_processing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/video_coding", - "+webrtc/modules/video_render", - "+webrtc/p2p", - "+webrtc/system_wrappers", + "+api", + "+call", + "+common_video/h264", + "+logging/rtc_event_log", + "+logging/rtc_event_log", + "+media", + "+modules/audio_device", + "+modules/audio_processing", + "+modules/rtp_rtcp", + "+modules/video_coding", + "+modules/video_render", + "+p2p", + "+system_wrappers", ] specific_include_rules = { "androidtestinitializer\.cc": [ "+base/android", # Allowed only for Android tests. - "+webrtc/voice_engine", + "+voice_engine", ], "srtpfilter_unittest\.cc": [ "+crypto", @@ -27,9 +27,9 @@ specific_include_rules = { # TODO(ossu): Remove these exceptions when audio_encoder_factory.h # has moved to api/. "peerconnectionfactory\.cc": [ - "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h", + "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h", ], "peerconnectioninterface_unittest\.cc": [ - "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h", + "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h", ], } diff --git a/pc/audiomonitor.cc b/pc/audiomonitor.cc index 9c610bc882..a5bffd7b58 100644 --- a/pc/audiomonitor.cc +++ b/pc/audiomonitor.cc @@ -9,8 +9,8 @@ */ #include -#include "webrtc/pc/audiomonitor.h" -#include "webrtc/pc/voicechannel.h" +#include "pc/audiomonitor.h" +#include "pc/voicechannel.h" namespace cricket { diff --git a/pc/audiomonitor.h b/pc/audiomonitor.h index 86e8ba2796..26212afc72 100644 --- a/pc/audiomonitor.h +++ b/pc/audiomonitor.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_AUDIOMONITOR_H_ -#define WEBRTC_PC_AUDIOMONITOR_H_ +#ifndef PC_AUDIOMONITOR_H_ +#define PC_AUDIOMONITOR_H_ #include #include -#include "webrtc/p2p/base/port.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/port.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace cricket { @@ -57,4 +57,4 @@ class AudioMonitor : public rtc::MessageHandler, } // namespace cricket -#endif // WEBRTC_PC_AUDIOMONITOR_H_ +#endif // PC_AUDIOMONITOR_H_ diff --git a/pc/audiotrack.cc b/pc/audiotrack.cc index 02607da676..8e24f0b376 100644 --- a/pc/audiotrack.cc +++ b/pc/audiotrack.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/audiotrack.h" +#include "pc/audiotrack.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" using rtc::scoped_refptr; diff --git a/pc/audiotrack.h b/pc/audiotrack.h index 8dde2efc2f..b7ad0aafaa 100644 --- a/pc/audiotrack.h +++ b/pc/audiotrack.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_AUDIOTRACK_H_ -#define WEBRTC_PC_AUDIOTRACK_H_ +#ifndef PC_AUDIOTRACK_H_ +#define PC_AUDIOTRACK_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" -#include "webrtc/pc/mediastreamtrack.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" +#include "pc/mediastreamtrack.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -56,4 +56,4 @@ class AudioTrack : public MediaStreamTrack, } // namespace webrtc -#endif // WEBRTC_PC_AUDIOTRACK_H_ +#endif // PC_AUDIOTRACK_H_ diff --git a/pc/bundlefilter.cc b/pc/bundlefilter.cc index 3b7dcd69e9..7791da6274 100644 --- a/pc/bundlefilter.cc +++ b/pc/bundlefilter.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/bundlefilter.h" +#include "pc/bundlefilter.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/rtc_base/logging.h" +#include "media/base/rtputils.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/pc/bundlefilter.h b/pc/bundlefilter.h index b4ad824b9c..7decbba8a4 100644 --- a/pc/bundlefilter.h +++ b/pc/bundlefilter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_BUNDLEFILTER_H_ -#define WEBRTC_PC_BUNDLEFILTER_H_ +#ifndef PC_BUNDLEFILTER_H_ +#define PC_BUNDLEFILTER_H_ #include #include #include -#include "webrtc/media/base/streamparams.h" -#include "webrtc/rtc_base/basictypes.h" +#include "media/base/streamparams.h" +#include "rtc_base/basictypes.h" namespace cricket { @@ -51,4 +51,4 @@ class BundleFilter { } // namespace cricket -#endif // WEBRTC_PC_BUNDLEFILTER_H_ +#endif // PC_BUNDLEFILTER_H_ diff --git a/pc/bundlefilter_unittest.cc b/pc/bundlefilter_unittest.cc index f0f56a550b..2b1af5c3a3 100644 --- a/pc/bundlefilter_unittest.cc +++ b/pc/bundlefilter_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/bundlefilter.h" -#include "webrtc/rtc_base/gunit.h" +#include "pc/bundlefilter.h" +#include "rtc_base/gunit.h" using cricket::StreamParams; diff --git a/pc/channel.cc b/pc/channel.cc index 8e829259d9..7ddf5de7dd 100644 --- a/pc/channel.cc +++ b/pc/channel.cc @@ -12,27 +12,27 @@ #include #include -#include "webrtc/pc/channel.h" +#include "pc/channel.h" -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkroute.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/call/audio_sink.h" +#include "media/base/mediaconstants.h" +#include "media/base/rtputils.h" +#include "rtc_base/bind.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/dscp.h" +#include "rtc_base/logging.h" +#include "rtc_base/networkroute.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/trace_event.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. -#include "webrtc/media/engine/webrtcvoiceengine.h" // nogncheck -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/rtptransport.h" -#include "webrtc/pc/srtptransport.h" +#include "media/engine/webrtcvoiceengine.h" // nogncheck +#include "p2p/base/packettransportinternal.h" +#include "pc/channelmanager.h" +#include "pc/rtptransport.h" +#include "pc/srtptransport.h" namespace cricket { using rtc::Bind; diff --git a/pc/channel.h b/pc/channel.h index 4ff21fec08..613597b990 100644 --- a/pc/channel.h +++ b/pc/channel.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_CHANNEL_H_ -#define WEBRTC_PC_CHANNEL_H_ +#ifndef PC_CHANNEL_H_ +#define PC_CHANNEL_H_ #include #include @@ -18,28 +18,28 @@ #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/base/streamparams.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/p2p/base/dtlstransportinternal.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/p2p/base/transportcontroller.h" -#include "webrtc/p2p/client/socketmonitor.h" -#include "webrtc/pc/audiomonitor.h" -#include "webrtc/pc/mediamonitor.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/rtcpmuxfilter.h" -#include "webrtc/pc/srtpfilter.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/window.h" +#include "api/call/audio_sink.h" +#include "api/rtpreceiverinterface.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaengine.h" +#include "media/base/streamparams.h" +#include "media/base/videosinkinterface.h" +#include "media/base/videosourceinterface.h" +#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/packettransportinternal.h" +#include "p2p/base/transportcontroller.h" +#include "p2p/client/socketmonitor.h" +#include "pc/audiomonitor.h" +#include "pc/mediamonitor.h" +#include "pc/mediasession.h" +#include "pc/rtcpmuxfilter.h" +#include "pc/srtpfilter.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/network.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/window.h" namespace webrtc { class AudioSinkInterface; @@ -723,4 +723,4 @@ class RtpDataChannel : public BaseChannel { } // namespace cricket -#endif // WEBRTC_PC_CHANNEL_H_ +#endif // PC_CHANNEL_H_ diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc index b16e60d031..b5517da571 100644 --- a/pc/channel_unittest.cc +++ b/pc/channel_unittest.cc @@ -10,21 +10,21 @@ #include -#include "webrtc/api/array_view.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakertp.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/p2p/base/fakecandidatepair.h" -#include "webrtc/p2p/base/fakedtlstransport.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "api/array_view.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakertp.h" +#include "media/base/mediachannel.h" +#include "media/base/testutils.h" +#include "p2p/base/fakecandidatepair.h" +#include "p2p/base/fakedtlstransport.h" +#include "p2p/base/fakepackettransport.h" +#include "pc/channel.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/sslstreamadapter.h" using cricket::CA_OFFER; using cricket::CA_PRANSWER; diff --git a/pc/channelmanager.cc b/pc/channelmanager.cc index 197e7228c0..522f19736c 100644 --- a/pc/channelmanager.cc +++ b/pc/channelmanager.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/channelmanager.h" +#include "pc/channelmanager.h" #include -#include "webrtc/media/base/device.h" -#include "webrtc/media/base/rtpdataengine.h" -#include "webrtc/pc/srtpfilter.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "media/base/device.h" +#include "media/base/rtpdataengine.h" +#include "pc/srtpfilter.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/trace_event.h" namespace cricket { diff --git a/pc/channelmanager.h b/pc/channelmanager.h index eef90fd418..380dad887d 100644 --- a/pc/channelmanager.h +++ b/pc/channelmanager.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_CHANNELMANAGER_H_ -#define WEBRTC_PC_CHANNELMANAGER_H_ +#ifndef PC_CHANNELMANAGER_H_ +#define PC_CHANNELMANAGER_H_ #include #include #include -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/pc/voicechannel.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/thread.h" +#include "media/base/mediaengine.h" +#include "pc/voicechannel.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/thread.h" namespace cricket { @@ -223,4 +223,4 @@ class ChannelManager { } // namespace cricket -#endif // WEBRTC_PC_CHANNELMANAGER_H_ +#endif // PC_CHANNELMANAGER_H_ diff --git a/pc/channelmanager_unittest.cc b/pc/channelmanager_unittest.cc index b322407b46..55fc7ff6c3 100644 --- a/pc/channelmanager_unittest.cc +++ b/pc/channelmanager_unittest.cc @@ -10,16 +10,16 @@ #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakevideocapturer.h" +#include "media/base/testutils.h" +#include "media/engine/fakewebrtccall.h" +#include "p2p/base/faketransportcontroller.h" +#include "pc/channelmanager.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" namespace { const bool kDefaultSrtpRequired = true; diff --git a/pc/createpeerconnectionfactory.cc b/pc/createpeerconnectionfactory.cc index 11aa1213a2..a62a7ae6f0 100644 --- a/pc/createpeerconnectionfactory.cc +++ b/pc/createpeerconnectionfactory.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/call/callfactoryinterface.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/peerconnectioninterface.h" +#include "call/callfactoryinterface.h" +#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "media/engine/webrtcmediaengine.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/bind.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/currentspeakermonitor.cc b/pc/currentspeakermonitor.cc index d52e79d7af..9765d2e827 100644 --- a/pc/currentspeakermonitor.cc +++ b/pc/currentspeakermonitor.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/currentspeakermonitor.h" +#include "pc/currentspeakermonitor.h" #include -#include "webrtc/media/base/streamparams.h" -#include "webrtc/pc/audiomonitor.h" -#include "webrtc/rtc_base/logging.h" +#include "media/base/streamparams.h" +#include "pc/audiomonitor.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/pc/currentspeakermonitor.h b/pc/currentspeakermonitor.h index 001035f57e..589fb1b1d5 100644 --- a/pc/currentspeakermonitor.h +++ b/pc/currentspeakermonitor.h @@ -11,14 +11,14 @@ // CurrentSpeakerMonitor monitors the audio levels for a session and determines // which participant is currently speaking. -#ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ -#define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ +#ifndef PC_CURRENTSPEAKERMONITOR_H_ +#define PC_CURRENTSPEAKERMONITOR_H_ #include #include -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/sigslot.h" namespace cricket { @@ -93,4 +93,4 @@ class CurrentSpeakerMonitor : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ +#endif // PC_CURRENTSPEAKERMONITOR_H_ diff --git a/pc/currentspeakermonitor_unittest.cc b/pc/currentspeakermonitor_unittest.cc index 547b5a298f..88b18211ab 100644 --- a/pc/currentspeakermonitor_unittest.cc +++ b/pc/currentspeakermonitor_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/currentspeakermonitor.h" -#include "webrtc/pc/audiomonitor.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" +#include "pc/currentspeakermonitor.h" +#include "pc/audiomonitor.h" +#include "rtc_base/gunit.h" +#include "rtc_base/thread.h" namespace cricket { diff --git a/pc/datachannel.cc b/pc/datachannel.cc index 28c090dee6..c342908580 100644 --- a/pc/datachannel.cc +++ b/pc/datachannel.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/datachannel.h" +#include "pc/datachannel.h" #include #include -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/pc/sctputils.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/refcount.h" +#include "media/sctp/sctptransportinternal.h" +#include "pc/sctputils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcount.h" namespace webrtc { diff --git a/pc/datachannel.h b/pc/datachannel.h index 13f5b881fa..1af90dab6e 100644 --- a/pc/datachannel.h +++ b/pc/datachannel.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_DATACHANNEL_H_ -#define WEBRTC_PC_DATACHANNEL_H_ +#ifndef PC_DATACHANNEL_H_ +#define PC_DATACHANNEL_H_ #include #include #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/api/proxy.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/datachannelinterface.h" +#include "api/proxy.h" +#include "media/base/mediachannel.h" +#include "pc/channel.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -295,4 +295,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // WEBRTC_PC_DATACHANNEL_H_ +#endif // PC_DATACHANNEL_H_ diff --git a/pc/datachannel_unittest.cc b/pc/datachannel_unittest.cc index 8776dce87e..7acfa8e0f7 100644 --- a/pc/datachannel_unittest.cc +++ b/pc/datachannel_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/pc/datachannel.h" -#include "webrtc/pc/sctputils.h" -#include "webrtc/pc/test/fakedatachannelprovider.h" -#include "webrtc/rtc_base/gunit.h" +#include "pc/datachannel.h" +#include "pc/sctputils.h" +#include "pc/test/fakedatachannelprovider.h" +#include "rtc_base/gunit.h" using webrtc::DataChannel; using webrtc::SctpSidAllocator; diff --git a/pc/dtmfsender.cc b/pc/dtmfsender.cc index 3a95c2ad34..14002069a9 100644 --- a/pc/dtmfsender.cc +++ b/pc/dtmfsender.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/dtmfsender.h" +#include "pc/dtmfsender.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/dtmfsender.h b/pc/dtmfsender.h index 28156f3055..ff7f0ac049 100644 --- a/pc/dtmfsender.h +++ b/pc/dtmfsender.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_DTMFSENDER_H_ -#define WEBRTC_PC_DTMFSENDER_H_ +#ifndef PC_DTMFSENDER_H_ +#define PC_DTMFSENDER_H_ #include -#include "webrtc/api/dtmfsenderinterface.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/proxy.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/refcount.h" +#include "api/dtmfsenderinterface.h" +#include "api/mediastreaminterface.h" +#include "api/proxy.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/refcount.h" // DtmfSender is the native implementation of the RTCDTMFSender defined by // the WebRTC W3C Editor's Draft. @@ -121,4 +121,4 @@ bool GetDtmfCode(char tone, int* code); } // namespace webrtc -#endif // WEBRTC_PC_DTMFSENDER_H_ +#endif // PC_DTMFSENDER_H_ diff --git a/pc/dtmfsender_unittest.cc b/pc/dtmfsender_unittest.cc index 400444ee2c..21343f6900 100644 --- a/pc/dtmfsender_unittest.cc +++ b/pc/dtmfsender_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/dtmfsender.h" +#include "pc/dtmfsender.h" #include #include #include #include -#include "webrtc/pc/audiotrack.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "pc/audiotrack.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" using webrtc::AudioTrackInterface; using webrtc::AudioTrack; diff --git a/pc/externalhmac.cc b/pc/externalhmac.cc index 34cab08bef..6c6d000a05 100644 --- a/pc/externalhmac.cc +++ b/pc/externalhmac.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/externalhmac.h" +#include "pc/externalhmac.h" #include // For malloc/free. -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" #include "third_party/libsrtp/crypto/include/crypto_kernel.h" #include "third_party/libsrtp/include/srtp.h" diff --git a/pc/externalhmac.h b/pc/externalhmac.h index 4a6e817aff..7fb9f25fbf 100644 --- a/pc/externalhmac.h +++ b/pc/externalhmac.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_EXTERNALHMAC_H_ -#define WEBRTC_PC_EXTERNALHMAC_H_ +#ifndef PC_EXTERNALHMAC_H_ +#define PC_EXTERNALHMAC_H_ // External libsrtp HMAC auth module which implements methods defined in // auth_type_t. @@ -67,4 +67,4 @@ srtp_err_status_t external_hmac_compute(ExternalHmacContext* state, srtp_err_status_t external_crypto_init(); -#endif // WEBRTC_PC_EXTERNALHMAC_H_ +#endif // PC_EXTERNALHMAC_H_ diff --git a/pc/iceserverparsing.cc b/pc/iceserverparsing.cc index 9b802fc591..ccc1e17e73 100644 --- a/pc/iceserverparsing.cc +++ b/pc/iceserverparsing.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/iceserverparsing.h" +#include "pc/iceserverparsing.h" #include // For std::isdigit. #include -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" namespace webrtc { diff --git a/pc/iceserverparsing.h b/pc/iceserverparsing.h index c8feefd090..7e14dc237b 100644 --- a/pc/iceserverparsing.h +++ b/pc/iceserverparsing.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_ICESERVERPARSING_H_ -#define WEBRTC_PC_ICESERVERPARSING_H_ +#ifndef PC_ICESERVERPARSING_H_ +#define PC_ICESERVERPARSING_H_ #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/rtcerror.h" +#include "api/peerconnectioninterface.h" +#include "api/rtcerror.h" namespace webrtc { @@ -31,4 +31,4 @@ RTCErrorType ParseIceServers( } // namespace webrtc -#endif // WEBRTC_PC_ICESERVERPARSING_H_ +#endif // PC_ICESERVERPARSING_H_ diff --git a/pc/iceserverparsing_unittest.cc b/pc/iceserverparsing_unittest.cc index d4339638fb..4ec7a891df 100644 --- a/pc/iceserverparsing_unittest.cc +++ b/pc/iceserverparsing_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/pc/iceserverparsing.h" -#include "webrtc/rtc_base/gunit.h" +#include "pc/iceserverparsing.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/pc/jsepicecandidate.cc b/pc/jsepicecandidate.cc index dbe05e40d7..48feb89a69 100644 --- a/pc/jsepicecandidate.cc +++ b/pc/jsepicecandidate.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/jsepicecandidate.h" +#include "api/jsepicecandidate.h" #include -#include "webrtc/pc/webrtcsdp.h" -#include "webrtc/rtc_base/stringencode.h" +#include "pc/webrtcsdp.h" +#include "rtc_base/stringencode.h" namespace webrtc { diff --git a/pc/jsepsessiondescription.cc b/pc/jsepsessiondescription.cc index bdb36955b0..3844f9494a 100644 --- a/pc/jsepsessiondescription.cc +++ b/pc/jsepsessiondescription.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/jsepsessiondescription.h" +#include "api/jsepsessiondescription.h" #include -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/webrtcsdp.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/stringencode.h" +#include "pc/mediasession.h" +#include "pc/webrtcsdp.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/stringencode.h" using cricket::SessionDescription; diff --git a/pc/jsepsessiondescription_unittest.cc b/pc/jsepsessiondescription_unittest.cc index 62052af105..473e7a0fc9 100644 --- a/pc/jsepsessiondescription_unittest.cc +++ b/pc/jsepsessiondescription_unittest.cc @@ -11,17 +11,17 @@ #include #include -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/webrtcsdp.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/stringencode.h" +#include "api/jsepicecandidate.h" +#include "api/jsepsessiondescription.h" +#include "api/webrtcsdp.h" +#include "p2p/base/candidate.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/sessiondescription.h" +#include "pc/mediasession.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/stringencode.h" using webrtc::IceCandidateCollection; using webrtc::IceCandidateInterface; diff --git a/pc/localaudiosource.cc b/pc/localaudiosource.cc index 5454cdfaae..5c86dd30f9 100644 --- a/pc/localaudiosource.cc +++ b/pc/localaudiosource.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/localaudiosource.h" +#include "pc/localaudiosource.h" #include -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/media/base/mediaengine.h" +#include "api/mediaconstraintsinterface.h" +#include "media/base/mediaengine.h" using webrtc::MediaConstraintsInterface; using webrtc::MediaSourceInterface; diff --git a/pc/localaudiosource.h b/pc/localaudiosource.h index ffa465df3d..cd17330e1f 100644 --- a/pc/localaudiosource.h +++ b/pc/localaudiosource.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_LOCALAUDIOSOURCE_H_ -#define WEBRTC_PC_LOCALAUDIOSOURCE_H_ +#ifndef PC_LOCALAUDIOSOURCE_H_ +#define PC_LOCALAUDIOSOURCE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" -#include "webrtc/media/base/mediachannel.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" +#include "media/base/mediachannel.h" // LocalAudioSource implements AudioSourceInterface. // This contains settings for switching audio processing on and off. @@ -52,4 +52,4 @@ class LocalAudioSource : public Notifier { } // namespace webrtc -#endif // WEBRTC_PC_LOCALAUDIOSOURCE_H_ +#endif // PC_LOCALAUDIOSOURCE_H_ diff --git a/pc/localaudiosource_unittest.cc b/pc/localaudiosource_unittest.cc index 9b26095f49..7b74bcedfd 100644 --- a/pc/localaudiosource_unittest.cc +++ b/pc/localaudiosource_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/localaudiosource.h" +#include "pc/localaudiosource.h" #include #include -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/test/fakeconstraints.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakevideorenderer.h" +#include "rtc_base/gunit.h" using webrtc::LocalAudioSource; using webrtc::MediaConstraintsInterface; diff --git a/pc/mediaconstraintsinterface_unittest.cc b/pc/mediaconstraintsinterface_unittest.cc index 81b5fb47a0..21c547adba 100644 --- a/pc/mediaconstraintsinterface_unittest.cc +++ b/pc/mediaconstraintsinterface_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediaconstraintsinterface.h" +#include "api/mediaconstraintsinterface.h" -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/test/fakeconstraints.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/pc/mediamonitor.cc b/pc/mediamonitor.cc index 22e16dc840..e2e3da8b20 100644 --- a/pc/mediamonitor.cc +++ b/pc/mediamonitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/mediamonitor.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/rtc_base/checks.h" +#include "pc/mediamonitor.h" +#include "pc/channelmanager.h" +#include "rtc_base/checks.h" namespace cricket { diff --git a/pc/mediamonitor.h b/pc/mediamonitor.h index b4efefb01b..fcd24106aa 100644 --- a/pc/mediamonitor.h +++ b/pc/mediamonitor.h @@ -10,14 +10,14 @@ // Class to collect statistics from a media channel -#ifndef WEBRTC_PC_MEDIAMONITOR_H_ -#define WEBRTC_PC_MEDIAMONITOR_H_ +#ifndef PC_MEDIAMONITOR_H_ +#define PC_MEDIAMONITOR_H_ -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "media/base/mediachannel.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" namespace cricket { @@ -79,4 +79,4 @@ typedef MediaMonitorT DataMediaMonitor; } // namespace cricket -#endif // WEBRTC_PC_MEDIAMONITOR_H_ +#endif // PC_MEDIAMONITOR_H_ diff --git a/pc/mediasession.cc b/pc/mediasession.cc index e1c3dd452b..45a8e946af 100644 --- a/pc/mediasession.cc +++ b/pc/mediasession.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/mediasession.h" +#include "pc/mediasession.h" #include // For std::find_if, std::sort. #include @@ -18,19 +18,19 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/common_types.h" -#include "webrtc/media/base/cryptoparams.h" -#include "webrtc/media/base/h264_profile_level_id.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/srtpfilter.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/optional.h" +#include "common_types.h" +#include "media/base/cryptoparams.h" +#include "media/base/h264_profile_level_id.h" +#include "media/base/mediaconstants.h" +#include "p2p/base/p2pconstants.h" +#include "pc/channelmanager.h" +#include "pc/srtpfilter.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" namespace { const char kInline[] = "inline:"; diff --git a/pc/mediasession.h b/pc/mediasession.h index ee7183f92f..6de9de9e30 100644 --- a/pc/mediasession.h +++ b/pc/mediasession.h @@ -10,24 +10,24 @@ // Types and classes used in media session descriptions. -#ifndef WEBRTC_PC_MEDIASESSION_H_ -#define WEBRTC_PC_MEDIASESSION_H_ +#ifndef PC_MEDIASESSION_H_ +#define PC_MEDIASESSION_H_ #include #include #include #include -#include "webrtc/api/mediatypes.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/cryptoparams.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/mediaengine.h" // For DataChannelType -#include "webrtc/media/base/streamparams.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/p2p/base/jseptransport.h" -#include "webrtc/p2p/base/transportdescriptionfactory.h" +#include "api/mediatypes.h" +#include "media/base/codec.h" +#include "media/base/cryptoparams.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaconstants.h" +#include "media/base/mediaengine.h" // For DataChannelType +#include "media/base/streamparams.h" +#include "p2p/base/sessiondescription.h" +#include "p2p/base/jseptransport.h" +#include "p2p/base/transportdescriptionfactory.h" namespace cricket { @@ -651,4 +651,4 @@ void GetSupportedDataSdesCryptoSuiteNames( } // namespace cricket -#endif // WEBRTC_PC_MEDIASESSION_H_ +#endif // PC_MEDIASESSION_H_ diff --git a/pc/mediasession_unittest.cc b/pc/mediasession_unittest.cc index 28883f2384..03ef0d85a5 100644 --- a/pc/mediasession_unittest.cc +++ b/pc/mediasession_unittest.cc @@ -12,18 +12,18 @@ #include #include -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/p2p/base/transportinfo.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/srtpfilter.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "media/base/codec.h" +#include "media/base/testutils.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/transportdescription.h" +#include "p2p/base/transportinfo.h" +#include "pc/mediasession.h" +#include "pc/srtpfilter.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/ssladapter.h" #define ASSERT_CRYPTO(cd, s, cs) \ ASSERT_EQ(s, cd->cryptos().size()); \ diff --git a/pc/mediastream.cc b/pc/mediastream.cc index c13d80d9b6..0e24ee6cee 100644 --- a/pc/mediastream.cc +++ b/pc/mediastream.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/mediastream.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "pc/mediastream.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/pc/mediastream.h b/pc/mediastream.h index 56fbed95ba..081b8c9116 100644 --- a/pc/mediastream.h +++ b/pc/mediastream.h @@ -10,14 +10,14 @@ // This file contains the implementation of MediaStreamInterface interface. -#ifndef WEBRTC_PC_MEDIASTREAM_H_ -#define WEBRTC_PC_MEDIASTREAM_H_ +#ifndef PC_MEDIASTREAM_H_ +#define PC_MEDIASTREAM_H_ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" namespace webrtc { @@ -55,4 +55,4 @@ class MediaStream : public Notifier { } // namespace webrtc -#endif // WEBRTC_PC_MEDIASTREAM_H_ +#endif // PC_MEDIASTREAM_H_ diff --git a/pc/mediastream_unittest.cc b/pc/mediastream_unittest.cc index 1a96a56f97..cfd1b50e95 100644 --- a/pc/mediastream_unittest.cc +++ b/pc/mediastream_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "pc/audiotrack.h" +#include "pc/mediastream.h" +#include "pc/test/fakevideotracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/gunit.h" +#include "rtc_base/refcount.h" +#include "test/gmock.h" +#include "test/gtest.h" static const char kStreamLabel1[] = "local_stream_1"; static const char kVideoTrackId[] = "dummy_video_cam_1"; diff --git a/pc/mediastreamobserver.cc b/pc/mediastreamobserver.cc index bf17582b5e..c0344efe57 100644 --- a/pc/mediastreamobserver.cc +++ b/pc/mediastreamobserver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/mediastreamobserver.h" +#include "pc/mediastreamobserver.h" #include diff --git a/pc/mediastreamobserver.h b/pc/mediastreamobserver.h index d80c732f3b..1aed50b50e 100644 --- a/pc/mediastreamobserver.h +++ b/pc/mediastreamobserver.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_MEDIASTREAMOBSERVER_H_ -#define WEBRTC_PC_MEDIASTREAMOBSERVER_H_ +#ifndef PC_MEDIASTREAMOBSERVER_H_ +#define PC_MEDIASTREAMOBSERVER_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/mediastreaminterface.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -45,4 +45,4 @@ class MediaStreamObserver : public ObserverInterface { } // namespace webrtc -#endif // WEBRTC_PC_MEDIASTREAMOBSERVER_H_ +#endif // PC_MEDIASTREAMOBSERVER_H_ diff --git a/pc/mediastreamtrack.h b/pc/mediastreamtrack.h index 0fb2de2ddc..33ffbe2c69 100644 --- a/pc/mediastreamtrack.h +++ b/pc/mediastreamtrack.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_MEDIASTREAMTRACK_H_ -#define WEBRTC_PC_MEDIASTREAMTRACK_H_ +#ifndef PC_MEDIASTREAMTRACK_H_ +#define PC_MEDIASTREAMTRACK_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" namespace webrtc { @@ -59,4 +59,4 @@ class MediaStreamTrack : public Notifier { } // namespace webrtc -#endif // WEBRTC_PC_MEDIASTREAMTRACK_H_ +#endif // PC_MEDIASTREAMTRACK_H_ diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc index 64b842bacb..91d0c90a12 100644 --- a/pc/peerconnection.cc +++ b/pc/peerconnection.cc @@ -8,39 +8,39 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/peerconnection.h" +#include "pc/peerconnection.h" #include #include #include -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/api/mediastreamproxy.h" -#include "webrtc/api/mediastreamtrackproxy.h" -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/sctp/sctptransport.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/dtmfsender.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/mediastreamobserver.h" -#include "webrtc/pc/remoteaudiosource.h" -#include "webrtc/pc/rtpreceiver.h" -#include "webrtc/pc/rtpsender.h" -#include "webrtc/pc/streamcollection.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/jsepicecandidate.h" +#include "api/jsepsessiondescription.h" +#include "api/mediaconstraintsinterface.h" +#include "api/mediastreamproxy.h" +#include "api/mediastreamtrackproxy.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/sctp/sctptransport.h" +#include "pc/audiotrack.h" +#include "pc/channelmanager.h" +#include "pc/dtmfsender.h" +#include "pc/mediastream.h" +#include "pc/mediastreamobserver.h" +#include "pc/remoteaudiosource.h" +#include "pc/rtpreceiver.h" +#include "pc/rtpsender.h" +#include "pc/streamcollection.h" +#include "pc/videocapturertracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" namespace { diff --git a/pc/peerconnection.h b/pc/peerconnection.h index 5889629bab..2d6be60d59 100644 --- a/pc/peerconnection.h +++ b/pc/peerconnection.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_PEERCONNECTION_H_ -#define WEBRTC_PC_PEERCONNECTION_H_ +#ifndef PC_PEERCONNECTION_H_ +#define PC_PEERCONNECTION_H_ #include #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/pc/iceserverparsing.h" -#include "webrtc/pc/peerconnectionfactory.h" -#include "webrtc/pc/rtcstatscollector.h" -#include "webrtc/pc/rtpreceiver.h" -#include "webrtc/pc/rtpsender.h" -#include "webrtc/pc/statscollector.h" -#include "webrtc/pc/streamcollection.h" -#include "webrtc/pc/webrtcsession.h" +#include "api/peerconnectioninterface.h" +#include "pc/iceserverparsing.h" +#include "pc/peerconnectionfactory.h" +#include "pc/rtcstatscollector.h" +#include "pc/rtpreceiver.h" +#include "pc/rtpsender.h" +#include "pc/statscollector.h" +#include "pc/streamcollection.h" +#include "pc/webrtcsession.h" namespace webrtc { @@ -446,4 +446,4 @@ class PeerConnection : public PeerConnectionInterface, } // namespace webrtc -#endif // WEBRTC_PC_PEERCONNECTION_H_ +#endif // PC_PEERCONNECTION_H_ diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc index 6760b14322..57f9e73780 100644 --- a/pc/peerconnection_integrationtest.cc +++ b/pc/peerconnection_integrationtest.cc @@ -22,34 +22,34 @@ #include #include -#include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/media/engine/fakewebrtcvideoengine.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/portinterface.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/pc/dtmfsender.h" -#include "webrtc/pc/localaudiosource.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/peerconnectionfactory.h" -#include "webrtc/pc/test/fakeaudiocapturemodule.h" -#include "webrtc/pc/test/fakeperiodicvideocapturer.h" -#include "webrtc/pc/test/fakertccertificategenerator.h" -#include "webrtc/pc/test/fakevideotrackrenderer.h" -#include "webrtc/pc/test/mockpeerconnectionobservers.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "api/fakemetricsobserver.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "api/test/fakeconstraints.h" +#include "media/engine/fakewebrtcvideoengine.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/portinterface.h" +#include "p2p/base/sessiondescription.h" +#include "p2p/base/testturnserver.h" +#include "p2p/client/basicportallocator.h" +#include "pc/dtmfsender.h" +#include "pc/localaudiosource.h" +#include "pc/mediasession.h" +#include "pc/peerconnection.h" +#include "pc/peerconnectionfactory.h" +#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakeperiodicvideocapturer.h" +#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fakevideotrackrenderer.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using cricket::ContentInfo; using cricket::FakeWebRtcVideoDecoder; diff --git a/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc index f7cd91f00e..1dca5ffb79 100644 --- a/pc/peerconnectionendtoend_unittest.cc +++ b/pc/peerconnectionendtoend_unittest.cc @@ -10,24 +10,24 @@ #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" #ifdef WEBRTC_ANDROID -#include "webrtc/pc/test/androidtestinitializer.h" +#include "pc/test/androidtestinitializer.h" #endif -#include "webrtc/pc/test/peerconnectiontestwrapper.h" +#include "pc/test/peerconnectiontestwrapper.h" // Notice that mockpeerconnectionobservers.h must be included after the above! -#include "webrtc/pc/test/mockpeerconnectionobservers.h" -#include "webrtc/test/mock_audio_decoder.h" -#include "webrtc/test/mock_audio_decoder_factory.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "test/mock_audio_decoder.h" +#include "test/mock_audio_decoder_factory.h" using testing::AtLeast; using testing::Invoke; diff --git a/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc index 2ff95f7e39..cb88e2569e 100644 --- a/pc/peerconnectionfactory.cc +++ b/pc/peerconnectionfactory.cc @@ -8,36 +8,36 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/peerconnectionfactory.h" +#include "pc/peerconnectionfactory.h" #include -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/api/mediastreamproxy.h" -#include "webrtc/api/mediastreamtrackproxy.h" -#include "webrtc/api/peerconnectionfactoryproxy.h" -#include "webrtc/api/peerconnectionproxy.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" +#include "api/mediaconstraintsinterface.h" +#include "api/mediastreamproxy.h" +#include "api/mediastreamtrackproxy.h" +#include "api/peerconnectionfactoryproxy.h" +#include "api/peerconnectionproxy.h" +#include "api/videosourceproxy.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. // TODO(zhihuang): This wouldn't be necessary if the interface and // implementation of the media engine were in separate build targets. -#include "webrtc/media/engine/webrtcmediaengine.h" // nogncheck -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" // nogncheck -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" // nogncheck -#include "webrtc/modules/audio_device/include/audio_device.h" // nogncheck -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/localaudiosource.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/pc/videotrack.h" +#include "media/engine/webrtcmediaengine.h" // nogncheck +#include "media/engine/webrtcvideodecoderfactory.h" // nogncheck +#include "media/engine/webrtcvideoencoderfactory.h" // nogncheck +#include "modules/audio_device/include/audio_device.h" // nogncheck +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/client/basicportallocator.h" +#include "pc/audiotrack.h" +#include "pc/localaudiosource.h" +#include "pc/mediastream.h" +#include "pc/peerconnection.h" +#include "pc/videocapturertracksource.h" +#include "pc/videotrack.h" namespace webrtc { diff --git a/pc/peerconnectionfactory.h b/pc/peerconnectionfactory.h index 82440e7275..dc6213758f 100644 --- a/pc/peerconnectionfactory.h +++ b/pc/peerconnectionfactory.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_ -#define WEBRTC_PC_PEERCONNECTIONFACTORY_H_ +#ifndef PC_PEERCONNECTIONFACTORY_H_ +#define PC_PEERCONNECTIONFACTORY_H_ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/rtc_base/rtccertificategenerator.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "pc/channelmanager.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" namespace rtc { class BasicNetworkManager; @@ -154,4 +154,4 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { } // namespace webrtc -#endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ +#endif // PC_PEERCONNECTIONFACTORY_H_ diff --git a/pc/peerconnectionfactory_unittest.cc b/pc/peerconnectionfactory_unittest.cc index cbabc259bd..36553a747f 100644 --- a/pc/peerconnectionfactory_unittest.cc +++ b/pc/peerconnectionfactory_unittest.cc @@ -12,19 +12,19 @@ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/engine/webrtccommon.h" -#include "webrtc/media/engine/webrtcvoe.h" -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/pc/peerconnectionfactory.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" +#include "api/mediastreaminterface.h" +#include "media/base/fakevideocapturer.h" +#include "media/engine/webrtccommon.h" +#include "media/engine/webrtcvoe.h" +#include "p2p/base/fakeportallocator.h" +#include "pc/peerconnectionfactory.h" +#include "rtc_base/gunit.h" +#include "rtc_base/thread.h" #ifdef WEBRTC_ANDROID -#include "webrtc/pc/test/androidtestinitializer.h" +#include "pc/test/androidtestinitializer.h" #endif -#include "webrtc/pc/test/fakertccertificategenerator.h" -#include "webrtc/pc/test/fakevideotrackrenderer.h" +#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fakevideotrackrenderer.h" using webrtc::DataChannelInterface; using webrtc::FakeVideoTrackRenderer; diff --git a/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc index ccf64d2415..c1facacdbd 100644 --- a/pc/peerconnectioninterface_unittest.cc +++ b/pc/peerconnectioninterface_unittest.cc @@ -14,41 +14,41 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/streamcollection.h" -#include "webrtc/pc/test/fakeaudiocapturemodule.h" -#include "webrtc/pc/test/fakertccertificategenerator.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/pc/test/mockpeerconnectionobservers.h" -#include "webrtc/pc/test/testsdpstrings.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" -#include "webrtc/test/gmock.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/jsepsessiondescription.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "api/test/fakeconstraints.h" +#include "media/base/fakevideocapturer.h" +#include "media/engine/webrtcmediaengine.h" +#include "media/sctp/sctptransportinternal.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "p2p/base/fakeportallocator.h" +#include "pc/audiotrack.h" +#include "pc/mediasession.h" +#include "pc/mediastream.h" +#include "pc/peerconnection.h" +#include "pc/streamcollection.h" +#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fakevideotracksource.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "pc/test/testsdpstrings.h" +#include "pc/videocapturertracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" +#include "test/gmock.h" #ifdef WEBRTC_ANDROID -#include "webrtc/pc/test/androidtestinitializer.h" +#include "pc/test/androidtestinitializer.h" #endif static const char kStreamLabel1[] = "local_stream_1"; diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc index c21599d351..00d2195264 100644 --- a/pc/proxy_unittest.cc +++ b/pc/proxy_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/proxy.h" +#include "api/proxy.h" #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/test/gmock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/refcount.h" +#include "rtc_base/thread.h" +#include "test/gmock.h" using ::testing::_; using ::testing::DoAll; diff --git a/pc/quicdatachannel.cc b/pc/quicdatachannel.cc index ab8675dd57..3f09b5ab98 100644 --- a/pc/quicdatachannel.cc +++ b/pc/quicdatachannel.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/quicdatachannel.h" +#include "pc/quicdatachannel.h" -#include "webrtc/p2p/quic/quictransportchannel.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/quic/quictransportchannel.h" +#include "p2p/quic/reliablequicstream.h" +#include "rtc_base/bind.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/pc/quicdatachannel.h b/pc/quicdatachannel.h index f580c4b7b4..347d227fe1 100644 --- a/pc/quicdatachannel.h +++ b/pc/quicdatachannel.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_QUICDATACHANNEL_H_ -#define WEBRTC_PC_QUICDATACHANNEL_H_ +#ifndef PC_QUICDATACHANNEL_H_ +#define PC_QUICDATACHANNEL_H_ #include #include #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "api/datachannelinterface.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace cricket { class QuicTransportChannel; @@ -217,4 +217,4 @@ class QuicDataChannel : public rtc::RefCountedObject, } // namespace webrtc -#endif // WEBRTC_PC_QUICDATACHANNEL_H_ +#endif // PC_QUICDATACHANNEL_H_ diff --git a/pc/quicdatachannel_unittest.cc b/pc/quicdatachannel_unittest.cc index 173d6dff4c..d1e34f58ea 100644 --- a/pc/quicdatachannel_unittest.cc +++ b/pc/quicdatachannel_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/quicdatachannel.h" +#include "pc/quicdatachannel.h" #include #include @@ -16,12 +16,12 @@ #include #include -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/p2p/quic/quictransportchannel.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "p2p/base/faketransportcontroller.h" +#include "p2p/quic/quictransportchannel.h" +#include "p2p/quic/reliablequicstream.h" +#include "rtc_base/bind.h" +#include "rtc_base/gunit.h" +#include "rtc_base/scoped_ref_ptr.h" using cricket::FakeTransportChannel; using cricket::QuicTransportChannel; diff --git a/pc/quicdatatransport.cc b/pc/quicdatatransport.cc index 142085e72b..5c46af7720 100644 --- a/pc/quicdatatransport.cc +++ b/pc/quicdatatransport.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/quicdatatransport.h" +#include "pc/quicdatatransport.h" -#include "webrtc/p2p/quic/quictransportchannel.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/logging.h" +#include "p2p/quic/quictransportchannel.h" +#include "p2p/quic/reliablequicstream.h" +#include "rtc_base/bind.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/pc/quicdatatransport.h b/pc/quicdatatransport.h index 946e6b03b8..b534b27222 100644 --- a/pc/quicdatatransport.h +++ b/pc/quicdatatransport.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_QUICDATATRANSPORT_H_ -#define WEBRTC_PC_QUICDATATRANSPORT_H_ +#ifndef PC_QUICDATATRANSPORT_H_ +#define PC_QUICDATATRANSPORT_H_ #include #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/p2p/base/transportcontroller.h" -#include "webrtc/pc/quicdatachannel.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "api/datachannelinterface.h" +#include "p2p/base/transportcontroller.h" +#include "pc/quicdatachannel.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace cricket { class QuicTransportChannel; @@ -112,4 +112,4 @@ class QuicDataTransport : public sigslot::has_slots<> { } // namespace webrtc -#endif // WEBRTC_PC_QUICDATATRANSPORT_H_ +#endif // PC_QUICDATATRANSPORT_H_ diff --git a/pc/quicdatatransport_unittest.cc b/pc/quicdatatransport_unittest.cc index 8d6c189488..2f6d13f92e 100644 --- a/pc/quicdatatransport_unittest.cc +++ b/pc/quicdatatransport_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/quicdatatransport.h" +#include "pc/quicdatatransport.h" #include #include @@ -16,12 +16,12 @@ #include #include -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/p2p/quic/quictransportchannel.h" -#include "webrtc/p2p/quic/reliablequicstream.h" -#include "webrtc/pc/quicdatachannel.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "p2p/base/faketransportcontroller.h" +#include "p2p/quic/quictransportchannel.h" +#include "p2p/quic/reliablequicstream.h" +#include "pc/quicdatachannel.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/gunit.h" using webrtc::DataBuffer; using webrtc::DataChannelInit; diff --git a/pc/remoteaudiosource.cc b/pc/remoteaudiosource.cc index f6f23c3f24..6fcc2aba82 100644 --- a/pc/remoteaudiosource.cc +++ b/pc/remoteaudiosource.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/remoteaudiosource.h" +#include "pc/remoteaudiosource.h" #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/remoteaudiosource.h b/pc/remoteaudiosource.h index 14c16a79cc..3759d6fbc3 100644 --- a/pc/remoteaudiosource.h +++ b/pc/remoteaudiosource.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_REMOTEAUDIOSOURCE_H_ -#define WEBRTC_PC_REMOTEAUDIOSOURCE_H_ +#ifndef PC_REMOTEAUDIOSOURCE_H_ +#define PC_REMOTEAUDIOSOURCE_H_ #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/api/notifier.h" -#include "webrtc/pc/channel.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "api/call/audio_sink.h" +#include "api/notifier.h" +#include "pc/channel.h" +#include "rtc_base/criticalsection.h" namespace rtc { struct Message; @@ -73,4 +73,4 @@ class RemoteAudioSource : public Notifier { } // namespace webrtc -#endif // WEBRTC_PC_REMOTEAUDIOSOURCE_H_ +#endif // PC_REMOTEAUDIOSOURCE_H_ diff --git a/pc/rtcpmuxfilter.cc b/pc/rtcpmuxfilter.cc index 67293b3309..b37b0d36e4 100644 --- a/pc/rtcpmuxfilter.cc +++ b/pc/rtcpmuxfilter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtcpmuxfilter.h" +#include "pc/rtcpmuxfilter.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace cricket { diff --git a/pc/rtcpmuxfilter.h b/pc/rtcpmuxfilter.h index 95a9d5fe97..c2dad5b7f9 100644 --- a/pc/rtcpmuxfilter.h +++ b/pc/rtcpmuxfilter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_RTCPMUXFILTER_H_ -#define WEBRTC_PC_RTCPMUXFILTER_H_ +#ifndef PC_RTCPMUXFILTER_H_ +#define PC_RTCPMUXFILTER_H_ -#include "webrtc/p2p/base/sessiondescription.h" +#include "p2p/base/sessiondescription.h" namespace cricket { @@ -75,4 +75,4 @@ class RtcpMuxFilter { } // namespace cricket -#endif // WEBRTC_PC_RTCPMUXFILTER_H_ +#endif // PC_RTCPMUXFILTER_H_ diff --git a/pc/rtcpmuxfilter_unittest.cc b/pc/rtcpmuxfilter_unittest.cc index bd2fea1766..555ab5c468 100644 --- a/pc/rtcpmuxfilter_unittest.cc +++ b/pc/rtcpmuxfilter_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtcpmuxfilter.h" -#include "webrtc/media/base/testutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "pc/rtcpmuxfilter.h" +#include "media/base/testutils.h" +#include "rtc_base/gunit.h" TEST(RtcpMuxFilterTest, IsActiveSender) { cricket::RtcpMuxFilter filter; diff --git a/pc/rtcstats_integrationtest.cc b/pc/rtcstats_integrationtest.cc index 79676338ec..a498dc84db 100644 --- a/pc/rtcstats_integrationtest.cc +++ b/pc/rtcstats_integrationtest.cc @@ -11,21 +11,21 @@ #include #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/stats/rtcstats_objects.h" -#include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/pc/test/peerconnectiontestwrapper.h" -#include "webrtc/pc/test/rtcstatsobtainer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event_tracer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/datachannelinterface.h" +#include "api/peerconnectioninterface.h" +#include "api/stats/rtcstats_objects.h" +#include "api/stats/rtcstatsreport.h" +#include "pc/test/peerconnectiontestwrapper.h" +#include "pc/test/rtcstatsobtainer.h" +#include "rtc_base/checks.h" +#include "rtc_base/event_tracer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/trace_event.h" +#include "rtc_base/virtualsocketserver.h" namespace webrtc { diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc index 5b84ea50ae..9a6b26c0a2 100644 --- a/pc/rtcstatscollector.cc +++ b/pc/rtcstatscollector.cc @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtcstatscollector.h" +#include "pc/rtcstatscollector.h" #include #include #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/port.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/webrtcsession.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "media/base/mediachannel.h" +#include "p2p/base/candidate.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/port.h" +#include "pc/peerconnection.h" +#include "pc/webrtcsession.h" +#include "rtc_base/checks.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/rtcstatscollector.h b/pc/rtcstatscollector.h index 5ba4bfd34f..a3a9c1e466 100644 --- a/pc/rtcstatscollector.h +++ b/pc/rtcstatscollector.h @@ -8,28 +8,28 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_RTCSTATSCOLLECTOR_H_ -#define WEBRTC_PC_RTCSTATSCOLLECTOR_H_ +#ifndef PC_RTCSTATSCOLLECTOR_H_ +#define PC_RTCSTATSCOLLECTOR_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/stats/rtcstats_objects.h" -#include "webrtc/api/stats/rtcstatscollectorcallback.h" -#include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/call/call.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/pc/datachannel.h" -#include "webrtc/pc/trackmediainfomap.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/optional.h" +#include "api/stats/rtcstats_objects.h" +#include "api/stats/rtcstatscollectorcallback.h" +#include "api/stats/rtcstatsreport.h" +#include "call/call.h" +#include "media/base/mediachannel.h" +#include "pc/datachannel.h" +#include "pc/trackmediainfomap.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/timeutils.h" namespace cricket { class Candidate; @@ -194,4 +194,4 @@ const char* DataStateToRTCDataChannelStateForTesting( } // namespace webrtc -#endif // WEBRTC_PC_RTCSTATSCOLLECTOR_H_ +#endif // PC_RTCSTATSCOLLECTOR_H_ diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc index cc258edd3a..48048c2b97 100644 --- a/pc/rtcstatscollector_unittest.cc +++ b/pc/rtcstatscollector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtcstatscollector.h" +#include "pc/rtcstatscollector.h" #include #include @@ -16,32 +16,32 @@ #include #include -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/api/stats/rtcstats_objects.h" -#include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/api/test/mock_rtpreceiver.h" -#include "webrtc/api/test/mock_rtpsender.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/test/mock_mediachannel.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/port.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/mediastreamtrack.h" -#include "webrtc/pc/test/mock_datachannel.h" -#include "webrtc/pc/test/mock_peerconnection.h" -#include "webrtc/pc/test/mock_webrtcsession.h" -#include "webrtc/pc/test/rtcstatsobtainer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/timedelta.h" -#include "webrtc/rtc_base/timeutils.h" +#include "api/jsepsessiondescription.h" +#include "api/rtpparameters.h" +#include "api/stats/rtcstats_objects.h" +#include "api/stats/rtcstatsreport.h" +#include "api/test/mock_rtpreceiver.h" +#include "api/test/mock_rtpsender.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/test/mock_mediachannel.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/port.h" +#include "pc/mediastream.h" +#include "pc/mediastreamtrack.h" +#include "pc/test/mock_datachannel.h" +#include "pc/test/mock_peerconnection.h" +#include "pc/test/mock_webrtcsession.h" +#include "pc/test/rtcstatsobtainer.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timedelta.h" +#include "rtc_base/timeutils.h" using testing::_; using testing::Invoke; diff --git a/pc/rtpreceiver.cc b/pc/rtpreceiver.cc index 99c4010101..4f88f1c0be 100644 --- a/pc/rtpreceiver.cc +++ b/pc/rtpreceiver.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtpreceiver.h" +#include "pc/rtpreceiver.h" -#include "webrtc/api/mediastreamtrackproxy.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/mediastreamtrackproxy.h" +#include "api/videosourceproxy.h" +#include "pc/audiotrack.h" +#include "pc/videotrack.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/rtpreceiver.h b/pc/rtpreceiver.h index 9809b734ab..6b9ca99bac 100644 --- a/pc/rtpreceiver.h +++ b/pc/rtpreceiver.h @@ -12,21 +12,21 @@ // An RtpReceiver associates a MediaStreamTrackInterface with an underlying // transport (provided by cricket::VoiceChannel/cricket::VideoChannel) -#ifndef WEBRTC_PC_RTPRECEIVER_H_ -#define WEBRTC_PC_RTPRECEIVER_H_ +#ifndef PC_RTPRECEIVER_H_ +#define PC_RTPRECEIVER_H_ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/media/base/videobroadcaster.h" -#include "webrtc/pc/channel.h" -#include "webrtc/pc/remoteaudiosource.h" -#include "webrtc/pc/videotracksource.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/mediastreaminterface.h" +#include "api/rtpreceiverinterface.h" +#include "media/base/videobroadcaster.h" +#include "pc/channel.h" +#include "pc/remoteaudiosource.h" +#include "pc/videotracksource.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -166,4 +166,4 @@ class VideoRtpReceiver : public rtc::RefCountedObject, } // namespace webrtc -#endif // WEBRTC_PC_RTPRECEIVER_H_ +#endif // PC_RTPRECEIVER_H_ diff --git a/pc/rtpsender.cc b/pc/rtpsender.cc index c95befdb38..3d5594c13c 100644 --- a/pc/rtpsender.cc +++ b/pc/rtpsender.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtpsender.h" +#include "pc/rtpsender.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/pc/localaudiosource.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/trace_event.h" +#include "api/mediastreaminterface.h" +#include "pc/localaudiosource.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/rtpsender.h b/pc/rtpsender.h index de679cffbb..672637f385 100644 --- a/pc/rtpsender.h +++ b/pc/rtpsender.h @@ -12,22 +12,22 @@ // An RtpSender associates a MediaStreamTrackInterface with an underlying // transport (provided by AudioProviderInterface/VideoProviderInterface) -#ifndef WEBRTC_PC_RTPSENDER_H_ -#define WEBRTC_PC_RTPSENDER_H_ +#ifndef PC_RTPSENDER_H_ +#define PC_RTPSENDER_H_ #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "api/mediastreaminterface.h" +#include "api/rtpsenderinterface.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/criticalsection.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. -#include "webrtc/media/base/audiosource.h" // nogncheck -#include "webrtc/pc/channel.h" -#include "webrtc/pc/dtmfsender.h" -#include "webrtc/pc/statscollector.h" +#include "media/base/audiosource.h" // nogncheck +#include "pc/channel.h" +#include "pc/dtmfsender.h" +#include "pc/statscollector.h" namespace webrtc { @@ -258,4 +258,4 @@ class VideoRtpSender : public ObserverInterface, } // namespace webrtc -#endif // WEBRTC_PC_RTPSENDER_H_ +#endif // PC_RTPSENDER_H_ diff --git a/pc/rtpsenderreceiver_unittest.cc b/pc/rtpsenderreceiver_unittest.cc index a00b980431..b4b28bd805 100644 --- a/pc/rtpsenderreceiver_unittest.cc +++ b/pc/rtpsenderreceiver_unittest.cc @@ -12,26 +12,26 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/p2p/base/faketransportcontroller.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/localaudiosource.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/remoteaudiosource.h" -#include "webrtc/pc/rtpreceiver.h" -#include "webrtc/pc/rtpsender.h" -#include "webrtc/pc/streamcollection.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/pc/videotracksource.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/mediachannel.h" +#include "media/engine/fakewebrtccall.h" +#include "p2p/base/faketransportcontroller.h" +#include "pc/audiotrack.h" +#include "pc/channelmanager.h" +#include "pc/localaudiosource.h" +#include "pc/mediastream.h" +#include "pc/remoteaudiosource.h" +#include "pc/rtpreceiver.h" +#include "pc/rtpsender.h" +#include "pc/streamcollection.h" +#include "pc/test/fakevideotracksource.h" +#include "pc/videotrack.h" +#include "pc/videotracksource.h" +#include "rtc_base/gunit.h" +#include "rtc_base/sigslot.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::Exactly; diff --git a/pc/rtptransport.cc b/pc/rtptransport.cc index b26783260f..78a2af5407 100644 --- a/pc/rtptransport.cc +++ b/pc/rtptransport.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/rtptransport.h" +#include "pc/rtptransport.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/p2p/base/packettransportinterface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/trace_event.h" +#include "media/base/rtputils.h" +#include "p2p/base/packettransportinterface.h" +#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/rtptransport.h b/pc/rtptransport.h index 94c5877142..5e1aa20a1f 100644 --- a/pc/rtptransport.h +++ b/pc/rtptransport.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_RTPTRANSPORT_H_ -#define WEBRTC_PC_RTPTRANSPORT_H_ +#ifndef PC_RTPTRANSPORT_H_ +#define PC_RTPTRANSPORT_H_ -#include "webrtc/pc/bundlefilter.h" -#include "webrtc/pc/rtptransportinternal.h" -#include "webrtc/rtc_base/sigslot.h" +#include "pc/bundlefilter.h" +#include "pc/rtptransportinternal.h" +#include "rtc_base/sigslot.h" namespace rtc { @@ -112,4 +112,4 @@ class RtpTransport : public RtpTransportInternal { } // namespace webrtc -#endif // WEBRTC_PC_RTPTRANSPORT_H_ +#endif // PC_RTPTRANSPORT_H_ diff --git a/pc/rtptransport_unittest.cc b/pc/rtptransport_unittest.cc index 0ed77ee463..1e1657d20c 100644 --- a/pc/rtptransport_unittest.cc +++ b/pc/rtptransport_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/pc/rtptransport.h" -#include "webrtc/pc/rtptransporttestutil.h" -#include "webrtc/rtc_base/gunit.h" +#include "p2p/base/fakepackettransport.h" +#include "pc/rtptransport.h" +#include "pc/rtptransporttestutil.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/pc/rtptransportinternal.h b/pc/rtptransportinternal.h index 684afc4e67..e58961997b 100644 --- a/pc/rtptransportinternal.h +++ b/pc/rtptransportinternal.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_RTPTRANSPORTINTERNAL_H_ -#define WEBRTC_PC_RTPTRANSPORTINTERNAL_H_ +#ifndef PC_RTPTRANSPORTINTERNAL_H_ +#define PC_RTPTRANSPORTINTERNAL_H_ -#include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/ortc/rtptransportinterface.h" +#include "rtc_base/sigslot.h" namespace rtc { class CopyOnWriteBuffer; @@ -69,4 +69,4 @@ class RtpTransportInternal : public RtpTransportInterface, } // namespace webrtc -#endif // WEBRTC_PC_RTPTRANSPORTINTERNAL_H_ +#endif // PC_RTPTRANSPORTINTERNAL_H_ diff --git a/pc/rtptransporttestutil.h b/pc/rtptransporttestutil.h index 92cfaec703..c2bdaad23e 100644 --- a/pc/rtptransporttestutil.h +++ b/pc/rtptransporttestutil.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_ -#define WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_ +#ifndef PC_RTPTRANSPORTTESTUTIL_H_ +#define PC_RTPTRANSPORTTESTUTIL_H_ -#include "webrtc/pc/rtptransportinternal.h" -#include "webrtc/rtc_base/sigslot.h" +#include "pc/rtptransportinternal.h" +#include "rtc_base/sigslot.h" namespace webrtc { @@ -41,4 +41,4 @@ class SignalPacketReceivedCounter : public sigslot::has_slots<> { } // namespace webrtc -#endif // WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_ +#endif // PC_RTPTRANSPORTTESTUTIL_H_ diff --git a/pc/sctputils.cc b/pc/sctputils.cc index 48f380b5b6..3433b00b0f 100644 --- a/pc/sctputils.cc +++ b/pc/sctputils.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/sctputils.h" +#include "pc/sctputils.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/pc/sctputils.h b/pc/sctputils.h index 940bd365a9..7a4708af29 100644 --- a/pc/sctputils.h +++ b/pc/sctputils.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_SCTPUTILS_H_ -#define WEBRTC_PC_SCTPUTILS_H_ +#ifndef PC_SCTPUTILS_H_ +#define PC_SCTPUTILS_H_ #include -#include "webrtc/api/datachannelinterface.h" +#include "api/datachannelinterface.h" namespace rtc { class CopyOnWriteBuffer; @@ -38,4 +38,4 @@ bool WriteDataChannelOpenMessage(const std::string& label, void WriteDataChannelOpenAckMessage(rtc::CopyOnWriteBuffer* payload); } // namespace webrtc -#endif // WEBRTC_PC_SCTPUTILS_H_ +#endif // PC_SCTPUTILS_H_ diff --git a/pc/sctputils_unittest.cc b/pc/sctputils_unittest.cc index 5ef3fcb04f..86cdc47a5b 100644 --- a/pc/sctputils_unittest.cc +++ b/pc/sctputils_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/sctputils.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "pc/sctputils.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/gunit.h" class SctpUtilsTest : public testing::Test { public: diff --git a/pc/srtpfilter.cc b/pc/srtpfilter.cc index 560dac8f82..fbea08fdc5 100644 --- a/pc/srtpfilter.cc +++ b/pc/srtpfilter.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/srtpfilter.h" +#include "pc/srtpfilter.h" #include #include -#include "webrtc/media/base/rtputils.h" -#include "webrtc/pc/srtpsession.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/timeutils.h" +#include "media/base/rtputils.h" +#include "pc/srtpsession.h" +#include "rtc_base/base64.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/timeutils.h" namespace cricket { diff --git a/pc/srtpfilter.h b/pc/srtpfilter.h index 2a90360860..ffdf637ae9 100644 --- a/pc/srtpfilter.h +++ b/pc/srtpfilter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_SRTPFILTER_H_ -#define WEBRTC_PC_SRTPFILTER_H_ +#ifndef PC_SRTPFILTER_H_ +#define PC_SRTPFILTER_H_ #include #include @@ -17,15 +17,15 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/media/base/cryptoparams.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/optional.h" +#include "media/base/cryptoparams.h" +#include "p2p/base/sessiondescription.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/thread_checker.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; @@ -140,4 +140,4 @@ class SrtpFilter { } // namespace cricket -#endif // WEBRTC_PC_SRTPFILTER_H_ +#endif // PC_SRTPFILTER_H_ diff --git a/pc/srtpfilter_unittest.cc b/pc/srtpfilter_unittest.cc index c4ad305afe..a71762c54e 100644 --- a/pc/srtpfilter_unittest.cc +++ b/pc/srtpfilter_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/pc/srtpfilter.h" +#include "pc/srtpfilter.h" -#include "webrtc/media/base/cryptoparams.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/cryptoparams.h" +#include "rtc_base/gunit.h" using cricket::CryptoParams; using cricket::CS_LOCAL; diff --git a/pc/srtpsession.cc b/pc/srtpsession.cc index 67ae9a6629..ba49b166ae 100644 --- a/pc/srtpsession.cc +++ b/pc/srtpsession.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/srtpsession.h" +#include "pc/srtpsession.h" #include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/include/srtp_priv.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/pc/externalhmac.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "media/base/rtputils.h" +#include "pc/externalhmac.h" +#include "rtc_base/logging.h" +#include "rtc_base/sslstreamadapter.h" namespace cricket { diff --git a/pc/srtpsession.h b/pc/srtpsession.h index c490c48f9d..2d4dd6f121 100644 --- a/pc/srtpsession.h +++ b/pc/srtpsession.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_SRTPSESSION_H_ -#define WEBRTC_PC_SRTPSESSION_H_ +#ifndef PC_SRTPSESSION_H_ +#define PC_SRTPSESSION_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/thread_checker.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; @@ -106,4 +106,4 @@ class SrtpSession { } // namespace cricket -#endif // WEBRTC_PC_SRTPSESSION_H_ +#endif // PC_SRTPSESSION_H_ diff --git a/pc/srtpsession_unittest.cc b/pc/srtpsession_unittest.cc index d10989d4dd..b89b3ad55a 100644 --- a/pc/srtpsession_unittest.cc +++ b/pc/srtpsession_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/srtpsession.h" +#include "pc/srtpsession.h" #include -#include "webrtc/media/base/fakertp.h" -#include "webrtc/pc/srtptestutil.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sslstreamadapter.h" // For rtc::SRTP_* +#include "media/base/fakertp.h" +#include "pc/srtptestutil.h" +#include "rtc_base/gunit.h" +#include "rtc_base/sslstreamadapter.h" // For rtc::SRTP_* namespace rtc { diff --git a/pc/srtptestutil.h b/pc/srtptestutil.h index daf7eb03ad..edb3d764e8 100644 --- a/pc/srtptestutil.h +++ b/pc/srtptestutil.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_SRTPTESTUTIL_H_ -#define WEBRTC_PC_SRTPTESTUTIL_H_ +#ifndef PC_SRTPTESTUTIL_H_ +#define PC_SRTPTESTUTIL_H_ #include @@ -42,4 +42,4 @@ static int rtcp_auth_tag_len(const std::string& cs) { } // namespace rtc -#endif // WEBRTC_PC_SRTPTESTUTIL_H_ +#endif // PC_SRTPTESTUTIL_H_ diff --git a/pc/srtptransport.cc b/pc/srtptransport.cc index d9f054be7e..f3b5309e37 100644 --- a/pc/srtptransport.cc +++ b/pc/srtptransport.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/srtptransport.h" +#include "pc/srtptransport.h" #include -#include "webrtc/media/base/rtputils.h" -#include "webrtc/pc/rtptransport.h" -#include "webrtc/pc/srtpsession.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/trace_event.h" +#include "media/base/rtputils.h" +#include "pc/rtptransport.h" +#include "pc/srtpsession.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/base64.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/srtptransport.h b/pc/srtptransport.h index 769df0620a..9f20e1d8f6 100644 --- a/pc/srtptransport.h +++ b/pc/srtptransport.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_SRTPTRANSPORT_H_ -#define WEBRTC_PC_SRTPTRANSPORT_H_ +#ifndef PC_SRTPTRANSPORT_H_ +#define PC_SRTPTRANSPORT_H_ #include #include #include -#include "webrtc/pc/rtptransportinternal.h" -#include "webrtc/pc/srtpfilter.h" -#include "webrtc/pc/srtpsession.h" -#include "webrtc/rtc_base/checks.h" +#include "pc/rtptransportinternal.h" +#include "pc/srtpfilter.h" +#include "pc/srtpsession.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -195,4 +195,4 @@ class SrtpTransport : public RtpTransportInternal { } // namespace webrtc -#endif // WEBRTC_PC_SRTPTRANSPORT_H_ +#endif // PC_SRTPTRANSPORT_H_ diff --git a/pc/srtptransport_unittest.cc b/pc/srtptransport_unittest.cc index e097ff17cd..d3bc259a05 100644 --- a/pc/srtptransport_unittest.cc +++ b/pc/srtptransport_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/srtptransport.h" +#include "pc/srtptransport.h" -#include "webrtc/media/base/fakertp.h" -#include "webrtc/p2p/base/dtlstransportinternal.h" -#include "webrtc/p2p/base/fakepackettransport.h" -#include "webrtc/pc/rtptransport.h" -#include "webrtc/pc/rtptransporttestutil.h" -#include "webrtc/pc/srtptestutil.h" -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "media/base/fakertp.h" +#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/fakepackettransport.h" +#include "pc/rtptransport.h" +#include "pc/rtptransporttestutil.h" +#include "pc/srtptestutil.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/sslstreamadapter.h" using rtc::kTestKey1; using rtc::kTestKey2; diff --git a/pc/statscollector.cc b/pc/statscollector.cc index a14967a5e3..070c942118 100644 --- a/pc/statscollector.cc +++ b/pc/statscollector.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/statscollector.h" +#include "pc/statscollector.h" #include #include #include -#include "webrtc/pc/channel.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" +#include "pc/channel.h" +#include "pc/peerconnection.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/pc/statscollector.h b/pc/statscollector.h index 955bfddf5a..568d1ee82b 100644 --- a/pc/statscollector.h +++ b/pc/statscollector.h @@ -11,17 +11,17 @@ // This file contains a class used for gathering statistics from an ongoing // libjingle PeerConnection. -#ifndef WEBRTC_PC_STATSCOLLECTOR_H_ -#define WEBRTC_PC_STATSCOLLECTOR_H_ +#ifndef PC_STATSCOLLECTOR_H_ +#define PC_STATSCOLLECTOR_H_ #include #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/statstypes.h" -#include "webrtc/pc/webrtcsession.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "api/statstypes.h" +#include "pc/webrtcsession.h" namespace webrtc { @@ -150,4 +150,4 @@ class StatsCollector { } // namespace webrtc -#endif // WEBRTC_PC_STATSCOLLECTOR_H_ +#endif // PC_STATSCOLLECTOR_H_ diff --git a/pc/statscollector_unittest.cc b/pc/statscollector_unittest.cc index 6597e95779..d2d34b59d9 100644 --- a/pc/statscollector_unittest.cc +++ b/pc/statscollector_unittest.cc @@ -13,29 +13,29 @@ #include #include -#include "webrtc/pc/statscollector.h" +#include "pc/statscollector.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/test/mock_mediachannel.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/mediastream.h" -#include "webrtc/pc/mediastreamtrack.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/peerconnectionfactory.h" -#include "webrtc/pc/test/fakedatachannelprovider.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/pc/test/mock_peerconnection.h" -#include "webrtc/pc/test/mock_webrtcsession.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "api/mediastreaminterface.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/test/mock_mediachannel.h" +#include "pc/channelmanager.h" +#include "pc/mediastream.h" +#include "pc/mediastreamtrack.h" +#include "pc/peerconnection.h" +#include "pc/peerconnectionfactory.h" +#include "pc/test/fakedatachannelprovider.h" +#include "pc/test/fakevideotracksource.h" +#include "pc/test/mock_peerconnection.h" +#include "pc/test/mock_webrtcsession.h" +#include "pc/videotrack.h" +#include "rtc_base/base64.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/network.h" +#include "rtc_base/stringencode.h" +#include "test/gmock.h" +#include "test/gtest.h" using testing::_; using testing::DoAll; diff --git a/pc/streamcollection.h b/pc/streamcollection.h index b4d1f27331..19ddca991f 100644 --- a/pc/streamcollection.h +++ b/pc/streamcollection.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_STREAMCOLLECTION_H_ -#define WEBRTC_PC_STREAMCOLLECTION_H_ +#ifndef PC_STREAMCOLLECTION_H_ +#define PC_STREAMCOLLECTION_H_ #include #include -#include "webrtc/api/peerconnectioninterface.h" +#include "api/peerconnectioninterface.h" namespace webrtc { @@ -105,4 +105,4 @@ class StreamCollection : public StreamCollectionInterface { } // namespace webrtc -#endif // WEBRTC_PC_STREAMCOLLECTION_H_ +#endif // PC_STREAMCOLLECTION_H_ diff --git a/pc/test/DEPS b/pc/test/DEPS index 17d20c1be9..fff21d98ea 100644 --- a/pc/test/DEPS +++ b/pc/test/DEPS @@ -2,5 +2,5 @@ include_rules = [ # Allow include of Chrome base/android to allow inclusion of headers needed # for accessing the JVM and Application context in gtest. "+base/android", - "+webrtc/modules/utility/include/jvm_android.h", + "+modules/utility/include/jvm_android.h", ] diff --git a/pc/test/androidtestinitializer.cc b/pc/test/androidtestinitializer.cc index d1b0dab4b0..c9525f8951 100644 --- a/pc/test/androidtestinitializer.cc +++ b/pc/test/androidtestinitializer.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/test/androidtestinitializer.h" +#include "pc/test/androidtestinitializer.h" #include -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. @@ -22,9 +22,9 @@ RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/checks.h" +#include "rtc_base/ssladapter.h" namespace webrtc { diff --git a/pc/test/androidtestinitializer.h b/pc/test/androidtestinitializer.h index 48df9cc0fb..9c00a63aec 100644 --- a/pc/test/androidtestinitializer.h +++ b/pc/test/androidtestinitializer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_ -#define WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_ +#ifndef PC_TEST_ANDROIDTESTINITIALIZER_H_ +#define PC_TEST_ANDROIDTESTINITIALIZER_H_ namespace webrtc { @@ -17,4 +17,4 @@ void InitializeAndroidObjects(); } // namespace webrtc -#endif // WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_ +#endif // PC_TEST_ANDROIDTESTINITIALIZER_H_ diff --git a/pc/test/fakeaudiocapturemodule.cc b/pc/test/fakeaudiocapturemodule.cc index 0d367cb9c5..ffee283023 100644 --- a/pc/test/fakeaudiocapturemodule.cc +++ b/pc/test/fakeaudiocapturemodule.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakeaudiocapturemodule.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/refcount.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" // Audio sample value that is high enough that it doesn't occur naturally when // frames are being faked. E.g. NetEq will not generate this large sample value diff --git a/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h index 91879b0ce2..26c50609f8 100644 --- a/pc/test/fakeaudiocapturemodule.h +++ b/pc/test/fakeaudiocapturemodule.h @@ -17,17 +17,17 @@ // Note P postfix of a function indicates that it should only be called by the // processing thread. -#ifndef WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ -#define WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ +#ifndef PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ +#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "common_types.h" +#include "modules/audio_device/include/audio_device.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { class Thread; @@ -254,4 +254,4 @@ class FakeAudioCaptureModule rtc::CriticalSection crit_callback_; }; -#endif // WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ +#endif // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ diff --git a/pc/test/fakeaudiocapturemodule_unittest.cc b/pc/test/fakeaudiocapturemodule_unittest.cc index 62885c2cdb..6fc44a5cb0 100644 --- a/pc/test/fakeaudiocapturemodule_unittest.cc +++ b/pc/test/fakeaudiocapturemodule_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakeaudiocapturemodule.h" #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/gunit.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" using std::min; diff --git a/pc/test/fakedatachannelprovider.h b/pc/test/fakedatachannelprovider.h index ecc0aa6c73..bafcb17bc1 100644 --- a/pc/test/fakedatachannelprovider.h +++ b/pc/test/fakedatachannelprovider.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_ -#define WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_ +#ifndef PC_TEST_FAKEDATACHANNELPROVIDER_H_ +#define PC_TEST_FAKEDATACHANNELPROVIDER_H_ -#include "webrtc/pc/datachannel.h" -#include "webrtc/rtc_base/checks.h" +#include "pc/datachannel.h" +#include "rtc_base/checks.h" class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface { public: @@ -145,4 +145,4 @@ class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface { std::set send_ssrcs_; std::set recv_ssrcs_; }; -#endif // WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_ +#endif // PC_TEST_FAKEDATACHANNELPROVIDER_H_ diff --git a/pc/test/fakeperiodicvideocapturer.h b/pc/test/fakeperiodicvideocapturer.h index 02b4e4b3e5..38f2c75057 100644 --- a/pc/test/fakeperiodicvideocapturer.h +++ b/pc/test/fakeperiodicvideocapturer.h @@ -11,13 +11,13 @@ // FakePeriodicVideoCapturer implements a fake cricket::VideoCapturer that // creates video frames periodically after it has been started. -#ifndef WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ -#define WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ +#ifndef PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ +#define PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ #include -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/rtc_base/thread.h" +#include "media/base/fakevideocapturer.h" +#include "rtc_base/thread.h" namespace webrtc { @@ -71,4 +71,4 @@ class FakePeriodicVideoCapturer : public cricket::FakeVideoCapturer, } // namespace webrtc -#endif // WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ +#endif // PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_ diff --git a/pc/test/fakertccertificategenerator.h b/pc/test/fakertccertificategenerator.h index 7b47378313..cac33e4844 100644 --- a/pc/test/fakertccertificategenerator.h +++ b/pc/test/fakertccertificategenerator.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ -#define WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ +#ifndef PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ +#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "api/peerconnectioninterface.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/rtccertificategenerator.h" // RSA with mod size 1024, pub exp 0x10001. static const rtc::RTCCertificatePEM kRsaPems[] = { @@ -228,4 +228,4 @@ class FakeRTCCertificateGenerator int generated_certificates_ = 0; }; -#endif // WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ +#endif // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ diff --git a/pc/test/fakevideotrackrenderer.h b/pc/test/fakevideotrackrenderer.h index 9bf0b95575..caec548ec2 100644 --- a/pc/test/fakevideotrackrenderer.h +++ b/pc/test/fakevideotrackrenderer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_ -#define WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_ +#ifndef PC_TEST_FAKEVIDEOTRACKRENDERER_H_ +#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/media/base/fakevideorenderer.h" +#include "api/mediastreaminterface.h" +#include "media/base/fakevideorenderer.h" namespace webrtc { @@ -30,4 +30,4 @@ class FakeVideoTrackRenderer : public cricket::FakeVideoRenderer { } // namespace webrtc -#endif // WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_ +#endif // PC_TEST_FAKEVIDEOTRACKRENDERER_H_ diff --git a/pc/test/fakevideotracksource.h b/pc/test/fakevideotracksource.h index aa5f3f5d06..46216c7366 100644 --- a/pc/test/fakevideotracksource.h +++ b/pc/test/fakevideotracksource.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_ -#define WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_ +#ifndef PC_TEST_FAKEVIDEOTRACKSOURCE_H_ +#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/pc/videotracksource.h" +#include "api/mediastreaminterface.h" +#include "media/base/fakevideocapturer.h" +#include "pc/videotracksource.h" namespace webrtc { @@ -46,4 +46,4 @@ class FakeVideoTrackSource : public VideoTrackSource { } // namespace webrtc -#endif // WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_ +#endif // PC_TEST_FAKEVIDEOTRACKSOURCE_H_ diff --git a/pc/test/mock_datachannel.h b/pc/test/mock_datachannel.h index 105fcba760..4a77a6bf60 100644 --- a/pc/test/mock_datachannel.h +++ b/pc/test/mock_datachannel.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_ -#define WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_ +#ifndef PC_TEST_MOCK_DATACHANNEL_H_ +#define PC_TEST_MOCK_DATACHANNEL_H_ -#include "webrtc/pc/datachannel.h" -#include "webrtc/test/gmock.h" +#include "pc/datachannel.h" +#include "test/gmock.h" namespace webrtc { @@ -55,4 +55,4 @@ class MockDataChannel : public rtc::RefCountedObject { } // namespace webrtc -#endif // WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_ +#endif // PC_TEST_MOCK_DATACHANNEL_H_ diff --git a/pc/test/mock_peerconnection.h b/pc/test/mock_peerconnection.h index e743cd85c8..e4343fff61 100644 --- a/pc/test/mock_peerconnection.h +++ b/pc/test/mock_peerconnection.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_ -#define WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_ +#ifndef PC_TEST_MOCK_PEERCONNECTION_H_ +#define PC_TEST_MOCK_PEERCONNECTION_H_ #include -#include "webrtc/call/call.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/test/gmock.h" +#include "call/call.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "pc/peerconnection.h" +#include "rtc_base/thread.h" +#include "test/gmock.h" namespace webrtc { @@ -64,4 +64,4 @@ class MockPeerConnection } // namespace webrtc -#endif // WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_ +#endif // PC_TEST_MOCK_PEERCONNECTION_H_ diff --git a/pc/test/mock_webrtcsession.h b/pc/test/mock_webrtcsession.h index 75e3b87c19..afd147381d 100644 --- a/pc/test/mock_webrtcsession.h +++ b/pc/test/mock_webrtcsession.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_ -#define WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_ +#ifndef PC_TEST_MOCK_WEBRTCSESSION_H_ +#define PC_TEST_MOCK_WEBRTCSESSION_H_ #include #include -#include "webrtc/pc/webrtcsession.h" -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/test/gmock.h" +#include "pc/webrtcsession.h" +#include "media/sctp/sctptransportinternal.h" +#include "test/gmock.h" namespace webrtc { @@ -69,4 +69,4 @@ class MockWebRtcSession : public webrtc::WebRtcSession { } // namespace webrtc -#endif // WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_ +#endif // PC_TEST_MOCK_WEBRTCSESSION_H_ diff --git a/pc/test/mockpeerconnectionobservers.h b/pc/test/mockpeerconnectionobservers.h index 84c80f8d5d..e8e78ad7cb 100644 --- a/pc/test/mockpeerconnectionobservers.h +++ b/pc/test/mockpeerconnectionobservers.h @@ -10,14 +10,14 @@ // This file contains mock implementations of observers used in PeerConnection. -#ifndef WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ -#define WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ +#ifndef PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ +#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ #include #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/rtc_base/checks.h" +#include "api/datachannelinterface.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -266,4 +266,4 @@ class MockRTCStatsCollectorCallback : public webrtc::RTCStatsCollectorCallback { } // namespace webrtc -#endif // WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ +#endif // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ diff --git a/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc index 0cd28040ed..cc912171a2 100644 --- a/pc/test/peerconnectiontestwrapper.cc +++ b/pc/test/peerconnectiontestwrapper.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/p2p/base/fakeportallocator.h" -#include "webrtc/pc/test/fakeperiodicvideocapturer.h" -#include "webrtc/pc/test/fakertccertificategenerator.h" -#include "webrtc/pc/test/mockpeerconnectionobservers.h" -#include "webrtc/pc/test/peerconnectiontestwrapper.h" -#include "webrtc/rtc_base/gunit.h" +#include "p2p/base/fakeportallocator.h" +#include "pc/test/fakeperiodicvideocapturer.h" +#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "pc/test/peerconnectiontestwrapper.h" +#include "rtc_base/gunit.h" static const char kStreamLabelBase[] = "stream_label"; static const char kVideoTrackLabelBase[] = "video_track"; diff --git a/pc/test/peerconnectiontestwrapper.h b/pc/test/peerconnectiontestwrapper.h index c0d1ea3402..d9488b45bb 100644 --- a/pc/test/peerconnectiontestwrapper.h +++ b/pc/test/peerconnectiontestwrapper.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ -#define WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ +#ifndef PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ +#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/pc/test/fakeaudiocapturemodule.h" -#include "webrtc/pc/test/fakevideotrackrenderer.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/peerconnectioninterface.h" +#include "api/test/fakeconstraints.h" +#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fakevideotrackrenderer.h" +#include "rtc_base/sigslot.h" class PeerConnectionTestWrapper : public webrtc::PeerConnectionObserver, @@ -107,4 +107,4 @@ class PeerConnectionTestWrapper std::unique_ptr renderer_; }; -#endif // WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ +#endif // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ diff --git a/pc/test/rtcstatsobtainer.h b/pc/test/rtcstatsobtainer.h index 62e995e3b0..cb8ecd5376 100644 --- a/pc/test/rtcstatsobtainer.h +++ b/pc/test/rtcstatsobtainer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_ -#define WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_ +#ifndef PC_TEST_RTCSTATSOBTAINER_H_ +#define PC_TEST_RTCSTATSOBTAINER_H_ -#include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/stats/rtcstatsreport.h" +#include "rtc_base/gunit.h" namespace webrtc { @@ -50,4 +50,4 @@ class RTCStatsObtainer : public RTCStatsCollectorCallback { } // namespace webrtc -#endif // WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_ +#endif // PC_TEST_RTCSTATSOBTAINER_H_ diff --git a/pc/test/testsdpstrings.h b/pc/test/testsdpstrings.h index ff097b246f..2c9912eeec 100644 --- a/pc/test/testsdpstrings.h +++ b/pc/test/testsdpstrings.h @@ -10,8 +10,8 @@ // This file contain SDP strings used for testing. -#ifndef WEBRTC_PC_TEST_TESTSDPSTRINGS_H_ -#define WEBRTC_PC_TEST_TESTSDPSTRINGS_H_ +#ifndef PC_TEST_TESTSDPSTRINGS_H_ +#define PC_TEST_TESTSDPSTRINGS_H_ namespace webrtc { @@ -129,4 +129,4 @@ static const char kAudioSdpWithUnsupportedCodecs[] = } // namespace webrtc -#endif // WEBRTC_PC_TEST_TESTSDPSTRINGS_H_ +#endif // PC_TEST_TESTSDPSTRINGS_H_ diff --git a/pc/trackmediainfomap.cc b/pc/trackmediainfomap.cc index b5c5ac6a02..2a7fe9cf49 100644 --- a/pc/trackmediainfomap.cc +++ b/pc/trackmediainfomap.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/trackmediainfomap.h" +#include "pc/trackmediainfomap.h" #include diff --git a/pc/trackmediainfomap.h b/pc/trackmediainfomap.h index 174d331415..acc0b14bd3 100644 --- a/pc/trackmediainfomap.h +++ b/pc/trackmediainfomap.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_TRACKMEDIAINFOMAP_H_ -#define WEBRTC_PC_TRACKMEDIAINFOMAP_H_ +#ifndef PC_TRACKMEDIAINFOMAP_H_ +#define PC_TRACKMEDIAINFOMAP_H_ #include #include #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/rtc_base/refcount.h" +#include "api/mediastreaminterface.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "media/base/mediachannel.h" +#include "rtc_base/refcount.h" namespace webrtc { @@ -99,4 +99,4 @@ class TrackMediaInfoMap { } // namespace webrtc -#endif // WEBRTC_PC_TRACKMEDIAINFOMAP_H_ +#endif // PC_TRACKMEDIAINFOMAP_H_ diff --git a/pc/trackmediainfomap_unittest.cc b/pc/trackmediainfomap_unittest.cc index f0a3f1ad73..4f71d3b4c2 100644 --- a/pc/trackmediainfomap_unittest.cc +++ b/pc/trackmediainfomap_unittest.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/trackmediainfomap.h" +#include "pc/trackmediainfomap.h" #include #include #include #include -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/api/test/mock_rtpreceiver.h" -#include "webrtc/api/test/mock_rtpsender.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/test/fakevideotracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/test/gtest.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "api/test/mock_rtpreceiver.h" +#include "api/test/mock_rtpsender.h" +#include "media/base/mediachannel.h" +#include "pc/audiotrack.h" +#include "pc/test/fakevideotracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/refcount.h" +#include "test/gtest.h" namespace webrtc { diff --git a/pc/videocapturertracksource.cc b/pc/videocapturertracksource.cc index 4cddf7f535..97c0994fba 100644 --- a/pc/videocapturertracksource.cc +++ b/pc/videocapturertracksource.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/videocapturertracksource.h" +#include "pc/videocapturertracksource.h" #include #include #include -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" +#include "api/mediaconstraintsinterface.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" using cricket::CaptureState; using webrtc::MediaConstraintsInterface; diff --git a/pc/videocapturertracksource.h b/pc/videocapturertracksource.h index 0e6eb27a25..b80323f6b0 100644 --- a/pc/videocapturertracksource.h +++ b/pc/videocapturertracksource.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_ -#define WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_ +#ifndef PC_VIDEOCAPTURERTRACKSOURCE_H_ +#define PC_VIDEOCAPTURERTRACKSOURCE_H_ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/media/base/videocapturer.h" -#include "webrtc/media/base/videocommon.h" -#include "webrtc/pc/videotracksource.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/sigslot.h" +#include "api/mediastreaminterface.h" +#include "media/base/videocapturer.h" +#include "media/base/videocommon.h" +#include "pc/videotracksource.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/sigslot.h" // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a // cricket::VideoCapturer and make sure the camera is started at a resolution @@ -76,4 +76,4 @@ class VideoCapturerTrackSource : public VideoTrackSource, } // namespace webrtc -#endif // WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_ +#endif // PC_VIDEOCAPTURERTRACKSOURCE_H_ diff --git a/pc/videocapturertracksource_unittest.cc b/pc/videocapturertracksource_unittest.cc index b6e50ae4ff..c64c83e959 100644 --- a/pc/videocapturertracksource_unittest.cc +++ b/pc/videocapturertracksource_unittest.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/test/fakeconstraints.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakevideocapturer.h" +#include "media/base/fakevideorenderer.h" +#include "pc/videocapturertracksource.h" +#include "rtc_base/gunit.h" using webrtc::FakeConstraints; using webrtc::VideoCapturerTrackSource; diff --git a/pc/videotrack.cc b/pc/videotrack.cc index f106460164..00adb3db1d 100644 --- a/pc/videotrack.cc +++ b/pc/videotrack.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/videotrack.h" +#include "pc/videotrack.h" #include diff --git a/pc/videotrack.h b/pc/videotrack.h index d0f0618b43..e669e0814c 100644 --- a/pc/videotrack.h +++ b/pc/videotrack.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_VIDEOTRACK_H_ -#define WEBRTC_PC_VIDEOTRACK_H_ +#ifndef PC_VIDEOTRACK_H_ +#define PC_VIDEOTRACK_H_ #include #include -#include "webrtc/media/base/videosourcebase.h" -#include "webrtc/pc/mediastreamtrack.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "media/base/videosourcebase.h" +#include "pc/mediastreamtrack.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_checker.h" namespace webrtc { @@ -60,4 +60,4 @@ class VideoTrack : public MediaStreamTrack, } // namespace webrtc -#endif // WEBRTC_PC_VIDEOTRACK_H_ +#endif // PC_VIDEOTRACK_H_ diff --git a/pc/videotrack_unittest.cc b/pc/videotrack_unittest.cc index 1f569ebd59..ceaac8c44f 100644 --- a/pc/videotrack_unittest.cc +++ b/pc/videotrack_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/pc/test/fakevideotrackrenderer.h" -#include "webrtc/pc/videocapturertracksource.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakevideocapturer.h" +#include "pc/test/fakevideotrackrenderer.h" +#include "pc/videocapturertracksource.h" +#include "pc/videotrack.h" +#include "rtc_base/gunit.h" using webrtc::FakeVideoTrackRenderer; using webrtc::MediaSourceInterface; diff --git a/pc/videotracksource.cc b/pc/videotracksource.cc index f3ca8d72e0..56f48e7375 100644 --- a/pc/videotracksource.cc +++ b/pc/videotracksource.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/videotracksource.h" +#include "pc/videotracksource.h" #include diff --git a/pc/videotracksource.h b/pc/videotracksource.h index 41252d8a07..3ab59090ac 100644 --- a/pc/videotracksource.h +++ b/pc/videotracksource.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_VIDEOTRACKSOURCE_H_ -#define WEBRTC_PC_VIDEOTRACKSOURCE_H_ +#ifndef PC_VIDEOTRACKSOURCE_H_ +#define PC_VIDEOTRACKSOURCE_H_ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/notifier.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "api/mediastreaminterface.h" +#include "api/notifier.h" +#include "media/base/mediachannel.h" +#include "media/base/videosinkinterface.h" +#include "rtc_base/thread_checker.h" // VideoTrackSource implements VideoTrackSourceInterface. namespace webrtc { @@ -52,4 +52,4 @@ class VideoTrackSource : public Notifier { } // namespace webrtc -#endif // WEBRTC_PC_VIDEOTRACKSOURCE_H_ +#endif // PC_VIDEOTRACKSOURCE_H_ diff --git a/pc/voicechannel.h b/pc/voicechannel.h index 78524ab555..852ef17354 100644 --- a/pc/voicechannel.h +++ b/pc/voicechannel.h @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_VOICECHANNEL_H_ -#define WEBRTC_PC_VOICECHANNEL_H_ +#ifndef PC_VOICECHANNEL_H_ +#define PC_VOICECHANNEL_H_ -#include "webrtc/pc/channel.h" +#include "pc/channel.h" -#endif // WEBRTC_PC_VOICECHANNEL_H_ +#endif // PC_VOICECHANNEL_H_ diff --git a/pc/webrtcsdp.cc b/pc/webrtcsdp.cc index 7dc2605dbe..dba2ba8544 100644 --- a/pc/webrtcsdp.cc +++ b/pc/webrtcsdp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/webrtcsdp.h" +#include "pc/webrtcsdp.h" #include #include @@ -20,24 +20,24 @@ #include #include -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/jsepsessiondescription.h" +#include "api/jsepicecandidate.h" +#include "api/jsepsessiondescription.h" // for RtpExtension -#include "webrtc/api/rtpparameters.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/media/base/cryptoparams.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/base/rtputils.h" -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/p2p/base/port.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/rtpparameters.h" +#include "media/base/codec.h" +#include "media/base/cryptoparams.h" +#include "media/base/mediaconstants.h" +#include "media/base/rtputils.h" +#include "media/sctp/sctptransportinternal.h" +#include "p2p/base/candidate.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/port.h" +#include "pc/mediasession.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/stringutils.h" using cricket::AudioContentDescription; using cricket::Candidate; diff --git a/pc/webrtcsdp.h b/pc/webrtcsdp.h index beaf0c5751..83cc7688a3 100644 --- a/pc/webrtcsdp.h +++ b/pc/webrtcsdp.h @@ -17,8 +17,8 @@ // * draft-lennox-mmusic-sdp-source-selection-02 - // Mechanisms for Media Source Selection in SDP -#ifndef WEBRTC_PC_WEBRTCSDP_H_ -#define WEBRTC_PC_WEBRTCSDP_H_ +#ifndef PC_WEBRTCSDP_H_ +#define PC_WEBRTCSDP_H_ #include @@ -84,4 +84,4 @@ bool SdpDeserializeCandidate(const std::string& transport_name, } // namespace webrtc -#endif // WEBRTC_PC_WEBRTCSDP_H_ +#endif // PC_WEBRTCSDP_H_ diff --git a/pc/webrtcsdp_unittest.cc b/pc/webrtcsdp_unittest.cc index 56066cfa64..3acad296f5 100644 --- a/pc/webrtcsdp_unittest.cc +++ b/pc/webrtcsdp_unittest.cc @@ -13,23 +13,23 @@ #include #include -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/engine/webrtcvideoengine.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sslfingerprint.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/jsepsessiondescription.h" +#include "media/base/mediaconstants.h" +#include "media/engine/webrtcvideoengine.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "p2p/base/p2pconstants.h" +#include "pc/mediasession.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/sslfingerprint.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" #ifdef WEBRTC_ANDROID -#include "webrtc/pc/test/androidtestinitializer.h" +#include "pc/test/androidtestinitializer.h" #endif -#include "webrtc/pc/webrtcsdp.h" +#include "pc/webrtcsdp.h" using cricket::AudioCodec; using cricket::AudioContentDescription; diff --git a/pc/webrtcsession.cc b/pc/webrtcsession.cc index 075308142f..86015a79fa 100644 --- a/pc/webrtcsession.cc +++ b/pc/webrtcsession.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/webrtcsession.h" +#include "pc/webrtcsession.h" #include @@ -17,29 +17,29 @@ #include #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/call/call.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/p2p/base/portallocator.h" -#include "webrtc/pc/channel.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/sctputils.h" -#include "webrtc/pc/webrtcsessiondescriptionfactory.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "api/call/audio_sink.h" +#include "api/jsepicecandidate.h" +#include "api/jsepsessiondescription.h" +#include "api/peerconnectioninterface.h" +#include "call/call.h" +#include "media/base/mediaconstants.h" +#include "media/sctp/sctptransportinternal.h" +#include "p2p/base/portallocator.h" +#include "pc/channel.h" +#include "pc/channelmanager.h" +#include "pc/mediasession.h" +#include "pc/sctputils.h" +#include "pc/webrtcsessiondescriptionfactory.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" #ifdef HAVE_QUIC -#include "webrtc/p2p/quic/quictransportchannel.h" +#include "p2p/quic/quictransportchannel.h" #endif // HAVE_QUIC using cricket::ContentInfo; diff --git a/pc/webrtcsession.h b/pc/webrtcsession.h index 8be828fc6c..7e8d5e4779 100644 --- a/pc/webrtcsession.h +++ b/pc/webrtcsession.h @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_WEBRTCSESSION_H_ -#define WEBRTC_PC_WEBRTCSESSION_H_ +#ifndef PC_WEBRTCSESSION_H_ +#define PC_WEBRTCSESSION_H_ #include #include #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/statstypes.h" -#include "webrtc/call/call.h" -#include "webrtc/p2p/base/candidate.h" -#include "webrtc/p2p/base/transportcontroller.h" -#include "webrtc/pc/datachannel.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" +#include "api/optional.h" +#include "api/peerconnectioninterface.h" +#include "api/statstypes.h" +#include "call/call.h" +#include "p2p/base/candidate.h" +#include "p2p/base/transportcontroller.h" +#include "pc/datachannel.h" +#include "pc/mediasession.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/thread.h" #ifdef HAVE_QUIC -#include "webrtc/pc/quicdatatransport.h" +#include "pc/quicdatatransport.h" #endif // HAVE_QUIC namespace cricket { @@ -677,4 +677,4 @@ class WebRtcSession : }; } // namespace webrtc -#endif // WEBRTC_PC_WEBRTCSESSION_H_ +#endif // PC_WEBRTCSESSION_H_ diff --git a/pc/webrtcsession_unittest.cc b/pc/webrtcsession_unittest.cc index 497daffc32..8c2331ac44 100644 --- a/pc/webrtcsession_unittest.cc +++ b/pc/webrtcsession_unittest.cc @@ -12,41 +12,41 @@ #include #include -#include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/engine/fakewebrtccall.h" -#include "webrtc/media/sctp/sctptransportinternal.h" -#include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/p2p/base/stunserver.h" -#include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/p2p/base/testturnserver.h" -#include "webrtc/p2p/client/basicportallocator.h" -#include "webrtc/pc/audiotrack.h" -#include "webrtc/pc/channelmanager.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/pc/peerconnection.h" -#include "webrtc/pc/sctputils.h" -#include "webrtc/pc/test/fakertccertificategenerator.h" -#include "webrtc/pc/videotrack.h" -#include "webrtc/pc/webrtcsession.h" -#include "webrtc/pc/webrtcsessiondescriptionfactory.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakenetwork.h" -#include "webrtc/rtc_base/firewallsocketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "api/fakemetricsobserver.h" +#include "api/jsepicecandidate.h" +#include "api/jsepsessiondescription.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakemediaengine.h" +#include "media/base/fakevideorenderer.h" +#include "media/base/mediachannel.h" +#include "media/engine/fakewebrtccall.h" +#include "media/sctp/sctptransportinternal.h" +#include "p2p/base/packettransportinternal.h" +#include "p2p/base/stunserver.h" +#include "p2p/base/teststunserver.h" +#include "p2p/base/testturnserver.h" +#include "p2p/client/basicportallocator.h" +#include "pc/audiotrack.h" +#include "pc/channelmanager.h" +#include "pc/mediasession.h" +#include "pc/peerconnection.h" +#include "pc/sctputils.h" +#include "pc/test/fakertccertificategenerator.h" +#include "pc/videotrack.h" +#include "pc/webrtcsession.h" +#include "pc/webrtcsessiondescriptionfactory.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakenetwork.h" +#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/network.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/virtualsocketserver.h" using cricket::FakeVoiceMediaChannel; using cricket::TransportInfo; diff --git a/pc/webrtcsessiondescriptionfactory.cc b/pc/webrtcsessiondescriptionfactory.cc index beb8d1e5a1..ea3e6aede0 100644 --- a/pc/webrtcsessiondescriptionfactory.cc +++ b/pc/webrtcsessiondescriptionfactory.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/pc/webrtcsessiondescriptionfactory.h" +#include "pc/webrtcsessiondescriptionfactory.h" #include -#include "webrtc/api/jsep.h" -#include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/pc/webrtcsession.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "api/jsep.h" +#include "api/jsepsessiondescription.h" +#include "api/mediaconstraintsinterface.h" +#include "pc/webrtcsession.h" +#include "rtc_base/checks.h" +#include "rtc_base/sslidentity.h" using cricket::MediaSessionOptions; diff --git a/pc/webrtcsessiondescriptionfactory.h b/pc/webrtcsessiondescriptionfactory.h index 04a4fd8b03..231f718ad4 100644 --- a/pc/webrtcsessiondescriptionfactory.h +++ b/pc/webrtcsessiondescriptionfactory.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ -#define WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/p2p/base/transportdescriptionfactory.h" -#include "webrtc/pc/mediasession.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "api/peerconnectioninterface.h" +#include "p2p/base/transportdescriptionfactory.h" +#include "pc/mediasession.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/rtccertificategenerator.h" namespace cricket { class ChannelManager; @@ -170,4 +170,4 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, }; } // namespace webrtc -#endif // WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#endif // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ diff --git a/resources/audio_processing/test/py_quality_assessment/BUILD.gn b/resources/audio_processing/test/py_quality_assessment/BUILD.gn index b51bba4dc4..c4547cf520 100644 --- a/resources/audio_processing/test/py_quality_assessment/BUILD.gn +++ b/resources/audio_processing/test/py_quality_assessment/BUILD.gn @@ -6,7 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. -import("../../../../webrtc/webrtc.gni") +import("../../../../webrtc.gni") if (rtc_include_tests) { copy("noise_tracks") { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 9120292728..31848df1f1 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -209,8 +209,8 @@ rtc_source_set("rtc_base_approved_generic") { # Dependency on chromium's logging (in //base). deps += [ "//base:base" ] sources += [ - "../../webrtc_overrides/webrtc/rtc_base/logging.cc", - "../../webrtc_overrides/webrtc/rtc_base/logging.h", + "../../webrtc_overrides/rtc_base/logging.cc", + "../../webrtc_overrides/rtc_base/logging.h", ] } else { sources += [ @@ -335,7 +335,7 @@ rtc_source_set("rtc_task_queue") { rtc_source_set("rtc_task_queue_api") { if (build_with_chromium) { sources = [ - "../../webrtc_overrides/webrtc/rtc_base/task_queue.h", + "../../webrtc_overrides/rtc_base/task_queue.h", ] } else { sources = [ @@ -354,7 +354,7 @@ rtc_source_set("rtc_task_queue_impl") { ] if (build_with_chromium) { sources = [ - "../../webrtc_overrides/webrtc/rtc_base/task_queue.cc", + "../../webrtc_overrides/rtc_base/task_queue.cc", ] } else { if (rtc_build_libevent) { @@ -600,7 +600,7 @@ rtc_static_library("rtc_base_generic") { if (build_with_chromium) { if (is_win) { - sources += [ "../../webrtc_overrides/webrtc/rtc_base/win32socketinit.cc" ] + sources += [ "../../webrtc_overrides/rtc_base/win32socketinit.cc" ] } include_dirs = [ "../../boringssl/src/include" ] public_configs += [ ":rtc_base_chromium_config" ] diff --git a/rtc_base/DEPS b/rtc_base/DEPS index cfc5286c96..0dff88eb37 100644 --- a/rtc_base/DEPS +++ b/rtc_base/DEPS @@ -2,7 +2,7 @@ include_rules = [ "+base/third_party/libevent", "+json", "+third_party/jsoncpp", - "+webrtc/system_wrappers", + "+system_wrappers", ] specific_include_rules = { diff --git a/rtc_base/array_view.h b/rtc_base/array_view.h index 23c7b5bffb..158c6e9a17 100644 --- a/rtc_base/array_view.h +++ b/rtc_base/array_view.h @@ -11,9 +11,9 @@ // This header is for backwards compatibility only, and will be removed soon. // Include webrtc/api/array_view.h instead. -#ifndef WEBRTC_RTC_BASE_ARRAY_VIEW_H_ -#define WEBRTC_RTC_BASE_ARRAY_VIEW_H_ +#ifndef RTC_BASE_ARRAY_VIEW_H_ +#define RTC_BASE_ARRAY_VIEW_H_ -#include "webrtc/api/array_view.h" +#include "api/array_view.h" -#endif // WEBRTC_RTC_BASE_ARRAY_VIEW_H_ +#endif // RTC_BASE_ARRAY_VIEW_H_ diff --git a/rtc_base/arraysize.h b/rtc_base/arraysize.h index f395514e5d..f7845b5f49 100644 --- a/rtc_base/arraysize.h +++ b/rtc_base/arraysize.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ARRAYSIZE_H_ -#define WEBRTC_RTC_BASE_ARRAYSIZE_H_ +#ifndef RTC_BASE_ARRAYSIZE_H_ +#define RTC_BASE_ARRAYSIZE_H_ #include @@ -28,4 +28,4 @@ template char (&ArraySizeHelper(T (&array)[N]))[N]; #define arraysize(array) (sizeof(ArraySizeHelper(array))) -#endif // WEBRTC_RTC_BASE_ARRAYSIZE_H_ +#endif // RTC_BASE_ARRAYSIZE_H_ diff --git a/rtc_base/asyncinvoker-inl.h b/rtc_base/asyncinvoker-inl.h index 7878b15f73..073d5bffac 100644 --- a/rtc_base/asyncinvoker-inl.h +++ b/rtc_base/asyncinvoker-inl.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_ -#define WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_ +#ifndef RTC_BASE_ASYNCINVOKER_INL_H_ +#define RTC_BASE_ASYNCINVOKER_INL_H_ -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "rtc_base/bind.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" namespace rtc { @@ -60,4 +60,4 @@ class FireAndForgetAsyncClosure : public AsyncClosure { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_ +#endif // RTC_BASE_ASYNCINVOKER_INL_H_ diff --git a/rtc_base/asyncinvoker.cc b/rtc_base/asyncinvoker.cc index 89e4e778ea..048fbb0063 100644 --- a/rtc_base/asyncinvoker.cc +++ b/rtc_base/asyncinvoker.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncinvoker.h" +#include "rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/asyncinvoker.h b/rtc_base/asyncinvoker.h index 0b14e910c9..3f0c4f1eb5 100644 --- a/rtc_base/asyncinvoker.h +++ b/rtc_base/asyncinvoker.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_H_ -#define WEBRTC_RTC_BASE_ASYNCINVOKER_H_ +#ifndef RTC_BASE_ASYNCINVOKER_H_ +#define RTC_BASE_ASYNCINVOKER_H_ #include #include #include -#include "webrtc/rtc_base/asyncinvoker-inl.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncinvoker-inl.h" +#include "rtc_base/bind.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/event.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace rtc { @@ -254,4 +254,4 @@ class GuardedAsyncInvoker : public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCINVOKER_H_ +#endif // RTC_BASE_ASYNCINVOKER_H_ diff --git a/rtc_base/asyncpacketsocket.cc b/rtc_base/asyncpacketsocket.cc index 5c9bcbb4a4..d9450398a5 100644 --- a/rtc_base/asyncpacketsocket.cc +++ b/rtc_base/asyncpacketsocket.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncpacketsocket.h" namespace rtc { diff --git a/rtc_base/asyncpacketsocket.h b/rtc_base/asyncpacketsocket.h index 596812d26a..16f4de0822 100644 --- a/rtc_base/asyncpacketsocket.h +++ b/rtc_base/asyncpacketsocket.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_ -#define WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_ +#ifndef RTC_BASE_ASYNCPACKETSOCKET_H_ +#define RTC_BASE_ASYNCPACKETSOCKET_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/dscp.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/dscp.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socket.h" +#include "rtc_base/timeutils.h" namespace rtc { @@ -140,4 +140,4 @@ class AsyncPacketSocket : public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_ +#endif // RTC_BASE_ASYNCPACKETSOCKET_H_ diff --git a/rtc_base/asyncresolverinterface.cc b/rtc_base/asyncresolverinterface.cc index b6f2c48f11..62dd36ac8d 100644 --- a/rtc_base/asyncresolverinterface.cc +++ b/rtc_base/asyncresolverinterface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncresolverinterface.h" +#include "rtc_base/asyncresolverinterface.h" namespace rtc { diff --git a/rtc_base/asyncresolverinterface.h b/rtc_base/asyncresolverinterface.h index 7b8c533b40..96b5ec18b9 100644 --- a/rtc_base/asyncresolverinterface.h +++ b/rtc_base/asyncresolverinterface.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_ -#define WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_ +#ifndef RTC_BASE_ASYNCRESOLVERINTERFACE_H_ +#define RTC_BASE_ASYNCRESOLVERINTERFACE_H_ -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" namespace rtc { diff --git a/rtc_base/asyncsocket.cc b/rtc_base/asyncsocket.cc index 7cb76ccb44..b28b2f9c44 100644 --- a/rtc_base/asyncsocket.cc +++ b/rtc_base/asyncsocket.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/asyncsocket.h b/rtc_base/asyncsocket.h index 7284506dd3..c018c23f07 100644 --- a/rtc_base/asyncsocket.h +++ b/rtc_base/asyncsocket.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCSOCKET_H_ -#define WEBRTC_RTC_BASE_ASYNCSOCKET_H_ +#ifndef RTC_BASE_ASYNCSOCKET_H_ +#define RTC_BASE_ASYNCSOCKET_H_ -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socket.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socket.h" namespace rtc { @@ -80,4 +80,4 @@ class AsyncSocketAdapter : public AsyncSocket, public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCSOCKET_H_ +#endif // RTC_BASE_ASYNCSOCKET_H_ diff --git a/rtc_base/asynctcpsocket.cc b/rtc_base/asynctcpsocket.cc index 1da70dff43..d3d88bc9d6 100644 --- a/rtc_base/asynctcpsocket.cc +++ b/rtc_base/asynctcpsocket.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asynctcpsocket.h" +#include "rtc_base/asynctcpsocket.h" #include #include #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" #if defined(WEBRTC_POSIX) #include diff --git a/rtc_base/asynctcpsocket.h b/rtc_base/asynctcpsocket.h index 1fee4fe236..0a548d04cb 100644 --- a/rtc_base/asynctcpsocket.h +++ b/rtc_base/asynctcpsocket.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_ -#define WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_ +#ifndef RTC_BASE_ASYNCTCPSOCKET_H_ +#define RTC_BASE_ASYNCTCPSOCKET_H_ #include -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/socketfactory.h" namespace rtc { @@ -105,4 +105,4 @@ class AsyncTCPSocket : public AsyncTCPSocketBase { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_ +#endif // RTC_BASE_ASYNCTCPSOCKET_H_ diff --git a/rtc_base/asynctcpsocket_unittest.cc b/rtc_base/asynctcpsocket_unittest.cc index f120db02a2..7081411930 100644 --- a/rtc_base/asynctcpsocket_unittest.cc +++ b/rtc_base/asynctcpsocket_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/virtualsocketserver.h" namespace rtc { diff --git a/rtc_base/asyncudpsocket.cc b/rtc_base/asyncudpsocket.cc index c5068a6ded..64bc8b166b 100644 --- a/rtc_base/asyncudpsocket.cc +++ b/rtc_base/asyncudpsocket.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/asyncudpsocket.h b/rtc_base/asyncudpsocket.h index 15c1e767e3..d814b4bfd0 100644 --- a/rtc_base/asyncudpsocket.h +++ b/rtc_base/asyncudpsocket.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_ -#define WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_ +#ifndef RTC_BASE_ASYNCUDPSOCKET_H_ +#define RTC_BASE_ASYNCUDPSOCKET_H_ #include -#include "webrtc/rtc_base/asyncpacketsocket.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/socketfactory.h" namespace rtc { @@ -64,4 +64,4 @@ class AsyncUDPSocket : public AsyncPacketSocket { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_ +#endif // RTC_BASE_ASYNCUDPSOCKET_H_ diff --git a/rtc_base/asyncudpsocket_unittest.cc b/rtc_base/asyncudpsocket_unittest.cc index c16c59dddb..af7cc20c6a 100644 --- a/rtc_base/asyncudpsocket_unittest.cc +++ b/rtc_base/asyncudpsocket_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/virtualsocketserver.h" namespace rtc { diff --git a/rtc_base/atomicops.h b/rtc_base/atomicops.h index c9e1a9390d..c0ff1a616b 100644 --- a/rtc_base/atomicops.h +++ b/rtc_base/atomicops.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ATOMICOPS_H_ -#define WEBRTC_RTC_BASE_ATOMICOPS_H_ +#ifndef RTC_BASE_ATOMICOPS_H_ +#define RTC_BASE_ATOMICOPS_H_ #if defined(WEBRTC_WIN) // Include winsock2.h before including to maintain consistency with @@ -84,4 +84,4 @@ class AtomicOps { } -#endif // WEBRTC_RTC_BASE_ATOMICOPS_H_ +#endif // RTC_BASE_ATOMICOPS_H_ diff --git a/rtc_base/base64.cc b/rtc_base/base64.cc index 5fe424dd2f..0ccec0e68c 100644 --- a/rtc_base/base64.cc +++ b/rtc_base/base64.cc @@ -14,11 +14,11 @@ //* //********************************************************************* -#include "webrtc/rtc_base/base64.h" +#include "rtc_base/base64.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" using std::vector; diff --git a/rtc_base/base64.h b/rtc_base/base64.h index 80f65c18e1..bfe2fe6a94 100644 --- a/rtc_base/base64.h +++ b/rtc_base/base64.h @@ -9,8 +9,8 @@ //* intact. //********************************************************************* -#ifndef WEBRTC_RTC_BASE_BASE64_H_ -#define WEBRTC_RTC_BASE_BASE64_H_ +#ifndef RTC_BASE_BASE64_H_ +#define RTC_BASE_BASE64_H_ #include #include @@ -120,4 +120,4 @@ class Base64 { } // namespace rtc -#endif // WEBRTC_RTC_BASE_BASE64_H_ +#endif // RTC_BASE_BASE64_H_ diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc index c418c6f069..0cb26c3f02 100644 --- a/rtc_base/base64_unittest.cc +++ b/rtc_base/base64_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/base64.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/stringutils.h" -#include "webrtc/rtc_base/testbase64.h" +#include "rtc_base/testbase64.h" using namespace std; using namespace rtc; diff --git a/rtc_base/basictypes.h b/rtc_base/basictypes.h index d76dbf9a46..42226e79b2 100644 --- a/rtc_base/basictypes.h +++ b/rtc_base/basictypes.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BASICTYPES_H_ -#define WEBRTC_RTC_BASE_BASICTYPES_H_ +#ifndef RTC_BASE_BASICTYPES_H_ +#define RTC_BASE_BASICTYPES_H_ #include // for NULL, size_t #include // for uintptr_t and (u)int_t types. @@ -67,4 +67,4 @@ typedef int socklen_t; #endif // __cplusplus -#endif // WEBRTC_RTC_BASE_BASICTYPES_H_ +#endif // RTC_BASE_BASICTYPES_H_ diff --git a/rtc_base/basictypes_unittest.cc b/rtc_base/basictypes_unittest.cc index 550e61d4b0..a8b0533967 100644 --- a/rtc_base/basictypes_unittest.cc +++ b/rtc_base/basictypes_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/bind.h b/rtc_base/bind.h index 0918fbc56a..b9f98b9dfe 100644 --- a/rtc_base/bind.h +++ b/rtc_base/bind.h @@ -58,14 +58,14 @@ // } // -#ifndef WEBRTC_RTC_BASE_BIND_H_ -#define WEBRTC_RTC_BASE_BIND_H_ +#ifndef RTC_BASE_BIND_H_ +#define RTC_BASE_BIND_H_ #include #include -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/template_util.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/template_util.h" #define NONAME @@ -281,4 +281,4 @@ Functor Bind( #undef NONAME -#endif // WEBRTC_RTC_BASE_BIND_H_ +#endif // RTC_BASE_BIND_H_ diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc index 64d6ee43dd..7028ced351 100644 --- a/rtc_base/bind_unittest.cc +++ b/rtc_base/bind_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/bind.h" +#include "rtc_base/gunit.h" -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/refcount.h" namespace rtc { diff --git a/rtc_base/bitbuffer.cc b/rtc_base/bitbuffer.cc index fec64e6ef7..86247af697 100644 --- a/rtc_base/bitbuffer.cc +++ b/rtc_base/bitbuffer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bitbuffer.h" +#include "rtc_base/bitbuffer.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace { diff --git a/rtc_base/bitbuffer.h b/rtc_base/bitbuffer.h index 03e8ff943c..8519414807 100644 --- a/rtc_base/bitbuffer.h +++ b/rtc_base/bitbuffer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BITBUFFER_H_ -#define WEBRTC_RTC_BASE_BITBUFFER_H_ +#ifndef RTC_BASE_BITBUFFER_H_ +#define RTC_BASE_BITBUFFER_H_ #include // For integer types. #include // For size_t. -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -123,4 +123,4 @@ class BitBufferWriter : public BitBuffer { } // namespace rtc -#endif // WEBRTC_RTC_BASE_BITBUFFER_H_ +#endif // RTC_BASE_BITBUFFER_H_ diff --git a/rtc_base/bitbuffer_unittest.cc b/rtc_base/bitbuffer_unittest.cc index b9d61558c2..abf723250a 100644 --- a/rtc_base/bitbuffer_unittest.cc +++ b/rtc_base/bitbuffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bitbuffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/bitbuffer.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/buffer.h b/rtc_base/buffer.h index b8fe98c387..4948aaeff3 100644 --- a/rtc_base/buffer.h +++ b/rtc_base/buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BUFFER_H_ -#define WEBRTC_RTC_BASE_BUFFER_H_ +#ifndef RTC_BASE_BUFFER_H_ +#define RTC_BASE_BUFFER_H_ #include #include @@ -17,9 +17,9 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/type_traits.h" +#include "api/array_view.h" +#include "rtc_base/checks.h" +#include "rtc_base/type_traits.h" namespace rtc { @@ -380,4 +380,4 @@ using Buffer = BufferT; } // namespace rtc -#endif // WEBRTC_RTC_BASE_BUFFER_H_ +#endif // RTC_BASE_BUFFER_H_ diff --git a/rtc_base/buffer_unittest.cc b/rtc_base/buffer_unittest.cc index 7bf1b5baae..2eaf6f4b06 100644 --- a/rtc_base/buffer_unittest.cc +++ b/rtc_base/buffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/buffer.h" +#include "rtc_base/buffer.h" -#include "webrtc/api/array_view.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/array_view.h" +#include "rtc_base/gunit.h" #include #include diff --git a/rtc_base/bufferqueue.cc b/rtc_base/bufferqueue.cc index 9072043bf0..3b082a5d25 100644 --- a/rtc_base/bufferqueue.cc +++ b/rtc_base/bufferqueue.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bufferqueue.h" +#include "rtc_base/bufferqueue.h" #include diff --git a/rtc_base/bufferqueue.h b/rtc_base/bufferqueue.h index 82f1ac1a18..94ab0ca4c9 100644 --- a/rtc_base/bufferqueue.h +++ b/rtc_base/bufferqueue.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BUFFERQUEUE_H_ -#define WEBRTC_RTC_BASE_BUFFERQUEUE_H_ +#ifndef RTC_BASE_BUFFERQUEUE_H_ +#define RTC_BASE_BUFFERQUEUE_H_ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace rtc { @@ -58,4 +58,4 @@ class BufferQueue { } // namespace rtc -#endif // WEBRTC_RTC_BASE_BUFFERQUEUE_H_ +#endif // RTC_BASE_BUFFERQUEUE_H_ diff --git a/rtc_base/bufferqueue_unittest.cc b/rtc_base/bufferqueue_unittest.cc index 23d1751369..11d115f6cd 100644 --- a/rtc_base/bufferqueue_unittest.cc +++ b/rtc_base/bufferqueue_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bufferqueue.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/bufferqueue.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/bytebuffer.cc b/rtc_base/bytebuffer.cc index 6bee27fa29..ea4de3a696 100644 --- a/rtc_base/bytebuffer.cc +++ b/rtc_base/bytebuffer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bytebuffer.h" +#include "rtc_base/bytebuffer.h" #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/byteorder.h" namespace rtc { diff --git a/rtc_base/bytebuffer.h b/rtc_base/bytebuffer.h index 36b18d22cd..2062fbb5ed 100644 --- a/rtc_base/bytebuffer.h +++ b/rtc_base/bytebuffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BYTEBUFFER_H_ -#define WEBRTC_RTC_BASE_BYTEBUFFER_H_ +#ifndef RTC_BASE_BYTEBUFFER_H_ +#define RTC_BASE_BYTEBUFFER_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -136,4 +136,4 @@ class ByteBufferReader : public ByteBuffer { } // namespace rtc -#endif // WEBRTC_RTC_BASE_BYTEBUFFER_H_ +#endif // RTC_BASE_BYTEBUFFER_H_ diff --git a/rtc_base/bytebuffer_unittest.cc b/rtc_base/bytebuffer_unittest.cc index afca3533f8..6140e9fbfc 100644 --- a/rtc_base/bytebuffer_unittest.cc +++ b/rtc_base/bytebuffer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/byteorder.h b/rtc_base/byteorder.h index 760ea06e16..85f0cc544a 100644 --- a/rtc_base/byteorder.h +++ b/rtc_base/byteorder.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_BYTEORDER_H_ -#define WEBRTC_RTC_BASE_BYTEORDER_H_ +#ifndef RTC_BASE_BYTEORDER_H_ +#define RTC_BASE_BYTEORDER_H_ #if defined(WEBRTC_POSIX) && !defined(__native_client__) #include #endif -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" #if defined(WEBRTC_MAC) #include @@ -175,4 +175,4 @@ inline uint64_t NetworkToHost64(uint64_t n) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_BYTEORDER_H_ +#endif // RTC_BASE_BYTEORDER_H_ diff --git a/rtc_base/byteorder_unittest.cc b/rtc_base/byteorder_unittest.cc index aba8e9fff7..30dc5faaf8 100644 --- a/rtc_base/byteorder_unittest.cc +++ b/rtc_base/byteorder_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/callback.h b/rtc_base/callback.h index 41077e8509..1472b25a5d 100644 --- a/rtc_base/callback.h +++ b/rtc_base/callback.h @@ -59,11 +59,11 @@ // my_callback = Callback1(); // cout << my_callback.empty() << endl; // true -#ifndef WEBRTC_RTC_BASE_CALLBACK_H_ -#define WEBRTC_RTC_BASE_CALLBACK_H_ +#ifndef RTC_BASE_CALLBACK_H_ +#define RTC_BASE_CALLBACK_H_ -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -257,4 +257,4 @@ class Callback5 { }; } // namespace rtc -#endif // WEBRTC_RTC_BASE_CALLBACK_H_ +#endif // RTC_BASE_CALLBACK_H_ diff --git a/rtc_base/callback.h.pump b/rtc_base/callback.h.pump index cceddf7343..383fc19c76 100644 --- a/rtc_base/callback.h.pump +++ b/rtc_base/callback.h.pump @@ -54,11 +54,11 @@ // my_callback = Callback1(); // cout << my_callback.empty() << endl; // true -#ifndef WEBRTC_RTC_BASE_CALLBACK_H_ -#define WEBRTC_RTC_BASE_CALLBACK_H_ +#ifndef RTC_BASE_CALLBACK_H_ +#define RTC_BASE_CALLBACK_H_ -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -100,4 +100,4 @@ class Callback$i { ]] } // namespace rtc -#endif // WEBRTC_RTC_BASE_CALLBACK_H_ +#endif // RTC_BASE_CALLBACK_H_ diff --git a/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc index 0628686cde..fb6950741b 100644 --- a/rtc_base/callback_unittest.cc +++ b/rtc_base/callback_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/callback.h" +#include "rtc_base/bind.h" +#include "rtc_base/gunit.h" +#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/refcount.h" namespace rtc { diff --git a/rtc_base/checks.cc b/rtc_base/checks.cc index 533240f066..e4295b70b2 100644 --- a/rtc_base/checks.cc +++ b/rtc_base/checks.cc @@ -30,8 +30,8 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" #if defined(_MSC_VER) // Warning C4722: destructor never returns, potential memory leak. diff --git a/rtc_base/checks.h b/rtc_base/checks.h index f9507e239c..a45f9be222 100644 --- a/rtc_base/checks.h +++ b/rtc_base/checks.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CHECKS_H_ -#define WEBRTC_RTC_BASE_CHECKS_H_ +#ifndef RTC_BASE_CHECKS_H_ +#define RTC_BASE_CHECKS_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" // If you for some reson need to know if DCHECKs are on, test the value of // RTC_DCHECK_IS_ON. (Test its value, not if it's defined; it'll always be @@ -36,7 +36,7 @@ NO_RETURN void rtc_FatalMessage(const char* file, int line, const char* msg); #include #include -#include "webrtc/rtc_base/safe_compare.h" +#include "rtc_base/safe_compare.h" // The macros here print a message to stderr and abort under various // conditions. All will accept additional stream messages. For example: @@ -286,4 +286,4 @@ inline T CheckedDivExact(T a, T b) { #endif // __cplusplus -#endif // WEBRTC_RTC_BASE_CHECKS_H_ +#endif // RTC_BASE_CHECKS_H_ diff --git a/rtc_base/compile_assert_c.h b/rtc_base/compile_assert_c.h index 591eda1379..c83d31495d 100644 --- a/rtc_base/compile_assert_c.h +++ b/rtc_base/compile_assert_c.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_ -#define WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_ +#ifndef RTC_BASE_COMPILE_ASSERT_C_H_ +#define RTC_BASE_COMPILE_ASSERT_C_H_ // Use this macro to verify at compile time that certain restrictions are met. // The argument is the boolean expression to evaluate. @@ -18,4 +18,4 @@ // Note: In C++, use static_assert instead! #define RTC_COMPILE_ASSERT(expression) switch (0) {case 0: case expression:;} -#endif // WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_ +#endif // RTC_BASE_COMPILE_ASSERT_C_H_ diff --git a/rtc_base/constructormagic.h b/rtc_base/constructormagic.h index 14de7e8cf5..8a953aac56 100644 --- a/rtc_base/constructormagic.h +++ b/rtc_base/constructormagic.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_ -#define WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_ +#ifndef RTC_BASE_CONSTRUCTORMAGIC_H_ +#define RTC_BASE_CONSTRUCTORMAGIC_H_ // Put this in the declarations for a class to be unassignable. #define RTC_DISALLOW_ASSIGN(TypeName) \ @@ -31,4 +31,4 @@ TypeName() = delete; \ RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) -#endif // WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_ +#endif // RTC_BASE_CONSTRUCTORMAGIC_H_ diff --git a/rtc_base/copyonwritebuffer.cc b/rtc_base/copyonwritebuffer.cc index 76db6f5c76..579dd460ba 100644 --- a/rtc_base/copyonwritebuffer.cc +++ b/rtc_base/copyonwritebuffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "rtc_base/copyonwritebuffer.h" namespace rtc { diff --git a/rtc_base/copyonwritebuffer.h b/rtc_base/copyonwritebuffer.h index a247917c96..bdfe3937c7 100644 --- a/rtc_base/copyonwritebuffer.h +++ b/rtc_base/copyonwritebuffer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_ -#define WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_ +#ifndef RTC_BASE_COPYONWRITEBUFFER_H_ +#define RTC_BASE_COPYONWRITEBUFFER_H_ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -238,4 +238,4 @@ class CopyOnWriteBuffer { } // namespace rtc -#endif // WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_ +#endif // RTC_BASE_COPYONWRITEBUFFER_H_ diff --git a/rtc_base/copyonwritebuffer_unittest.cc b/rtc_base/copyonwritebuffer_unittest.cc index 284524800e..24a57d4c8e 100644 --- a/rtc_base/copyonwritebuffer_unittest.cc +++ b/rtc_base/copyonwritebuffer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc index 41ac4caef2..3819e52c94 100644 --- a/rtc_base/cpu_time.cc +++ b/rtc_base/cpu_time.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cpu_time.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/cpu_time.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" #if defined(WEBRTC_LINUX) #include diff --git a/rtc_base/cpu_time.h b/rtc_base/cpu_time.h index 2d431dc467..f712f623a0 100644 --- a/rtc_base/cpu_time.h +++ b/rtc_base/cpu_time.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CPU_TIME_H_ -#define WEBRTC_RTC_BASE_CPU_TIME_H_ +#ifndef RTC_BASE_CPU_TIME_H_ +#define RTC_BASE_CPU_TIME_H_ #include @@ -25,4 +25,4 @@ int64_t GetThreadCpuTimeNanos(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_CPU_TIME_H_ +#endif // RTC_BASE_CPU_TIME_H_ diff --git a/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc index a9af7ba209..ba973788ab 100644 --- a/rtc_base/cpu_time_unittest.cc +++ b/rtc_base/cpu_time_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cpu_time.h" +#include "rtc_base/cpu_time.h" #include #include -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/cpu_info.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/cpu_info.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" // Only run these tests on non-instrumented builds, because timing on // instrumented builds is unreliable, causing the test to be flaky. diff --git a/rtc_base/crc32.cc b/rtc_base/crc32.cc index 3db6b1b39d..c214f38cc7 100644 --- a/rtc_base/crc32.cc +++ b/rtc_base/crc32.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/crc32.h" +#include "rtc_base/crc32.h" -#include "webrtc/rtc_base/arraysize.h" +#include "rtc_base/arraysize.h" namespace rtc { diff --git a/rtc_base/crc32.h b/rtc_base/crc32.h index d8b121df09..a0ce4323e7 100644 --- a/rtc_base/crc32.h +++ b/rtc_base/crc32.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CRC32_H_ -#define WEBRTC_RTC_BASE_CRC32_H_ +#ifndef RTC_BASE_CRC32_H_ +#define RTC_BASE_CRC32_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace rtc { @@ -31,4 +31,4 @@ inline uint32_t ComputeCrc32(const std::string& str) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_CRC32_H_ +#endif // RTC_BASE_CRC32_H_ diff --git a/rtc_base/crc32_unittest.cc b/rtc_base/crc32_unittest.cc index 49c56006d2..576b424bd0 100644 --- a/rtc_base/crc32_unittest.cc +++ b/rtc_base/crc32_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/crc32.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/crc32.h" +#include "rtc_base/gunit.h" #include diff --git a/rtc_base/criticalsection.cc b/rtc_base/criticalsection.cc index e73b23c092..d92b478b9b 100644 --- a/rtc_base/criticalsection.cc +++ b/rtc_base/criticalsection.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/criticalsection.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/platform_thread.h" // TODO(tommi): Split this file up to per-platform implementation files. diff --git a/rtc_base/criticalsection.h b/rtc_base/criticalsection.h index fb55aaf0d1..e47f56694b 100644 --- a/rtc_base/criticalsection.h +++ b/rtc_base/criticalsection.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_ -#define WEBRTC_RTC_BASE_CRITICALSECTION_H_ +#ifndef RTC_BASE_CRITICALSECTION_H_ +#define RTC_BASE_CRITICALSECTION_H_ -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_thread_types.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/platform_thread_types.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" #if defined(WEBRTC_WIN) // Include winsock2.h before including to maintain consistency with @@ -156,4 +156,4 @@ class RTC_SCOPED_LOCKABLE GlobalLockScope { } // namespace rtc -#endif // WEBRTC_RTC_BASE_CRITICALSECTION_H_ +#endif // RTC_BASE_CRITICALSECTION_H_ diff --git a/rtc_base/criticalsection_unittest.cc b/rtc_base/criticalsection_unittest.cc index c264e44bd7..f5d6957fcf 100644 --- a/rtc_base/criticalsection_unittest.cc +++ b/rtc_base/criticalsection_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/gunit.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/cryptstring.cc b/rtc_base/cryptstring.cc index 1df5407628..421710c7c8 100644 --- a/rtc_base/cryptstring.cc +++ b/rtc_base/cryptstring.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/cryptstring.h" +#include "rtc_base/cryptstring.h" namespace rtc { diff --git a/rtc_base/cryptstring.h b/rtc_base/cryptstring.h index b7b6694cf6..03b38c462f 100644 --- a/rtc_base/cryptstring.h +++ b/rtc_base/cryptstring.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_CRYPTSTRING_H_ -#define WEBRTC_RTC_BASE_CRYPTSTRING_H_ +#ifndef RTC_BASE_CRYPTSTRING_H_ +#define RTC_BASE_CRYPTSTRING_H_ #include @@ -164,4 +164,4 @@ class InsecureCryptStringImpl : public CryptStringImpl { } -#endif // WEBRTC_RTC_BASE_CRYPTSTRING_H_ +#endif // RTC_BASE_CRYPTSTRING_H_ diff --git a/rtc_base/deprecation.h b/rtc_base/deprecation.h index e02629a1a9..af776d53ff 100644 --- a/rtc_base/deprecation.h +++ b/rtc_base/deprecation.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_DEPRECATION_H_ -#define WEBRTC_RTC_BASE_DEPRECATION_H_ +#ifndef RTC_BASE_DEPRECATION_H_ +#define RTC_BASE_DEPRECATION_H_ // Annotate the declarations of deprecated functions with this to cause a // compiler warning when they're used. Like so: @@ -42,4 +42,4 @@ #define RTC_DEPRECATED #endif -#endif // WEBRTC_RTC_BASE_DEPRECATION_H_ +#endif // RTC_BASE_DEPRECATION_H_ diff --git a/rtc_base/dscp.h b/rtc_base/dscp.h index e65ed77257..bdce466044 100644 --- a/rtc_base/dscp.h +++ b/rtc_base/dscp.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_DSCP_H_ -#define WEBRTC_RTC_BASE_DSCP_H_ +#ifndef RTC_BASE_DSCP_H_ +#define RTC_BASE_DSCP_H_ namespace rtc { // Differentiated Services Code Point. @@ -42,4 +42,4 @@ enum DiffServCodePoint { } // namespace rtc - #endif // WEBRTC_RTC_BASE_DSCP_H_ + #endif // RTC_BASE_DSCP_H_ diff --git a/rtc_base/event.cc b/rtc_base/event.cc index cddf677577..32c1b0334e 100644 --- a/rtc_base/event.cc +++ b/rtc_base/event.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event.h" +#include "rtc_base/event.h" #if defined(WEBRTC_WIN) #include @@ -20,7 +20,7 @@ #error "Must define either WEBRTC_WIN or WEBRTC_POSIX." #endif -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/event.h b/rtc_base/event.h index b3c0e7cdd7..bdf14a8cc1 100644 --- a/rtc_base/event.h +++ b/rtc_base/event.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_EVENT_H_ -#define WEBRTC_RTC_BASE_EVENT_H_ +#ifndef RTC_BASE_EVENT_H_ +#define RTC_BASE_EVENT_H_ -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" // NOLINT: consider this a system header. +#include "rtc_base/win32.h" // NOLINT: consider this a system header. #elif defined(WEBRTC_POSIX) #include #else @@ -51,4 +51,4 @@ class Event { } // namespace rtc -#endif // WEBRTC_RTC_BASE_EVENT_H_ +#endif // RTC_BASE_EVENT_H_ diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc index c3b459f851..1b79786d15 100644 --- a/rtc_base/event_tracer.cc +++ b/rtc_base/event_tracer.cc @@ -7,21 +7,21 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event_tracer.h" +#include "rtc_base/event_tracer.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" // This is a guesstimate that should be enough in most cases. static const size_t kEventLoggerArgsStrBufferInitialSize = 256; diff --git a/rtc_base/event_tracer.h b/rtc_base/event_tracer.h index e0136abb7b..fc7ad046d4 100644 --- a/rtc_base/event_tracer.h +++ b/rtc_base/event_tracer.h @@ -23,8 +23,8 @@ // // Parameters for the above two functions are described in trace_event.h. -#ifndef WEBRTC_RTC_BASE_EVENT_TRACER_H_ -#define WEBRTC_RTC_BASE_EVENT_TRACER_H_ +#ifndef RTC_BASE_EVENT_TRACER_H_ +#define RTC_BASE_EVENT_TRACER_H_ #include @@ -82,4 +82,4 @@ void ShutdownInternalTracer(); } // namespace tracing } // namespace rtc -#endif // WEBRTC_RTC_BASE_EVENT_TRACER_H_ +#endif // RTC_BASE_EVENT_TRACER_H_ diff --git a/rtc_base/event_tracer_unittest.cc b/rtc_base/event_tracer_unittest.cc index 527b4eb9e2..6e3075fe96 100644 --- a/rtc_base/event_tracer_unittest.cc +++ b/rtc_base/event_tracer_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event_tracer.h" +#include "rtc_base/event_tracer.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/static_instance.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/static_instance.h" +#include "test/gtest.h" namespace { diff --git a/rtc_base/event_unittest.cc b/rtc_base/event_unittest.cc index 02da66f574..5a2f8441ed 100644 --- a/rtc_base/event_unittest.cc +++ b/rtc_base/event_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/event.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/fakeclock.cc b/rtc_base/fakeclock.cc index e9c3e9b348..721f699711 100644 --- a/rtc_base/fakeclock.cc +++ b/rtc_base/fakeclock.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/fakeclock.h" +#include "rtc_base/fakeclock.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagequeue.h" +#include "rtc_base/checks.h" +#include "rtc_base/messagequeue.h" namespace rtc { diff --git a/rtc_base/fakeclock.h b/rtc_base/fakeclock.h index b6a84e6e3d..1b1ee715c0 100644 --- a/rtc_base/fakeclock.h +++ b/rtc_base/fakeclock.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FAKECLOCK_H_ -#define WEBRTC_RTC_BASE_FAKECLOCK_H_ +#ifndef RTC_BASE_FAKECLOCK_H_ +#define RTC_BASE_FAKECLOCK_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/timedelta.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/timedelta.h" +#include "rtc_base/timeutils.h" namespace rtc { @@ -68,4 +68,4 @@ class ScopedRealClock { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FAKECLOCK_H_ +#endif // RTC_BASE_FAKECLOCK_H_ diff --git a/rtc_base/fakenetwork.h b/rtc_base/fakenetwork.h index 479540dabe..fd4eb615bc 100644 --- a/rtc_base/fakenetwork.h +++ b/rtc_base/fakenetwork.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FAKENETWORK_H_ -#define WEBRTC_RTC_BASE_FAKENETWORK_H_ +#ifndef RTC_BASE_FAKENETWORK_H_ +#define RTC_BASE_FAKENETWORK_H_ #include #include #include #include -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/network.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread.h" namespace rtc { @@ -126,4 +126,4 @@ class FakeNetworkManager : public NetworkManagerBase, } // namespace rtc -#endif // WEBRTC_RTC_BASE_FAKENETWORK_H_ +#endif // RTC_BASE_FAKENETWORK_H_ diff --git a/rtc_base/fakesslidentity.h b/rtc_base/fakesslidentity.h index ae9eeb1684..db1762a0e5 100644 --- a/rtc_base/fakesslidentity.h +++ b/rtc_base/fakesslidentity.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_ -#define WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_ +#ifndef RTC_BASE_FAKESSLIDENTITY_H_ +#define RTC_BASE_FAKESSLIDENTITY_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/checks.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/sslidentity.h" namespace rtc { @@ -117,4 +117,4 @@ class FakeSSLIdentity : public rtc::SSLIdentity { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_ +#endif // RTC_BASE_FAKESSLIDENTITY_H_ diff --git a/rtc_base/file.cc b/rtc_base/file.cc index c4c5e5a3c9..a6ee2aa99c 100644 --- a/rtc_base/file.cc +++ b/rtc_base/file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "rtc_base/file.h" #include diff --git a/rtc_base/file.h b/rtc_base/file.h index 50639c4d8d..f87d9ce186 100644 --- a/rtc_base/file.h +++ b/rtc_base/file.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FILE_H_ -#define WEBRTC_RTC_BASE_FILE_H_ +#ifndef RTC_BASE_FILE_H_ +#define RTC_BASE_FILE_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/platform_file.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/platform_file.h" namespace rtc { @@ -79,4 +79,4 @@ class File { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FILE_H_ +#endif // RTC_BASE_FILE_H_ diff --git a/rtc_base/file_posix.cc b/rtc_base/file_posix.cc index fab6dd3725..b0fec9f9fc 100644 --- a/rtc_base/file_posix.cc +++ b/rtc_base/file_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "rtc_base/file.h" #include #include @@ -18,7 +18,7 @@ #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc index a052a6ebcf..a8e39dd98e 100644 --- a/rtc_base/file_unittest.cc +++ b/rtc_base/file_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/file.h" +#include "rtc_base/gunit.h" +#include "test/testsupport/fileutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #else // if defined(WEBRTC_WIN) diff --git a/rtc_base/file_win.cc b/rtc_base/file_win.cc index 6cb259a9de..63edcb5aed 100644 --- a/rtc_base/file_win.cc +++ b/rtc_base/file_win.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/file.h" +#include "rtc_base/file.h" #include -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include // NOLINT: win32.h should be considered a system header -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/filerotatingstream.cc b/rtc_base/filerotatingstream.cc index 37cd60776f..3856155da5 100644 --- a/rtc_base/filerotatingstream.cc +++ b/rtc_base/filerotatingstream.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/filerotatingstream.h" +#include "rtc_base/filerotatingstream.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/pathutils.h" // Note: We use std::cerr for logging in the write paths of this stream to avoid // infinite loops when logging. diff --git a/rtc_base/filerotatingstream.h b/rtc_base/filerotatingstream.h index db8d1ac2bd..4dab3455db 100644 --- a/rtc_base/filerotatingstream.h +++ b/rtc_base/filerotatingstream.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_ -#define WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_ +#ifndef RTC_BASE_FILEROTATINGSTREAM_H_ +#define RTC_BASE_FILEROTATINGSTREAM_H_ #include #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/stream.h" namespace rtc { @@ -170,4 +170,4 @@ class CallSessionFileRotatingStream : public FileRotatingStream { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_ +#endif // RTC_BASE_FILEROTATINGSTREAM_H_ diff --git a/rtc_base/filerotatingstream_unittest.cc b/rtc_base/filerotatingstream_unittest.cc index b5fcefb2de..3507ba5260 100644 --- a/rtc_base/filerotatingstream_unittest.cc +++ b/rtc_base/filerotatingstream_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/filerotatingstream.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/filerotatingstream.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/pathutils.h" +#include "test/testsupport/fileutils.h" namespace rtc { diff --git a/rtc_base/fileutils.cc b/rtc_base/fileutils.cc index 9a97cda307..40ec86f7a9 100644 --- a/rtc_base/fileutils.cc +++ b/rtc_base/fileutils.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/fileutils.h" +#include "rtc_base/fileutils.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stringutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32filesystem.h" +#include "rtc_base/win32filesystem.h" #else -#include "webrtc/rtc_base/unixfilesystem.h" +#include "rtc_base/unixfilesystem.h" #endif #if !defined(WEBRTC_WIN) diff --git a/rtc_base/fileutils.h b/rtc_base/fileutils.h index 8c6f1e8734..a2544947f3 100644 --- a/rtc_base/fileutils.h +++ b/rtc_base/fileutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FILEUTILS_H_ -#define WEBRTC_RTC_BASE_FILEUTILS_H_ +#ifndef RTC_BASE_FILEUTILS_H_ +#define RTC_BASE_FILEUTILS_H_ #include @@ -21,9 +21,9 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_file.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/platform_file.h" namespace rtc { @@ -153,4 +153,4 @@ class Filesystem { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FILEUTILS_H_ +#endif // RTC_BASE_FILEUTILS_H_ diff --git a/rtc_base/firewallsocketserver.cc b/rtc_base/firewallsocketserver.cc index b60a9435fb..a8b0839b39 100644 --- a/rtc_base/firewallsocketserver.cc +++ b/rtc_base/firewallsocketserver.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/firewallsocketserver.h" +#include "rtc_base/firewallsocketserver.h" #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/firewallsocketserver.h b/rtc_base/firewallsocketserver.h index d78a241001..9f04946572 100644 --- a/rtc_base/firewallsocketserver.h +++ b/rtc_base/firewallsocketserver.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_ +#ifndef RTC_BASE_FIREWALLSOCKETSERVER_H_ +#define RTC_BASE_FIREWALLSOCKETSERVER_H_ #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/socketserver.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/socketserver.h" namespace rtc { @@ -122,4 +122,4 @@ class FirewallManager { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_ +#endif // RTC_BASE_FIREWALLSOCKETSERVER_H_ diff --git a/rtc_base/flags.cc b/rtc_base/flags.cc index b5697f162f..4f2b11a962 100644 --- a/rtc_base/flags.cc +++ b/rtc_base/flags.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/flags.h" +#include "rtc_base/flags.h" #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include #endif diff --git a/rtc_base/flags.h b/rtc_base/flags.h index b2d8b76c5a..5a07b1a737 100644 --- a/rtc_base/flags.h +++ b/rtc_base/flags.h @@ -20,11 +20,11 @@ // The implementation only relies and basic C++ functionality // and needs no special library or STL support. -#ifndef WEBRTC_RTC_BASE_FLAGS_H_ -#define WEBRTC_RTC_BASE_FLAGS_H_ +#ifndef RTC_BASE_FLAGS_H_ +#define RTC_BASE_FLAGS_H_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace rtc { diff --git a/rtc_base/format_macros.h b/rtc_base/format_macros.h index 3c28127226..f3275eeefd 100644 --- a/rtc_base/format_macros.h +++ b/rtc_base/format_macros.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FORMAT_MACROS_H_ -#define WEBRTC_RTC_BASE_FORMAT_MACROS_H_ +#ifndef RTC_BASE_FORMAT_MACROS_H_ +#define RTC_BASE_FORMAT_MACROS_H_ // This file defines the format macros for some integer types and is derived // from Chromium's base/format_macros.h. @@ -24,7 +24,7 @@ // printf("xyz: %" PRIuS, size); // The "u" in the macro corresponds to %u, and S is for "size". -#include "webrtc/typedefs.h" +#include "typedefs.h" #if defined(WEBRTC_POSIX) @@ -93,4 +93,4 @@ #endif -#endif // WEBRTC_RTC_BASE_FORMAT_MACROS_H_ +#endif // RTC_BASE_FORMAT_MACROS_H_ diff --git a/rtc_base/function_view.h b/rtc_base/function_view.h index a187d55df5..91ab88e4fa 100644 --- a/rtc_base/function_view.h +++ b/rtc_base/function_view.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_FUNCTION_VIEW_H_ -#define WEBRTC_RTC_BASE_FUNCTION_VIEW_H_ +#ifndef RTC_BASE_FUNCTION_VIEW_H_ +#define RTC_BASE_FUNCTION_VIEW_H_ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" // Just like std::function, FunctionView will wrap any callable and hide its // actual type, exposing only its signature. But unlike std::function, @@ -127,4 +127,4 @@ class FunctionView final { } // namespace rtc -#endif // WEBRTC_RTC_BASE_FUNCTION_VIEW_H_ +#endif // RTC_BASE_FUNCTION_VIEW_H_ diff --git a/rtc_base/function_view_unittest.cc b/rtc_base/function_view_unittest.cc index 00a8714322..98f78d6680 100644 --- a/rtc_base/function_view_unittest.cc +++ b/rtc_base/function_view_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/function_view.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/gtest_prod_util.h b/rtc_base/gtest_prod_util.h index 4837604945..dc9679f49e 100644 --- a/rtc_base/gtest_prod_util.h +++ b/rtc_base/gtest_prod_util.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_GTEST_PROD_UTIL_H_ -#define WEBRTC_RTC_BASE_GTEST_PROD_UTIL_H_ +#ifndef RTC_BASE_GTEST_PROD_UTIL_H_ +#define RTC_BASE_GTEST_PROD_UTIL_H_ // Define our own version of FRIEND_TEST here rather than including // gtest_prod.h to avoid depending on any part of GTest in production code. @@ -35,4 +35,4 @@ friend class test_case_name##_##test_name##_Test FRIEND_TEST_WEBRTC(test_case_name, FLAKY_##test_name); \ FRIEND_TEST_WEBRTC(test_case_name, FAILS_##test_name) -#endif // WEBRTC_RTC_BASE_GTEST_PROD_UTIL_H_ +#endif // RTC_BASE_GTEST_PROD_UTIL_H_ diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h index 6f4e419a9a..333e85ad84 100644 --- a/rtc_base/gunit.h +++ b/rtc_base/gunit.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_GUNIT_H_ -#define WEBRTC_RTC_BASE_GUNIT_H_ +#ifndef RTC_BASE_GUNIT_H_ +#define RTC_BASE_GUNIT_H_ -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" #if defined(GTEST_RELATIVE_PATH) -#include "webrtc/test/gtest.h" +#include "test/gtest.h" #else #include "testing/base/public/gunit.h" #endif @@ -157,4 +157,4 @@ } else \ GTEST_CONCAT_TOKEN_(gunit_label_, __LINE__) : ASSERT_EQ(v1, v2) -#endif // WEBRTC_RTC_BASE_GUNIT_H_ +#endif // RTC_BASE_GUNIT_H_ diff --git a/rtc_base/gunit_prod.h b/rtc_base/gunit_prod.h index 789f11bfce..ae4157d338 100644 --- a/rtc_base/gunit_prod.h +++ b/rtc_base/gunit_prod.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_GUNIT_PROD_H_ -#define WEBRTC_RTC_BASE_GUNIT_PROD_H_ +#ifndef RTC_BASE_GUNIT_PROD_H_ +#define RTC_BASE_GUNIT_PROD_H_ #if defined(WEBRTC_ANDROID) // Android doesn't use gtest at all, so anything that relies on gtest should @@ -21,4 +21,4 @@ #include "testing/base/gunit_prod.h" #endif -#endif // WEBRTC_RTC_BASE_GUNIT_PROD_H_ +#endif // RTC_BASE_GUNIT_PROD_H_ diff --git a/rtc_base/helpers.cc b/rtc_base/helpers.cc index f7b1fa8d63..e62aaf87b2 100644 --- a/rtc_base/helpers.cc +++ b/rtc_base/helpers.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/helpers.h" +#include "rtc_base/helpers.h" #include #include #include -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/base64.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" // Protect against max macro inclusion. #undef max diff --git a/rtc_base/helpers.h b/rtc_base/helpers.h index fac26538be..e1d2ebb2aa 100644 --- a/rtc_base/helpers.h +++ b/rtc_base/helpers.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_HELPERS_H_ -#define WEBRTC_RTC_BASE_HELPERS_H_ +#ifndef RTC_BASE_HELPERS_H_ +#define RTC_BASE_HELPERS_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace rtc { @@ -61,4 +61,4 @@ double CreateRandomDouble(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_HELPERS_H_ +#endif // RTC_BASE_HELPERS_H_ diff --git a/rtc_base/helpers_unittest.cc b/rtc_base/helpers_unittest.cc index d5c0ceaa3d..9fa16a5f46 100644 --- a/rtc_base/helpers_unittest.cc +++ b/rtc_base/helpers_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "rtc_base/buffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" namespace rtc { diff --git a/rtc_base/httpbase.cc b/rtc_base/httpbase.cc index 64cb5d9f09..9c5d1be7a9 100644 --- a/rtc_base/httpbase.cc +++ b/rtc_base/httpbase.cc @@ -11,17 +11,17 @@ #include #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #else // !WEBRTC_WIN #define SEC_E_CERT_EXPIRED (-2146893016) #endif // !WEBRTC_WIN -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpbase.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/httpbase.h" +#include "rtc_base/logging.h" +#include "rtc_base/socket.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/httpbase.h b/rtc_base/httpbase.h index 5086502ae9..5ca0134c34 100644 --- a/rtc_base/httpbase.h +++ b/rtc_base/httpbase.h @@ -9,10 +9,10 @@ */ -#ifndef WEBRTC_RTC_BASE_HTTPBASE_H_ -#define WEBRTC_RTC_BASE_HTTPBASE_H_ +#ifndef RTC_BASE_HTTPBASE_H_ +#define RTC_BASE_HTTPBASE_H_ -#include "webrtc/rtc_base/httpcommon.h" +#include "rtc_base/httpcommon.h" namespace rtc { @@ -184,4 +184,4 @@ private: } // namespace rtc -#endif // WEBRTC_RTC_BASE_HTTPBASE_H_ +#endif // RTC_BASE_HTTPBASE_H_ diff --git a/rtc_base/httpbase_unittest.cc b/rtc_base/httpbase_unittest.cc index 37a6b26781..f3e950bf18 100644 --- a/rtc_base/httpbase_unittest.cc +++ b/rtc_base/httpbase_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpbase.h" -#include "webrtc/rtc_base/testutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/httpbase.h" +#include "rtc_base/testutils.h" namespace rtc { diff --git a/rtc_base/httpcommon-inl.h b/rtc_base/httpcommon-inl.h index f0b02427fc..70263daf88 100644 --- a/rtc_base/httpcommon-inl.h +++ b/rtc_base/httpcommon-inl.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_ -#define WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_ +#ifndef RTC_BASE_HTTPCOMMON_INL_H_ +#define RTC_BASE_HTTPCOMMON_INL_H_ -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpcommon.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/httpcommon.h" namespace rtc { @@ -129,4 +129,4 @@ bool Url::get_attribute(const string& name, string* value) const { } // namespace rtc -#endif // WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_ +#endif // RTC_BASE_HTTPCOMMON_INL_H_ diff --git a/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc index a45d922ee9..a22f0a6aad 100644 --- a/rtc_base/httpcommon.cc +++ b/rtc_base/httpcommon.cc @@ -21,16 +21,16 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/httpcommon-inl.h" -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" +#include "rtc_base/cryptstring.h" +#include "rtc_base/httpcommon-inl.h" +#include "rtc_base/httpcommon.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/httpcommon.h b/rtc_base/httpcommon.h index bb96f984b2..b33d382664 100644 --- a/rtc_base/httpcommon.h +++ b/rtc_base/httpcommon.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_HTTPCOMMON_H_ -#define WEBRTC_RTC_BASE_HTTPCOMMON_H_ +#ifndef RTC_BASE_HTTPCOMMON_H_ +#define RTC_BASE_HTTPCOMMON_H_ #include #include #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringutils.h" namespace rtc { @@ -455,4 +455,4 @@ HttpAuthResult HttpAuthenticate( } // namespace rtc -#endif // WEBRTC_RTC_BASE_HTTPCOMMON_H_ +#endif // RTC_BASE_HTTPCOMMON_H_ diff --git a/rtc_base/httpcommon_unittest.cc b/rtc_base/httpcommon_unittest.cc index 2a4fe65088..997d6e31e1 100644 --- a/rtc_base/httpcommon_unittest.cc +++ b/rtc_base/httpcommon_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpcommon-inl.h" +#include "rtc_base/httpcommon.h" +#include "rtc_base/gunit.h" +#include "rtc_base/httpcommon-inl.h" namespace rtc { diff --git a/rtc_base/httpserver.cc b/rtc_base/httpserver.cc index 9d7aafd52f..3f04b8f542 100644 --- a/rtc_base/httpserver.cc +++ b/rtc_base/httpserver.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/rtc_base/httpcommon-inl.h" +#include "rtc_base/httpcommon-inl.h" -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketstream.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/httpserver.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketstream.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/httpserver.h b/rtc_base/httpserver.h index 0db78ddab0..61442a93f3 100644 --- a/rtc_base/httpserver.h +++ b/rtc_base/httpserver.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_HTTPSERVER_H_ -#define WEBRTC_RTC_BASE_HTTPSERVER_H_ +#ifndef RTC_BASE_HTTPSERVER_H_ +#define RTC_BASE_HTTPSERVER_H_ #include #include -#include "webrtc/rtc_base/httpbase.h" +#include "rtc_base/httpbase.h" namespace rtc { @@ -136,4 +136,4 @@ private: } // namespace rtc -#endif // WEBRTC_RTC_BASE_HTTPSERVER_H_ +#endif // RTC_BASE_HTTPSERVER_H_ diff --git a/rtc_base/httpserver_unittest.cc b/rtc_base/httpserver_unittest.cc index 1e5e0ff82f..5e86c885df 100644 --- a/rtc_base/httpserver_unittest.cc +++ b/rtc_base/httpserver_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/testutils.h" +#include "rtc_base/httpserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/testutils.h" using namespace webrtc::testing; diff --git a/rtc_base/ifaddrs-android.cc b/rtc_base/ifaddrs-android.cc index d2254572ed..85a4497fdd 100644 --- a/rtc_base/ifaddrs-android.cc +++ b/rtc_base/ifaddrs-android.cc @@ -9,7 +9,7 @@ */ #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs-android.h" #include #include #include diff --git a/rtc_base/ifaddrs-android.h b/rtc_base/ifaddrs-android.h index 2c171f0a85..82b4cb3006 100644 --- a/rtc_base/ifaddrs-android.h +++ b/rtc_base/ifaddrs-android.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_IFADDRS_ANDROID_H_ -#define WEBRTC_RTC_BASE_IFADDRS_ANDROID_H_ +#ifndef RTC_BASE_IFADDRS_ANDROID_H_ +#define RTC_BASE_IFADDRS_ANDROID_H_ #include #include @@ -36,4 +36,4 @@ void freeifaddrs(struct ifaddrs* addrs); } // namespace rtc -#endif // WEBRTC_RTC_BASE_IFADDRS_ANDROID_H_ +#endif // RTC_BASE_IFADDRS_ANDROID_H_ diff --git a/rtc_base/ifaddrs_converter.cc b/rtc_base/ifaddrs_converter.cc index b9660e0407..2db99efd6c 100644 --- a/rtc_base/ifaddrs_converter.cc +++ b/rtc_base/ifaddrs_converter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include "rtc_base/ifaddrs_converter.h" namespace rtc { diff --git a/rtc_base/ifaddrs_converter.h b/rtc_base/ifaddrs_converter.h index 8a1fe69e4d..35bef5b004 100644 --- a/rtc_base/ifaddrs_converter.h +++ b/rtc_base/ifaddrs_converter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_IFADDRS_CONVERTER_H_ -#define WEBRTC_RTC_BASE_IFADDRS_CONVERTER_H_ +#ifndef RTC_BASE_IFADDRS_CONVERTER_H_ +#define RTC_BASE_IFADDRS_CONVERTER_H_ #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs-android.h" #else #include #endif // WEBRTC_ANDROID -#include "webrtc/rtc_base/ipaddress.h" +#include "rtc_base/ipaddress.h" namespace rtc { @@ -42,4 +42,4 @@ IfAddrsConverter* CreateIfAddrsConverter(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_IFADDRS_CONVERTER_H_ +#endif // RTC_BASE_IFADDRS_CONVERTER_H_ diff --git a/rtc_base/ignore_wundef.h b/rtc_base/ignore_wundef.h index 77da2b9dd0..1564096464 100644 --- a/rtc_base/ignore_wundef.h +++ b/rtc_base/ignore_wundef.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_IGNORE_WUNDEF_H_ -#define WEBRTC_RTC_BASE_IGNORE_WUNDEF_H_ +#ifndef RTC_BASE_IGNORE_WUNDEF_H_ +#define RTC_BASE_IGNORE_WUNDEF_H_ // If a header file uses #if on possibly undefined macros (and it's for some // reason not possible to just fix the header file), include it like this: @@ -30,4 +30,4 @@ #define RTC_POP_IGNORING_WUNDEF() #endif // __clang__ -#endif // WEBRTC_RTC_BASE_IGNORE_WUNDEF_H_ +#endif // RTC_BASE_IGNORE_WUNDEF_H_ diff --git a/rtc_base/ipaddress.cc b/rtc_base/ipaddress.cc index fa24bef63c..ac0de91e04 100644 --- a/rtc_base/ipaddress.cc +++ b/rtc_base/ipaddress.cc @@ -25,13 +25,13 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/win32.h" namespace rtc { diff --git a/rtc_base/ipaddress.h b/rtc_base/ipaddress.h index 7ccea2d452..f681d79dd6 100644 --- a/rtc_base/ipaddress.h +++ b/rtc_base/ipaddress.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_IPADDRESS_H_ -#define WEBRTC_RTC_BASE_IPADDRESS_H_ +#ifndef RTC_BASE_IPADDRESS_H_ +#define RTC_BASE_IPADDRESS_H_ #if defined(WEBRTC_POSIX) #include @@ -25,10 +25,10 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/byteorder.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif namespace rtc { @@ -185,4 +185,4 @@ int CountIPMaskBits(IPAddress mask); } // namespace rtc -#endif // WEBRTC_RTC_BASE_IPADDRESS_H_ +#endif // RTC_BASE_IPADDRESS_H_ diff --git a/rtc_base/ipaddress_unittest.cc b/rtc_base/ipaddress_unittest.cc index 61a067f283..5d7f2a95cf 100644 --- a/rtc_base/ipaddress_unittest.cc +++ b/rtc_base/ipaddress_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/json.cc b/rtc_base/json.cc index 9a9968adb0..b8071a99bd 100644 --- a/rtc_base/json.cc +++ b/rtc_base/json.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/json.h" +#include "rtc_base/json.h" #include #include diff --git a/rtc_base/json.h b/rtc_base/json.h index 7e1050e070..5db8bd6c90 100644 --- a/rtc_base/json.h +++ b/rtc_base/json.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_JSON_H_ -#define WEBRTC_RTC_BASE_JSON_H_ +#ifndef RTC_BASE_JSON_H_ +#define RTC_BASE_JSON_H_ #include #include @@ -88,4 +88,4 @@ std::string JsonValueToString(const Json::Value& json); } // namespace rtc -#endif // WEBRTC_RTC_BASE_JSON_H_ +#endif // RTC_BASE_JSON_H_ diff --git a/rtc_base/json_unittest.cc b/rtc_base/json_unittest.cc index 5b65bc8b66..17b126aa05 100644 --- a/rtc_base/json_unittest.cc +++ b/rtc_base/json_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/json.h" +#include "rtc_base/json.h" #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h index 79f361ccf3..979415d131 100644 --- a/rtc_base/keep_ref_until_done.h +++ b/rtc_base/keep_ref_until_done.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_ -#define WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_ +#ifndef RTC_BASE_KEEP_REF_UNTIL_DONE_H_ +#define RTC_BASE_KEEP_REF_UNTIL_DONE_H_ -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/callback.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/bind.h" +#include "rtc_base/callback.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -40,4 +40,4 @@ static inline Callback0 KeepRefUntilDone( } // namespace rtc -#endif // WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_ +#endif // RTC_BASE_KEEP_REF_UNTIL_DONE_H_ diff --git a/rtc_base/location.cc b/rtc_base/location.cc index 9b0a5f6d3a..9c90d9ec17 100644 --- a/rtc_base/location.cc +++ b/rtc_base/location.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/location.h" +#include "rtc_base/location.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/location.h b/rtc_base/location.h index dd1b1cafe3..513bc26365 100644 --- a/rtc_base/location.h +++ b/rtc_base/location.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_LOCATION_H_ -#define WEBRTC_RTC_BASE_LOCATION_H_ +#ifndef RTC_BASE_LOCATION_H_ +#define RTC_BASE_LOCATION_H_ #include -#include "webrtc/rtc_base/stringize_macros.h" +#include "rtc_base/stringize_macros.h" namespace rtc { @@ -54,4 +54,4 @@ class Location { } // namespace rtc -#endif // WEBRTC_RTC_BASE_LOCATION_H_ +#endif // RTC_BASE_LOCATION_H_ diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc index d52bd7a4c9..b853d7ccd3 100644 --- a/rtc_base/logging.cc +++ b/rtc_base/logging.cc @@ -39,12 +39,12 @@ static const char kLibjingle[] = "libjingle"; #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" namespace rtc { namespace { diff --git a/rtc_base/logging.h b/rtc_base/logging.h index 345e0d3bba..0f544e43c6 100644 --- a/rtc_base/logging.h +++ b/rtc_base/logging.h @@ -43,8 +43,8 @@ // to output logging data at the desired level. // Lastly, PLOG(sev, err) is an alias for LOG_ERR_EX. -#ifndef WEBRTC_RTC_BASE_LOGGING_H_ -#define WEBRTC_RTC_BASE_LOGGING_H_ +#ifndef RTC_BASE_LOGGING_H_ +#define RTC_BASE_LOGGING_H_ #include @@ -57,9 +57,9 @@ #include #endif -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_annotations.h" namespace rtc { @@ -367,4 +367,4 @@ inline bool LogCheckLevel(LoggingSeverity sev) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_LOGGING_H_ +#endif // RTC_BASE_LOGGING_H_ diff --git a/rtc_base/logging_mac.mm b/rtc_base/logging_mac.mm index 5b5e4c7680..378cfbfcb9 100644 --- a/rtc_base/logging_mac.mm +++ b/rtc_base/logging_mac.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" #import diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc index 940b9c15b7..cd5cafe49b 100644 --- a/rtc_base/logging_unittest.cc +++ b/rtc_base/logging_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/stream.h" +#include "rtc_base/thread.h" +#include "test/testsupport/fileutils.h" namespace rtc { diff --git a/rtc_base/logsinks.cc b/rtc_base/logsinks.cc index ba0b5a51ec..5f64f62aa3 100644 --- a/rtc_base/logsinks.cc +++ b/rtc_base/logsinks.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logsinks.h" +#include "rtc_base/logsinks.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/logsinks.h b/rtc_base/logsinks.h index e54d6ef608..315ef9698b 100644 --- a/rtc_base/logsinks.h +++ b/rtc_base/logsinks.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_LOGSINKS_H_ -#define WEBRTC_RTC_BASE_LOGSINKS_H_ +#ifndef RTC_BASE_LOGSINKS_H_ +#define RTC_BASE_LOGSINKS_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/filerotatingstream.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/filerotatingstream.h" +#include "rtc_base/logging.h" namespace rtc { @@ -65,4 +65,4 @@ class CallSessionFileRotatingLogSink : public FileRotatingLogSink { } // namespace rtc -#endif // WEBRTC_RTC_BASE_LOGSINKS_H_ +#endif // RTC_BASE_LOGSINKS_H_ diff --git a/rtc_base/macifaddrs_converter.cc b/rtc_base/macifaddrs_converter.cc index 44e1087870..f3b22bbf82 100644 --- a/rtc_base/macifaddrs_converter.cc +++ b/rtc_base/macifaddrs_converter.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ifaddrs_converter.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/ifaddrs_converter.h" +#include "rtc_base/logging.h" #if !defined(WEBRTC_IOS) #include diff --git a/rtc_base/macutils.cc b/rtc_base/macutils.cc index 2e5e1fb363..03f53d51f9 100644 --- a/rtc_base/macutils.cc +++ b/rtc_base/macutils.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/macutils.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/macutils.h b/rtc_base/macutils.h index 5b4021b8fd..1d694c9f92 100644 --- a/rtc_base/macutils.h +++ b/rtc_base/macutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MACUTILS_H_ -#define WEBRTC_RTC_BASE_MACUTILS_H_ +#ifndef RTC_BASE_MACUTILS_H_ +#define RTC_BASE_MACUTILS_H_ #include #include @@ -47,4 +47,4 @@ MacOSVersionName GetOSVersionName(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_MACUTILS_H_ +#endif // RTC_BASE_MACUTILS_H_ diff --git a/rtc_base/macutils_unittest.cc b/rtc_base/macutils_unittest.cc index f5f4b8d4d8..5d80539a22 100644 --- a/rtc_base/macutils_unittest.cc +++ b/rtc_base/macutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/macutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/macutils.h" +#include "rtc_base/gunit.h" TEST(MacUtilsTest, GetOsVersionName) { rtc::MacOSVersionName ver = rtc::GetOSVersionName(); diff --git a/rtc_base/mathutils.h b/rtc_base/mathutils.h index e57697c497..7866a741be 100644 --- a/rtc_base/mathutils.h +++ b/rtc_base/mathutils.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MATHUTILS_H_ -#define WEBRTC_RTC_BASE_MATHUTILS_H_ +#ifndef RTC_BASE_MATHUTILS_H_ +#define RTC_BASE_MATHUTILS_H_ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" #ifndef M_PI #define M_PI 3.14159265359f @@ -36,4 +36,4 @@ typename std::make_unsigned::type unsigned_difference(T x, T y) { return static_cast(x) - static_cast(y); } -#endif // WEBRTC_RTC_BASE_MATHUTILS_H_ +#endif // RTC_BASE_MATHUTILS_H_ diff --git a/rtc_base/md5.cc b/rtc_base/md5.cc index be4cac900d..86cf892dc5 100644 --- a/rtc_base/md5.cc +++ b/rtc_base/md5.cc @@ -18,12 +18,12 @@ // Changes from original C code: // Ported to C++, type casting, Google code style. -#include "webrtc/rtc_base/md5.h" +#include "rtc_base/md5.h" // TODO: Avoid memcmpy - hash directly from memory. #include // for memcpy(). -#include "webrtc/rtc_base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN. +#include "rtc_base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN. namespace rtc { diff --git a/rtc_base/md5.h b/rtc_base/md5.h index 9326d53eaa..dc0713c351 100644 --- a/rtc_base/md5.h +++ b/rtc_base/md5.h @@ -20,8 +20,8 @@ // Changes(hellner): added rtc namespace // Changes(pbos): Reverted types back to uint32(8)_t with _t suffix. -#ifndef WEBRTC_RTC_BASE_MD5_H_ -#define WEBRTC_RTC_BASE_MD5_H_ +#ifndef RTC_BASE_MD5_H_ +#define RTC_BASE_MD5_H_ #include #include @@ -41,4 +41,4 @@ void MD5Transform(uint32_t buf[4], const uint32_t in[16]); } // namespace rtc -#endif // WEBRTC_RTC_BASE_MD5_H_ +#endif // RTC_BASE_MD5_H_ diff --git a/rtc_base/md5digest.cc b/rtc_base/md5digest.cc index 543de7d803..928dbe375a 100644 --- a/rtc_base/md5digest.cc +++ b/rtc_base/md5digest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/md5digest.h" +#include "rtc_base/md5digest.h" namespace rtc { diff --git a/rtc_base/md5digest.h b/rtc_base/md5digest.h index 2e7426dbea..a6558ef673 100644 --- a/rtc_base/md5digest.h +++ b/rtc_base/md5digest.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MD5DIGEST_H_ -#define WEBRTC_RTC_BASE_MD5DIGEST_H_ +#ifndef RTC_BASE_MD5DIGEST_H_ +#define RTC_BASE_MD5DIGEST_H_ -#include "webrtc/rtc_base/md5.h" -#include "webrtc/rtc_base/messagedigest.h" +#include "rtc_base/md5.h" +#include "rtc_base/messagedigest.h" namespace rtc { @@ -33,4 +33,4 @@ class Md5Digest : public MessageDigest { } // namespace rtc -#endif // WEBRTC_RTC_BASE_MD5DIGEST_H_ +#endif // RTC_BASE_MD5DIGEST_H_ diff --git a/rtc_base/md5digest_unittest.cc b/rtc_base/md5digest_unittest.cc index f2f5ecaeee..dcdc19836f 100644 --- a/rtc_base/md5digest_unittest.cc +++ b/rtc_base/md5digest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/md5digest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/md5digest.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/memory_usage.cc b/rtc_base/memory_usage.cc index 34fb910ee9..c7c361bf24 100644 --- a/rtc_base/memory_usage.cc +++ b/rtc_base/memory_usage.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/memory_usage.h" +#include "rtc_base/memory_usage.h" #if defined(WEBRTC_LINUX) #include @@ -22,7 +22,7 @@ #include #endif -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/memory_usage.h b/rtc_base/memory_usage.h index 4cb8231697..c49323c825 100644 --- a/rtc_base/memory_usage.h +++ b/rtc_base/memory_usage.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MEMORY_USAGE_H_ -#define WEBRTC_RTC_BASE_MEMORY_USAGE_H_ +#ifndef RTC_BASE_MEMORY_USAGE_H_ +#define RTC_BASE_MEMORY_USAGE_H_ #include @@ -21,4 +21,4 @@ int64_t GetProcessResidentSizeBytes(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_MEMORY_USAGE_H_ +#endif // RTC_BASE_MEMORY_USAGE_H_ diff --git a/rtc_base/memory_usage_unittest.cc b/rtc_base/memory_usage_unittest.cc index 5b6224fde5..87cdcef89b 100644 --- a/rtc_base/memory_usage_unittest.cc +++ b/rtc_base/memory_usage_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/memory_usage.h" +#include "rtc_base/memory_usage.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_base/messagedigest.cc b/rtc_base/messagedigest.cc index a72ae404ac..bf8d25dcbf 100644 --- a/rtc_base/messagedigest.cc +++ b/rtc_base/messagedigest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagedigest.h" +#include "rtc_base/messagedigest.h" #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/openssldigest.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/openssldigest.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/messagedigest.h b/rtc_base/messagedigest.h index 12e4287a14..f80dd7aa53 100644 --- a/rtc_base/messagedigest.h +++ b/rtc_base/messagedigest.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MESSAGEDIGEST_H_ -#define WEBRTC_RTC_BASE_MESSAGEDIGEST_H_ +#ifndef RTC_BASE_MESSAGEDIGEST_H_ +#define RTC_BASE_MESSAGEDIGEST_H_ #include @@ -106,4 +106,4 @@ bool ComputeHmac(const std::string& alg, const std::string& key, } // namespace rtc -#endif // WEBRTC_RTC_BASE_MESSAGEDIGEST_H_ +#endif // RTC_BASE_MESSAGEDIGEST_H_ diff --git a/rtc_base/messagedigest_unittest.cc b/rtc_base/messagedigest_unittest.cc index ebc091a8cf..4d7c338fa8 100644 --- a/rtc_base/messagedigest_unittest.cc +++ b/rtc_base/messagedigest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/messagehandler.cc b/rtc_base/messagehandler.cc index 741049a9d4..2f580cc703 100644 --- a/rtc_base/messagehandler.cc +++ b/rtc_base/messagehandler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" namespace rtc { diff --git a/rtc_base/messagehandler.h b/rtc_base/messagehandler.h index 04e4b10781..9194c1dc6e 100644 --- a/rtc_base/messagehandler.h +++ b/rtc_base/messagehandler.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MESSAGEHANDLER_H_ -#define WEBRTC_RTC_BASE_MESSAGEHANDLER_H_ +#ifndef RTC_BASE_MESSAGEHANDLER_H_ +#define RTC_BASE_MESSAGEHANDLER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -72,4 +72,4 @@ class FunctorMessageHandler : public MessageHandler { } // namespace rtc -#endif // WEBRTC_RTC_BASE_MESSAGEHANDLER_H_ +#endif // RTC_BASE_MESSAGEHANDLER_H_ diff --git a/rtc_base/messagequeue.cc b/rtc_base/messagequeue.cc index 3dd11426eb..f863d0c719 100644 --- a/rtc_base/messagequeue.cc +++ b/rtc_base/messagequeue.cc @@ -9,13 +9,13 @@ */ #include -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/trace_event.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread.h" +#include "rtc_base/trace_event.h" namespace rtc { namespace { diff --git a/rtc_base/messagequeue.h b/rtc_base/messagequeue.h index 79217fb721..70556438e3 100644 --- a/rtc_base/messagequeue.h +++ b/rtc_base/messagequeue.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MESSAGEQUEUE_H_ -#define WEBRTC_RTC_BASE_MESSAGEQUEUE_H_ +#ifndef RTC_BASE_MESSAGEQUEUE_H_ +#define RTC_BASE_MESSAGEQUEUE_H_ #include @@ -20,16 +20,16 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketserver.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/timeutils.h" namespace rtc { @@ -326,4 +326,4 @@ class MessageQueue { } // namespace rtc -#endif // WEBRTC_RTC_BASE_MESSAGEQUEUE_H_ +#endif // RTC_BASE_MESSAGEQUEUE_H_ diff --git a/rtc_base/messagequeue_unittest.cc b/rtc_base/messagequeue_unittest.cc index 4003e2ddcd..b7528cf7b2 100644 --- a/rtc_base/messagequeue_unittest.cc +++ b/rtc_base/messagequeue_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/messagequeue.h" +#include "rtc_base/messagequeue.h" #include -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/bind.h" +#include "rtc_base/event.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/refcount.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" using namespace rtc; diff --git a/rtc_base/mod_ops.h b/rtc_base/mod_ops.h index f8cb951e83..0e5f30fea1 100644 --- a/rtc_base/mod_ops.h +++ b/rtc_base/mod_ops.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MOD_OPS_H_ -#define WEBRTC_RTC_BASE_MOD_OPS_H_ +#ifndef RTC_BASE_MOD_OPS_H_ +#define RTC_BASE_MOD_OPS_H_ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -139,4 +139,4 @@ inline T MinDiff(T a, T b) { } // namespace webrtc -#endif // WEBRTC_RTC_BASE_MOD_OPS_H_ +#endif // RTC_BASE_MOD_OPS_H_ diff --git a/rtc_base/mod_ops_unittest.cc b/rtc_base/mod_ops_unittest.cc index d39ea061b6..bd68f83a64 100644 --- a/rtc_base/mod_ops_unittest.cc +++ b/rtc_base/mod_ops_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/mod_ops.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/mod_ops.h" +#include "test/gtest.h" namespace webrtc { class TestModOps : public ::testing::Test { diff --git a/rtc_base/moving_max_counter.h b/rtc_base/moving_max_counter.h index 190b7b85c2..1e7a728e22 100644 --- a/rtc_base/moving_max_counter.h +++ b/rtc_base/moving_max_counter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_MOVING_MAX_COUNTER_H_ -#define WEBRTC_RTC_BASE_MOVING_MAX_COUNTER_H_ +#ifndef RTC_BASE_MOVING_MAX_COUNTER_H_ +#define RTC_BASE_MOVING_MAX_COUNTER_H_ #include @@ -17,9 +17,9 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -113,4 +113,4 @@ void MovingMaxCounter::RollWindow(int64_t new_time_ms) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_MOVING_MAX_COUNTER_H_ +#endif // RTC_BASE_MOVING_MAX_COUNTER_H_ diff --git a/rtc_base/moving_max_counter_unittest.cc b/rtc_base/moving_max_counter_unittest.cc index 54dbe7e7da..ff8bac9760 100644 --- a/rtc_base/moving_max_counter_unittest.cc +++ b/rtc_base/moving_max_counter_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/moving_max_counter.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/moving_max_counter.h" +#include "test/gtest.h" TEST(MovingMaxCounter, ReportsMaximumInTheWindow) { rtc::MovingMaxCounter counter(100); diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc index 7454028aec..592fea4fce 100644 --- a/rtc_base/nat_unittest.cc +++ b/rtc_base/nat_unittest.cc @@ -12,17 +12,17 @@ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/network.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/natsocketfactory.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/network.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/testclient.h" +#include "rtc_base/virtualsocketserver.h" using namespace rtc; diff --git a/rtc_base/natserver.cc b/rtc_base/natserver.cc index d3d1e143fc..59bca4f908 100644 --- a/rtc_base/natserver.cc +++ b/rtc_base/natserver.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/socketadapters.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/natsocketfactory.h" +#include "rtc_base/socketadapters.h" namespace rtc { diff --git a/rtc_base/natserver.h b/rtc_base/natserver.h index fe901f9fd0..a7b4d62520 100644 --- a/rtc_base/natserver.h +++ b/rtc_base/natserver.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NATSERVER_H_ -#define WEBRTC_RTC_BASE_NATSERVER_H_ +#ifndef RTC_BASE_NATSERVER_H_ +#define RTC_BASE_NATSERVER_H_ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/nattypes.h" -#include "webrtc/rtc_base/proxyserver.h" -#include "webrtc/rtc_base/socketaddresspair.h" -#include "webrtc/rtc_base/socketfactory.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/nattypes.h" +#include "rtc_base/proxyserver.h" +#include "rtc_base/socketaddresspair.h" +#include "rtc_base/socketfactory.h" +#include "rtc_base/thread.h" namespace rtc { @@ -121,4 +121,4 @@ class NATServer : public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_NATSERVER_H_ +#endif // RTC_BASE_NATSERVER_H_ diff --git a/rtc_base/natsocketfactory.cc b/rtc_base/natsocketfactory.cc index ad746d7b74..dbcba975a0 100644 --- a/rtc_base/natsocketfactory.cc +++ b/rtc_base/natsocketfactory.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/natsocketfactory.h" +#include "rtc_base/natsocketfactory.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/natserver.h" +#include "rtc_base/virtualsocketserver.h" namespace rtc { diff --git a/rtc_base/natsocketfactory.h b/rtc_base/natsocketfactory.h index 9e7cce01bb..319545c1a5 100644 --- a/rtc_base/natsocketfactory.h +++ b/rtc_base/natsocketfactory.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NATSOCKETFACTORY_H_ -#define WEBRTC_RTC_BASE_NATSOCKETFACTORY_H_ +#ifndef RTC_BASE_NATSOCKETFACTORY_H_ +#define RTC_BASE_NATSOCKETFACTORY_H_ #include #include #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/natserver.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/socketserver.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/natserver.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketserver.h" namespace rtc { @@ -165,4 +165,4 @@ size_t UnpackAddressFromNAT(const char* buf, size_t buf_size, SocketAddress* remote_addr); } // namespace rtc -#endif // WEBRTC_RTC_BASE_NATSOCKETFACTORY_H_ +#endif // RTC_BASE_NATSOCKETFACTORY_H_ diff --git a/rtc_base/nattypes.cc b/rtc_base/nattypes.cc index 973569ba7b..29936ad848 100644 --- a/rtc_base/nattypes.cc +++ b/rtc_base/nattypes.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nattypes.h" +#include "rtc_base/nattypes.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/nattypes.h b/rtc_base/nattypes.h index cc846c039e..64b36d3f85 100644 --- a/rtc_base/nattypes.h +++ b/rtc_base/nattypes.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NATTYPES_H_ -#define WEBRTC_RTC_BASE_NATTYPES_H_ +#ifndef RTC_BASE_NATTYPES_H_ +#define RTC_BASE_NATTYPES_H_ namespace rtc { @@ -44,4 +44,4 @@ public: } // namespace rtc -#endif // WEBRTC_RTC_BASE_NATTYPES_H_ +#endif // RTC_BASE_NATTYPES_H_ diff --git a/rtc_base/nethelpers.cc b/rtc_base/nethelpers.cc index 8489970b39..673af0ba63 100644 --- a/rtc_base/nethelpers.cc +++ b/rtc_base/nethelpers.cc @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nethelpers.h" +#include "rtc_base/nethelpers.h" #include #if defined(WEBRTC_WIN) #include #include -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif #if defined(WEBRTC_POSIX) && !defined(__native_client__) #if defined(WEBRTC_ANDROID) -#include "webrtc/rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs-android.h" #else #include #endif #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/signalthread.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/signalthread.h" namespace rtc { diff --git a/rtc_base/nethelpers.h b/rtc_base/nethelpers.h index d25879e785..e118b27dbc 100644 --- a/rtc_base/nethelpers.h +++ b/rtc_base/nethelpers.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NETHELPERS_H_ -#define WEBRTC_RTC_BASE_NETHELPERS_H_ +#ifndef RTC_BASE_NETHELPERS_H_ +#define RTC_BASE_NETHELPERS_H_ #if defined(WEBRTC_POSIX) #include @@ -20,10 +20,10 @@ #include -#include "webrtc/rtc_base/asyncresolverinterface.h" -#include "webrtc/rtc_base/signalthread.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/asyncresolverinterface.h" +#include "rtc_base/signalthread.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" namespace rtc { @@ -63,4 +63,4 @@ bool HasIPv4Enabled(); bool HasIPv6Enabled(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_NETHELPERS_H_ +#endif // RTC_BASE_NETHELPERS_H_ diff --git a/rtc_base/network.cc b/rtc_base/network.cc index f2a1b87e39..407c5de752 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/network.h" +#include "rtc_base/network.h" #if defined(WEBRTC_POSIX) // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -23,10 +23,10 @@ #endif // WEBRTC_POSIX #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include #elif !defined(__native_client__) -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include "rtc_base/ifaddrs_converter.h" #endif #include @@ -34,13 +34,13 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/socket.h" // includes something that makes windows happy -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/socket.h" // includes something that makes windows happy +#include "rtc_base/stream.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/thread.h" namespace rtc { namespace { diff --git a/rtc_base/network.h b/rtc_base/network.h index ceb96c4760..b3b43d834f 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NETWORK_H_ -#define WEBRTC_RTC_BASE_NETWORK_H_ +#ifndef RTC_BASE_NETWORK_H_ +#define RTC_BASE_NETWORK_H_ #include @@ -19,10 +19,10 @@ #include #include -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/sigslot.h" #if defined(WEBRTC_POSIX) struct ifaddrs; @@ -431,4 +431,4 @@ class Network { } // namespace rtc -#endif // WEBRTC_RTC_BASE_NETWORK_H_ +#endif // RTC_BASE_NETWORK_H_ diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc index 9af9294c6c..29349b477c 100644 --- a/rtc_base/network_unittest.cc +++ b/rtc_base/network_unittest.cc @@ -8,24 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/network.h" +#include "rtc_base/network.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/networkmonitor.h" +#include "rtc_base/checks.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/networkmonitor.h" #if defined(WEBRTC_POSIX) #include #include -#include "webrtc/rtc_base/ifaddrs_converter.h" +#include "rtc_base/ifaddrs_converter.h" #endif // defined(WEBRTC_POSIX) -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/logging.h" // For LOG_GLE +#include "rtc_base/logging.h" // For LOG_GLE #endif namespace rtc { diff --git a/rtc_base/networkmonitor.cc b/rtc_base/networkmonitor.cc index a23cc77e2c..6a81e93275 100644 --- a/rtc_base/networkmonitor.cc +++ b/rtc_base/networkmonitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/networkmonitor.h" +#include "rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace { const uint32_t UPDATE_NETWORKS_MESSAGE = 1; diff --git a/rtc_base/networkmonitor.h b/rtc_base/networkmonitor.h index f7cef1bcf5..d98b803169 100644 --- a/rtc_base/networkmonitor.h +++ b/rtc_base/networkmonitor.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NETWORKMONITOR_H_ -#define WEBRTC_RTC_BASE_NETWORKMONITOR_H_ +#ifndef RTC_BASE_NETWORKMONITOR_H_ +#define RTC_BASE_NETWORKMONITOR_H_ -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/logging.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace rtc { @@ -125,4 +125,4 @@ class NetworkMonitorFactory { } // namespace rtc -#endif // WEBRTC_RTC_BASE_NETWORKMONITOR_H_ +#endif // RTC_BASE_NETWORKMONITOR_H_ diff --git a/rtc_base/networkroute.h b/rtc_base/networkroute.h index c43f5fc28c..f245cb9dc3 100644 --- a/rtc_base/networkroute.h +++ b/rtc_base/networkroute.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NETWORKROUTE_H_ -#define WEBRTC_RTC_BASE_NETWORKROUTE_H_ +#ifndef RTC_BASE_NETWORKROUTE_H_ +#define RTC_BASE_NETWORKROUTE_H_ // TODO(honghaiz): Make a directory that describes the interfaces and structs // the media code can rely on and the network code can implement, and both can @@ -50,4 +50,4 @@ struct NetworkRoute { }; } // namespace rtc -#endif // WEBRTC_RTC_BASE_NETWORKROUTE_H_ +#endif // RTC_BASE_NETWORKROUTE_H_ diff --git a/rtc_base/nullsocketserver.cc b/rtc_base/nullsocketserver.cc index 5c6538680e..68b67fa4c8 100644 --- a/rtc_base/nullsocketserver.cc +++ b/rtc_base/nullsocketserver.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/nullsocketserver.h b/rtc_base/nullsocketserver.h index 997a416216..7715c5cb7f 100644 --- a/rtc_base/nullsocketserver.h +++ b/rtc_base/nullsocketserver.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_ +#ifndef RTC_BASE_NULLSOCKETSERVER_H_ +#define RTC_BASE_NULLSOCKETSERVER_H_ -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/socketserver.h" +#include "rtc_base/event.h" +#include "rtc_base/socketserver.h" namespace rtc { @@ -35,4 +35,4 @@ class NullSocketServer : public SocketServer { } // namespace rtc -#endif // WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_ +#endif // RTC_BASE_NULLSOCKETSERVER_H_ diff --git a/rtc_base/nullsocketserver_unittest.cc b/rtc_base/nullsocketserver_unittest.cc index 5538322643..29f4980c26 100644 --- a/rtc_base/nullsocketserver_unittest.cc +++ b/rtc_base/nullsocketserver_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/numerics/exp_filter.cc b/rtc_base/numerics/exp_filter.cc index b3d961034c..0c6fb006f6 100644 --- a/rtc_base/numerics/exp_filter.cc +++ b/rtc_base/numerics/exp_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "rtc_base/numerics/exp_filter.h" #include diff --git a/rtc_base/numerics/exp_filter.h b/rtc_base/numerics/exp_filter.h index 24b81518d1..4be9a0a778 100644 --- a/rtc_base/numerics/exp_filter.h +++ b/rtc_base/numerics/exp_filter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NUMERICS_EXP_FILTER_H_ -#define WEBRTC_RTC_BASE_NUMERICS_EXP_FILTER_H_ +#ifndef RTC_BASE_NUMERICS_EXP_FILTER_H_ +#define RTC_BASE_NUMERICS_EXP_FILTER_H_ namespace rtc { @@ -45,4 +45,4 @@ class ExpFilter { }; } // namespace rtc -#endif // WEBRTC_RTC_BASE_NUMERICS_EXP_FILTER_H_ +#endif // RTC_BASE_NUMERICS_EXP_FILTER_H_ diff --git a/rtc_base/numerics/exp_filter_unittest.cc b/rtc_base/numerics/exp_filter_unittest.cc index 892db1e1c8..412dc77099 100644 --- a/rtc_base/numerics/exp_filter_unittest.cc +++ b/rtc_base/numerics/exp_filter_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/numerics/exp_filter.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_base/numerics/percentile_filter.h b/rtc_base/numerics/percentile_filter.h index b514aab5bb..c24850bed8 100644 --- a/rtc_base/numerics/percentile_filter.h +++ b/rtc_base/numerics/percentile_filter.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ -#define WEBRTC_RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ +#ifndef RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ +#define RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { @@ -112,4 +112,4 @@ T PercentileFilter::GetPercentileValue() const { } // namespace webrtc -#endif // WEBRTC_RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ +#endif // RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc index 22d2085e45..b7aff43010 100644 --- a/rtc_base/numerics/percentile_filter_unittest.cc +++ b/rtc_base/numerics/percentile_filter_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/numerics/percentile_filter.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/numerics/percentile_filter.h" +#include "test/gtest.h" namespace webrtc { diff --git a/rtc_base/onetimeevent.h b/rtc_base/onetimeevent.h index 37afba254c..ab922ef4f7 100644 --- a/rtc_base/onetimeevent.h +++ b/rtc_base/onetimeevent.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ONETIMEEVENT_H_ -#define WEBRTC_RTC_BASE_ONETIMEEVENT_H_ +#ifndef RTC_BASE_ONETIMEEVENT_H_ +#define RTC_BASE_ONETIMEEVENT_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { // Provides a simple way to perform an operation (such as logging) one @@ -58,4 +58,4 @@ class ThreadUnsafeOneTimeEvent { } // namespace webrtc -#endif // WEBRTC_RTC_BASE_ONETIMEEVENT_H_ +#endif // RTC_BASE_ONETIMEEVENT_H_ diff --git a/rtc_base/onetimeevent_unittest.cc b/rtc_base/onetimeevent_unittest.cc index e4984e28f2..49cae07a69 100644 --- a/rtc_base/onetimeevent_unittest.cc +++ b/rtc_base/onetimeevent_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/onetimeevent.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/onetimeevent.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/rtc_base/openssl.h b/rtc_base/openssl.h index 4c89c94ec6..a0325c972c 100644 --- a/rtc_base/openssl.h +++ b/rtc_base/openssl.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPENSSL_H_ -#define WEBRTC_RTC_BASE_OPENSSL_H_ +#ifndef RTC_BASE_OPENSSL_H_ +#define RTC_BASE_OPENSSL_H_ #include @@ -17,4 +17,4 @@ #error OpenSSL is older than 1.0.0, which is the minimum supported version. #endif -#endif // WEBRTC_RTC_BASE_OPENSSL_H_ +#endif // RTC_BASE_OPENSSL_H_ diff --git a/rtc_base/openssladapter.cc b/rtc_base/openssladapter.cc index d944fa04a5..f0ecf0979e 100644 --- a/rtc_base/openssladapter.cc +++ b/rtc_base/openssladapter.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/openssladapter.h" +#include "rtc_base/openssladapter.h" #if defined(WEBRTC_POSIX) #include #endif // Must be included first before openssl headers. -#include "webrtc/rtc_base/win32.h" // NOLINT +#include "rtc_base/win32.h" // NOLINT #include #include @@ -25,15 +25,15 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sslroots.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/openssl.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/sslroots.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/rtc_base/openssladapter.h b/rtc_base/openssladapter.h index 6409c76a49..7148503d89 100644 --- a/rtc_base/openssladapter.h +++ b/rtc_base/openssladapter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPENSSLADAPTER_H_ -#define WEBRTC_RTC_BASE_OPENSSLADAPTER_H_ +#ifndef RTC_BASE_OPENSSLADAPTER_H_ +#define RTC_BASE_OPENSSLADAPTER_H_ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "rtc_base/buffer.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/ssladapter.h" typedef struct ssl_st SSL; typedef struct ssl_ctx_st SSL_CTX; @@ -176,4 +176,4 @@ class OpenSSLAdapterFactory : public SSLAdapterFactory { } // namespace rtc -#endif // WEBRTC_RTC_BASE_OPENSSLADAPTER_H_ +#endif // RTC_BASE_OPENSSLADAPTER_H_ diff --git a/rtc_base/openssladapter_unittest.cc b/rtc_base/openssladapter_unittest.cc index e4432664fb..d043353ac1 100644 --- a/rtc_base/openssladapter_unittest.cc +++ b/rtc_base/openssladapter_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/openssladapter.h" +#include "rtc_base/gunit.h" +#include "rtc_base/openssladapter.h" namespace rtc { diff --git a/rtc_base/openssldigest.cc b/rtc_base/openssldigest.cc index fa27a464d2..3be82e61d3 100644 --- a/rtc_base/openssldigest.cc +++ b/rtc_base/openssldigest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/openssldigest.h" +#include "rtc_base/openssldigest.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/openssl.h" +#include "rtc_base/checks.h" +#include "rtc_base/openssl.h" namespace rtc { diff --git a/rtc_base/openssldigest.h b/rtc_base/openssldigest.h index ab4ca16a6b..d796665675 100644 --- a/rtc_base/openssldigest.h +++ b/rtc_base/openssldigest.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPENSSLDIGEST_H_ -#define WEBRTC_RTC_BASE_OPENSSLDIGEST_H_ +#ifndef RTC_BASE_OPENSSLDIGEST_H_ +#define RTC_BASE_OPENSSLDIGEST_H_ #include -#include "webrtc/rtc_base/messagedigest.h" +#include "rtc_base/messagedigest.h" namespace rtc { @@ -47,4 +47,4 @@ class OpenSSLDigest : public MessageDigest { } // namespace rtc -#endif // WEBRTC_RTC_BASE_OPENSSLDIGEST_H_ +#endif // RTC_BASE_OPENSSLDIGEST_H_ diff --git a/rtc_base/opensslidentity.cc b/rtc_base/opensslidentity.cc index a6b6e1c38e..075a1b5485 100644 --- a/rtc_base/opensslidentity.cc +++ b/rtc_base/opensslidentity.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/opensslidentity.h" +#include "rtc_base/opensslidentity.h" #include // Must be included first before openssl headers. -#include "webrtc/rtc_base/win32.h" // NOLINT +#include "rtc_base/win32.h" // NOLINT #include #include @@ -22,11 +22,11 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/openssldigest.h" +#include "rtc_base/checks.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/openssl.h" +#include "rtc_base/openssldigest.h" namespace rtc { diff --git a/rtc_base/opensslidentity.h b/rtc_base/opensslidentity.h index ed7c07299a..e4a790e48e 100644 --- a/rtc_base/opensslidentity.h +++ b/rtc_base/opensslidentity.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_ -#define WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_ +#ifndef RTC_BASE_OPENSSLIDENTITY_H_ +#define RTC_BASE_OPENSSLIDENTITY_H_ #include #include @@ -17,9 +17,9 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sslidentity.h" typedef struct ssl_ctx_st SSL_CTX; @@ -144,4 +144,4 @@ class OpenSSLIdentity : public SSLIdentity { } // namespace rtc -#endif // WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_ +#endif // RTC_BASE_OPENSSLIDENTITY_H_ diff --git a/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc index 53f35fc802..6fad7f9d48 100644 --- a/rtc_base/opensslstreamadapter.cc +++ b/rtc_base/opensslstreamadapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/opensslstreamadapter.h" +#include "rtc_base/opensslstreamadapter.h" #include #include @@ -24,17 +24,17 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/openssl.h" -#include "webrtc/rtc_base/openssladapter.h" -#include "webrtc/rtc_base/openssldigest.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/openssl.h" +#include "rtc_base/openssladapter.h" +#include "rtc_base/openssldigest.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace { bool g_use_time_callback_for_testing = false; diff --git a/rtc_base/opensslstreamadapter.h b/rtc_base/opensslstreamadapter.h index 32518ce3d9..802e6b0ac3 100644 --- a/rtc_base/opensslstreamadapter.h +++ b/rtc_base/opensslstreamadapter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPENSSLSTREAMADAPTER_H_ -#define WEBRTC_RTC_BASE_OPENSSLSTREAMADAPTER_H_ +#ifndef RTC_BASE_OPENSSLSTREAMADAPTER_H_ +#define RTC_BASE_OPENSSLSTREAMADAPTER_H_ #include #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "rtc_base/buffer.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/sslstreamadapter.h" typedef struct ssl_st SSL; typedef struct ssl_ctx_st SSL_CTX; @@ -223,4 +223,4 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter { } // namespace rtc -#endif // WEBRTC_RTC_BASE_OPENSSLSTREAMADAPTER_H_ +#endif // RTC_BASE_OPENSSLSTREAMADAPTER_H_ diff --git a/rtc_base/optional.h b/rtc_base/optional.h index b70774684c..04294dc452 100644 --- a/rtc_base/optional.h +++ b/rtc_base/optional.h @@ -11,9 +11,9 @@ // This header is for backwards compatibility only, and will be removed soon. // Include webrtc/api/optional.h instead. -#ifndef WEBRTC_RTC_BASE_OPTIONAL_H_ -#define WEBRTC_RTC_BASE_OPTIONAL_H_ +#ifndef RTC_BASE_OPTIONAL_H_ +#define RTC_BASE_OPTIONAL_H_ -#include "webrtc/api/optional.h" +#include "api/optional.h" -#endif // WEBRTC_RTC_BASE_OPTIONAL_H_ +#endif // RTC_BASE_OPTIONAL_H_ diff --git a/rtc_base/optionsfile.cc b/rtc_base/optionsfile.cc index e8401fb325..a76270db00 100644 --- a/rtc_base/optionsfile.cc +++ b/rtc_base/optionsfile.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/optionsfile.h" +#include "rtc_base/optionsfile.h" #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/logging.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/optionsfile.h b/rtc_base/optionsfile.h index 778ffaf9e8..90976ac579 100644 --- a/rtc_base/optionsfile.h +++ b/rtc_base/optionsfile.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_OPTIONSFILE_H_ -#define WEBRTC_RTC_BASE_OPTIONSFILE_H_ +#ifndef RTC_BASE_OPTIONSFILE_H_ +#define RTC_BASE_OPTIONSFILE_H_ #include #include @@ -47,4 +47,4 @@ class OptionsFile { } // namespace rtc -#endif // WEBRTC_RTC_BASE_OPTIONSFILE_H_ +#endif // RTC_BASE_OPTIONSFILE_H_ diff --git a/rtc_base/optionsfile_unittest.cc b/rtc_base/optionsfile_unittest.cc index b4f14dbfa6..d2e3cbd8e3 100644 --- a/rtc_base/optionsfile_unittest.cc +++ b/rtc_base/optionsfile_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/optionsfile.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/optionsfile.h" +#include "test/testsupport/fileutils.h" namespace rtc { diff --git a/rtc_base/pathutils.cc b/rtc_base/pathutils.cc index 0ce052e22b..6ab8b243a4 100644 --- a/rtc_base/pathutils.cc +++ b/rtc_base/pathutils.cc @@ -9,16 +9,16 @@ */ #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include #include #include #endif // WEBRTC_WIN -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/pathutils.h b/rtc_base/pathutils.h index bce5addb26..b66cf185e3 100644 --- a/rtc_base/pathutils.h +++ b/rtc_base/pathutils.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PATHUTILS_H_ -#define WEBRTC_RTC_BASE_PATHUTILS_H_ +#ifndef RTC_BASE_PATHUTILS_H_ +#define RTC_BASE_PATHUTILS_H_ #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { @@ -90,4 +90,4 @@ private: } // namespace rtc -#endif // WEBRTC_RTC_BASE_PATHUTILS_H_ +#endif // RTC_BASE_PATHUTILS_H_ diff --git a/rtc_base/pathutils_unittest.cc b/rtc_base/pathutils_unittest.cc index 390ae8a93d..cbd33ed9e1 100644 --- a/rtc_base/pathutils_unittest.cc +++ b/rtc_base/pathutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/gunit.h" TEST(Pathname, ReturnsDotForEmptyPathname) { const std::string kCWD = diff --git a/rtc_base/physicalsocketserver.cc b/rtc_base/physicalsocketserver.cc index 8c6c7ddab9..d61e3e738a 100644 --- a/rtc_base/physicalsocketserver.cc +++ b/rtc_base/physicalsocketserver.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/physicalsocketserver.h" +#include "rtc_base/physicalsocketserver.h" #if defined(_MSC_VER) && _MSC_VER < 1300 #pragma warning(disable:4786) @@ -43,15 +43,15 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/win32socketinit.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/win32socketinit.h" #if defined(WEBRTC_POSIX) #include // for TCP_NODELAY diff --git a/rtc_base/physicalsocketserver.h b/rtc_base/physicalsocketserver.h index c91e14e342..f8167744d0 100644 --- a/rtc_base/physicalsocketserver.h +++ b/rtc_base/physicalsocketserver.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_ +#ifndef RTC_BASE_PHYSICALSOCKETSERVER_H_ +#define RTC_BASE_PHYSICALSOCKETSERVER_H_ #if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) #include @@ -20,9 +20,9 @@ #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/socketserver.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/socketserver.h" #if defined(WEBRTC_POSIX) typedef int SOCKET; @@ -267,4 +267,4 @@ class SocketDispatcher : public Dispatcher, public PhysicalSocket { } // namespace rtc -#endif // WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_ +#endif // RTC_BASE_PHYSICALSOCKETSERVER_H_ diff --git a/rtc_base/physicalsocketserver_unittest.cc b/rtc_base/physicalsocketserver_unittest.cc index 34ba027897..36d1881485 100644 --- a/rtc_base/physicalsocketserver_unittest.cc +++ b/rtc_base/physicalsocketserver_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/socket_unittest.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socket_unittest.h" +#include "rtc_base/testutils.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/platform_file.cc b/rtc_base/platform_file.cc index acbac6f232..871e75f867 100644 --- a/rtc_base/platform_file.cc +++ b/rtc_base/platform_file.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_file.h" +#include "rtc_base/platform_file.h" #if defined(WEBRTC_WIN) #include diff --git a/rtc_base/platform_file.h b/rtc_base/platform_file.h index 2a5f6edf45..d47e028681 100644 --- a/rtc_base/platform_file.h +++ b/rtc_base/platform_file.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PLATFORM_FILE_H_ -#define WEBRTC_RTC_BASE_PLATFORM_FILE_H_ +#ifndef RTC_BASE_PLATFORM_FILE_H_ +#define RTC_BASE_PLATFORM_FILE_H_ #include #include #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif namespace rtc { @@ -53,4 +53,4 @@ PlatformFile CreatePlatformFile(const std::string& path); } // namespace rtc -#endif // WEBRTC_RTC_BASE_PLATFORM_FILE_H_ +#endif // RTC_BASE_PLATFORM_FILE_H_ diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc index da5089a1c4..58beed379d 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/platform_thread.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" #if defined(WEBRTC_LINUX) #include diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h index 4121c970c7..25fa036908 100644 --- a/rtc_base/platform_thread.h +++ b/rtc_base/platform_thread.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PLATFORM_THREAD_H_ -#define WEBRTC_RTC_BASE_PLATFORM_THREAD_H_ +#ifndef RTC_BASE_PLATFORM_THREAD_H_ +#define RTC_BASE_PLATFORM_THREAD_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread_types.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/event.h" +#include "rtc_base/platform_thread_types.h" +#include "rtc_base/thread_checker.h" namespace rtc { @@ -121,4 +121,4 @@ class PlatformThread { } // namespace rtc -#endif // WEBRTC_RTC_BASE_PLATFORM_THREAD_H_ +#endif // RTC_BASE_PLATFORM_THREAD_H_ diff --git a/rtc_base/platform_thread_types.h b/rtc_base/platform_thread_types.h index 705d6ca1eb..66850c8c61 100644 --- a/rtc_base/platform_thread_types.h +++ b/rtc_base/platform_thread_types.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PLATFORM_THREAD_TYPES_H_ -#define WEBRTC_RTC_BASE_PLATFORM_THREAD_TYPES_H_ +#ifndef RTC_BASE_PLATFORM_THREAD_TYPES_H_ +#define RTC_BASE_PLATFORM_THREAD_TYPES_H_ #if defined(WEBRTC_WIN) #include @@ -29,4 +29,4 @@ typedef pthread_t PlatformThreadRef; #endif } // namespace rtc -#endif // WEBRTC_RTC_BASE_PLATFORM_THREAD_TYPES_H_ +#endif // RTC_BASE_PLATFORM_THREAD_TYPES_H_ diff --git a/rtc_base/platform_thread_unittest.cc b/rtc_base/platform_thread_unittest.cc index ae1a1d0f39..d8c8995507 100644 --- a/rtc_base/platform_thread_unittest.cc +++ b/rtc_base/platform_thread_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" namespace rtc { namespace { diff --git a/rtc_base/protobuf_utils.h b/rtc_base/protobuf_utils.h index c8c98b0367..8fbc06060e 100644 --- a/rtc_base/protobuf_utils.h +++ b/rtc_base/protobuf_utils.h @@ -10,8 +10,8 @@ #include -#ifndef WEBRTC_RTC_BASE_PROTOBUF_UTILS_H_ -#define WEBRTC_RTC_BASE_PROTOBUF_UTILS_H_ +#ifndef RTC_BASE_PROTOBUF_UTILS_H_ +#define RTC_BASE_PROTOBUF_UTILS_H_ namespace webrtc { @@ -33,4 +33,4 @@ using google::protobuf::RepeatedPtrField; #endif // WEBRTC_ENABLE_PROTOBUF -#endif // WEBRTC_RTC_BASE_PROTOBUF_UTILS_H_ +#endif // RTC_BASE_PROTOBUF_UTILS_H_ diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc index f4b51ada0d..d236002348 100644 --- a/rtc_base/proxy_unittest.cc +++ b/rtc_base/proxy_unittest.cc @@ -10,13 +10,13 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/httpserver.h" -#include "webrtc/rtc_base/proxyserver.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testechoserver.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/httpserver.h" +#include "rtc_base/proxyserver.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/testclient.h" +#include "rtc_base/testechoserver.h" +#include "rtc_base/virtualsocketserver.h" using rtc::Socket; using rtc::Thread; diff --git a/rtc_base/proxyinfo.cc b/rtc_base/proxyinfo.cc index 8603f21f41..a165dcad5e 100644 --- a/rtc_base/proxyinfo.cc +++ b/rtc_base/proxyinfo.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/proxyinfo.h" +#include "rtc_base/proxyinfo.h" namespace rtc { diff --git a/rtc_base/proxyinfo.h b/rtc_base/proxyinfo.h index 9b706425ef..5affcd86c3 100644 --- a/rtc_base/proxyinfo.h +++ b/rtc_base/proxyinfo.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PROXYINFO_H_ -#define WEBRTC_RTC_BASE_PROXYINFO_H_ +#ifndef RTC_BASE_PROXYINFO_H_ +#define RTC_BASE_PROXYINFO_H_ #include -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/cryptstring.h" +#include "rtc_base/socketaddress.h" namespace rtc { @@ -40,4 +40,4 @@ struct ProxyInfo { } // namespace rtc -#endif // WEBRTC_RTC_BASE_PROXYINFO_H_ +#endif // RTC_BASE_PROXYINFO_H_ diff --git a/rtc_base/proxyserver.cc b/rtc_base/proxyserver.cc index c00e24319e..ede2968f60 100644 --- a/rtc_base/proxyserver.cc +++ b/rtc_base/proxyserver.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/proxyserver.h" +#include "rtc_base/proxyserver.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/socketfactory.h" +#include "rtc_base/checks.h" +#include "rtc_base/socketfactory.h" namespace rtc { diff --git a/rtc_base/proxyserver.h b/rtc_base/proxyserver.h index 218d5b3065..d90b09171c 100644 --- a/rtc_base/proxyserver.h +++ b/rtc_base/proxyserver.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_PROXYSERVER_H_ -#define WEBRTC_RTC_BASE_PROXYSERVER_H_ +#ifndef RTC_BASE_PROXYSERVER_H_ +#define RTC_BASE_PROXYSERVER_H_ #include #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/stream.h" namespace rtc { @@ -97,4 +97,4 @@ class SocksProxyServer : public ProxyServer { } // namespace rtc -#endif // WEBRTC_RTC_BASE_PROXYSERVER_H_ +#endif // RTC_BASE_PROXYSERVER_H_ diff --git a/rtc_base/ptr_util.h b/rtc_base/ptr_util.h index 9276133597..156df841b5 100644 --- a/rtc_base/ptr_util.h +++ b/rtc_base/ptr_util.h @@ -10,8 +10,8 @@ // This implementation is borrowed from chromium. -#ifndef WEBRTC_RTC_BASE_PTR_UTIL_H_ -#define WEBRTC_RTC_BASE_PTR_UTIL_H_ +#ifndef RTC_BASE_PTR_UTIL_H_ +#define RTC_BASE_PTR_UTIL_H_ #include #include @@ -79,4 +79,4 @@ typename internal::MakeUniqueResult::Invalid MakeUnique(Args&&... args) = } // namespace rtc -#endif // WEBRTC_RTC_BASE_PTR_UTIL_H_ +#endif // RTC_BASE_PTR_UTIL_H_ diff --git a/rtc_base/ptr_util_unittest.cc b/rtc_base/ptr_util_unittest.cc index 5948c39661..6497fda525 100644 --- a/rtc_base/ptr_util_unittest.cc +++ b/rtc_base/ptr_util_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ptr_util.h" +#include "rtc_base/ptr_util.h" #include #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/race_checker.cc b/rtc_base/race_checker.cc index 93d563b5c6..bf9dfdcdaa 100644 --- a/rtc_base/race_checker.cc +++ b/rtc_base/race_checker.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/race_checker.h" +#include "rtc_base/race_checker.h" namespace rtc { diff --git a/rtc_base/race_checker.h b/rtc_base/race_checker.h index f0506c8437..73567e98d8 100644 --- a/rtc_base/race_checker.h +++ b/rtc_base/race_checker.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RACE_CHECKER_H_ -#define WEBRTC_RTC_BASE_RACE_CHECKER_H_ +#ifndef RTC_BASE_RACE_CHECKER_H_ +#define RTC_BASE_RACE_CHECKER_H_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "rtc_base/checks.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread_annotations.h" namespace rtc { @@ -75,4 +75,4 @@ class RTC_SCOPED_LOCKABLE RaceCheckerScopeDoNothing { rtc::internal::RaceCheckerScopeDoNothing race_checker(x) #endif -#endif // WEBRTC_RTC_BASE_RACE_CHECKER_H_ +#endif // RTC_BASE_RACE_CHECKER_H_ diff --git a/rtc_base/random.cc b/rtc_base/random.cc index f6bfc08a3e..1043505458 100644 --- a/rtc_base/random.cc +++ b/rtc_base/random.cc @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/random.h" +#include "rtc_base/random.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions.h" namespace webrtc { diff --git a/rtc_base/random.h b/rtc_base/random.h index 1ee6e741a4..fb82ddea7e 100644 --- a/rtc_base/random.h +++ b/rtc_base/random.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RANDOM_H_ -#define WEBRTC_RTC_BASE_RANDOM_H_ +#ifndef RTC_BASE_RANDOM_H_ +#define RTC_BASE_RANDOM_H_ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -90,4 +90,4 @@ bool Random::Rand(); } // namespace webrtc -#endif // WEBRTC_RTC_BASE_RANDOM_H_ +#endif // RTC_BASE_RANDOM_H_ diff --git a/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc index 12d17ad340..187715573e 100644 --- a/rtc_base/random_unittest.cc +++ b/rtc_base/random_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/rtc_base/mathutils.h" // unsigned difference -#include "webrtc/rtc_base/random.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/mathutils.h" // unsigned difference +#include "rtc_base/random.h" +#include "test/gtest.h" namespace webrtc { diff --git a/rtc_base/rate_limiter.cc b/rtc_base/rate_limiter.cc index b2ee2c0c2c..34e0a4064d 100644 --- a/rtc_base/rate_limiter.cc +++ b/rtc_base/rate_limiter.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "rtc_base/rate_limiter.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h index e3f6249a5e..0bfde0da25 100644 --- a/rtc_base/rate_limiter.h +++ b/rtc_base/rate_limiter.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RATE_LIMITER_H_ -#define WEBRTC_RTC_BASE_RATE_LIMITER_H_ +#ifndef RTC_BASE_RATE_LIMITER_H_ +#define RTC_BASE_RATE_LIMITER_H_ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/rate_statistics.h" namespace webrtc { @@ -53,4 +53,4 @@ class RateLimiter { } // namespace webrtc -#endif // WEBRTC_RTC_BASE_RATE_LIMITER_H_ +#endif // RTC_BASE_RATE_LIMITER_H_ diff --git a/rtc_base/rate_limiter_unittest.cc b/rtc_base/rate_limiter_unittest.cc index 64783990df..6efea5458e 100644 --- a/rtc_base/rate_limiter_unittest.cc +++ b/rtc_base/rate_limiter_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/event.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/rate_limiter.h" +#include "rtc_base/task_queue.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { diff --git a/rtc_base/rate_statistics.cc b/rtc_base/rate_statistics.cc index a218540f43..0485566c62 100644 --- a/rtc_base/rate_statistics.cc +++ b/rtc_base/rate_statistics.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rate_statistics.h" +#include "rtc_base/rate_statistics.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h index 87f6c35bdf..b184b0b613 100644 --- a/rtc_base/rate_statistics.h +++ b/rtc_base/rate_statistics.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RATE_STATISTICS_H_ -#define WEBRTC_RTC_BASE_RATE_STATISTICS_H_ +#ifndef RTC_BASE_RATE_STATISTICS_H_ +#define RTC_BASE_RATE_STATISTICS_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/typedefs.h" +#include "api/optional.h" +#include "typedefs.h" namespace webrtc { @@ -81,4 +81,4 @@ class RateStatistics { }; } // namespace webrtc -#endif // WEBRTC_RTC_BASE_RATE_STATISTICS_H_ +#endif // RTC_BASE_RATE_STATISTICS_H_ diff --git a/rtc_base/rate_statistics_unittest.cc b/rtc_base/rate_statistics_unittest.cc index 23d1a3c407..51249b14ea 100644 --- a/rtc_base/rate_statistics_unittest.cc +++ b/rtc_base/rate_statistics_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/rate_statistics.h" +#include "test/gtest.h" namespace { diff --git a/rtc_base/ratelimiter.cc b/rtc_base/ratelimiter.cc index 7bf954f93c..842538d804 100644 --- a/rtc_base/ratelimiter.cc +++ b/rtc_base/ratelimiter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratelimiter.h" +#include "rtc_base/ratelimiter.h" namespace rtc { diff --git a/rtc_base/ratelimiter.h b/rtc_base/ratelimiter.h index 24ed1add83..85706d3dde 100644 --- a/rtc_base/ratelimiter.h +++ b/rtc_base/ratelimiter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RATELIMITER_H_ -#define WEBRTC_RTC_BASE_RATELIMITER_H_ +#ifndef RTC_BASE_RATELIMITER_H_ +#define RTC_BASE_RATELIMITER_H_ #include @@ -59,4 +59,4 @@ class RateLimiter { } // namespace rtc -#endif // WEBRTC_RTC_BASE_RATELIMITER_H_ +#endif // RTC_BASE_RATELIMITER_H_ diff --git a/rtc_base/ratelimiter_unittest.cc b/rtc_base/ratelimiter_unittest.cc index 3962ea3208..f0931e4466 100644 --- a/rtc_base/ratelimiter_unittest.cc +++ b/rtc_base/ratelimiter_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratelimiter.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/ratelimiter.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/ratetracker.cc b/rtc_base/ratetracker.cc index 731de8e663..68bd8a1518 100644 --- a/rtc_base/ratetracker.cc +++ b/rtc_base/ratetracker.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratetracker.h" +#include "rtc_base/ratetracker.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/ratetracker.h b/rtc_base/ratetracker.h index 3731600c32..05eccffce0 100644 --- a/rtc_base/ratetracker.h +++ b/rtc_base/ratetracker.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RATETRACKER_H_ -#define WEBRTC_RTC_BASE_RATETRACKER_H_ +#ifndef RTC_BASE_RATETRACKER_H_ +#define RTC_BASE_RATETRACKER_H_ #include -#include "webrtc/rtc_base/basictypes.h" +#include "rtc_base/basictypes.h" namespace rtc { @@ -66,4 +66,4 @@ class RateTracker { } // namespace rtc -#endif // WEBRTC_RTC_BASE_RATETRACKER_H_ +#endif // RTC_BASE_RATETRACKER_H_ diff --git a/rtc_base/ratetracker_unittest.cc b/rtc_base/ratetracker_unittest.cc index 27aa3a9299..cd288a336a 100644 --- a/rtc_base/ratetracker_unittest.cc +++ b/rtc_base/ratetracker_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/gunit.h" namespace rtc { namespace { diff --git a/rtc_base/refcount.h b/rtc_base/refcount.h index c3744d0776..a2664f0f8b 100644 --- a/rtc_base/refcount.h +++ b/rtc_base/refcount.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_REFCOUNT_H_ -#define WEBRTC_RTC_BASE_REFCOUNT_H_ +#ifndef RTC_BASE_REFCOUNT_H_ +#define RTC_BASE_REFCOUNT_H_ -#include "webrtc/rtc_base/refcountedobject.h" +#include "rtc_base/refcountedobject.h" namespace rtc { @@ -26,4 +26,4 @@ class RefCountInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_REFCOUNT_H_ +#endif // RTC_BASE_REFCOUNT_H_ diff --git a/rtc_base/refcountedobject.h b/rtc_base/refcountedobject.h index bf66af27a9..182e027b92 100644 --- a/rtc_base/refcountedobject.h +++ b/rtc_base/refcountedobject.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_REFCOUNTEDOBJECT_H_ -#define WEBRTC_RTC_BASE_REFCOUNTEDOBJECT_H_ +#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_ +#define RTC_BASE_REFCOUNTEDOBJECT_H_ #include -#include "webrtc/rtc_base/atomicops.h" +#include "rtc_base/atomicops.h" namespace rtc { @@ -58,4 +58,4 @@ class RefCountedObject : public T { } // namespace rtc -#endif // WEBRTC_RTC_BASE_REFCOUNTEDOBJECT_H_ +#endif // RTC_BASE_REFCOUNTEDOBJECT_H_ diff --git a/rtc_base/refcountedobject_unittest.cc b/rtc_base/refcountedobject_unittest.cc index 8b27e71808..688b9215c1 100644 --- a/rtc_base/refcountedobject_unittest.cc +++ b/rtc_base/refcountedobject_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/refcount.h" +#include "rtc_base/gunit.h" +#include "rtc_base/refcount.h" namespace rtc { diff --git a/rtc_base/rollingaccumulator.h b/rtc_base/rollingaccumulator.h index 9008db6a7b..e7d5b06226 100644 --- a/rtc_base/rollingaccumulator.h +++ b/rtc_base/rollingaccumulator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_ROLLINGACCUMULATOR_H_ -#define WEBRTC_RTC_BASE_ROLLINGACCUMULATOR_H_ +#ifndef RTC_BASE_ROLLINGACCUMULATOR_H_ +#define RTC_BASE_ROLLINGACCUMULATOR_H_ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -171,4 +171,4 @@ class RollingAccumulator { } // namespace rtc -#endif // WEBRTC_RTC_BASE_ROLLINGACCUMULATOR_H_ +#endif // RTC_BASE_ROLLINGACCUMULATOR_H_ diff --git a/rtc_base/rollingaccumulator_unittest.cc b/rtc_base/rollingaccumulator_unittest.cc index ce4b4df20e..91ed8533d1 100644 --- a/rtc_base/rollingaccumulator_unittest.cc +++ b/rtc_base/rollingaccumulator_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rollingaccumulator.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/rollingaccumulator.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/rtccertificate.cc b/rtc_base/rtccertificate.cc index f5af47eb15..0c583b3db2 100644 --- a/rtc_base/rtccertificate.cc +++ b/rtc_base/rtccertificate.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/rtccertificate.h" +#include "rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/rtccertificate.h b/rtc_base/rtccertificate.h index 141023f6ac..47f0e0c998 100644 --- a/rtc_base/rtccertificate.h +++ b/rtc_base/rtccertificate.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RTCCERTIFICATE_H_ -#define WEBRTC_RTC_BASE_RTCCERTIFICATE_H_ +#ifndef RTC_BASE_RTCCERTIFICATE_H_ +#define RTC_BASE_RTCCERTIFICATE_H_ #include #include -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sslidentity.h" namespace rtc { @@ -84,4 +84,4 @@ class RTCCertificate : public RefCountInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_RTCCERTIFICATE_H_ +#endif // RTC_BASE_RTCCERTIFICATE_H_ diff --git a/rtc_base/rtccertificate_unittest.cc b/rtc_base/rtccertificate_unittest.cc index 348364d510..980e1a82fd 100644 --- a/rtc_base/rtccertificate_unittest.cc +++ b/rtc_base/rtccertificate_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/rtccertificategenerator.cc b/rtc_base/rtccertificategenerator.cc index 037babdd1a..1d99d10ffa 100644 --- a/rtc_base/rtccertificategenerator.cc +++ b/rtc_base/rtccertificategenerator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "rtc_base/rtccertificategenerator.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/checks.h" +#include "rtc_base/sslidentity.h" namespace rtc { diff --git a/rtc_base/rtccertificategenerator.h b/rtc_base/rtccertificategenerator.h index 4e0437c58a..1f854667d5 100644 --- a/rtc_base/rtccertificategenerator.h +++ b/rtc_base/rtccertificategenerator.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_ -#define WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#ifndef RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#define RTC_BASE_RTCCERTIFICATEGENERATOR_H_ -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/thread.h" +#include "api/optional.h" +#include "rtc_base/refcount.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/thread.h" namespace rtc { @@ -83,4 +83,4 @@ class RTCCertificateGenerator : public RTCCertificateGeneratorInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#endif // RTC_BASE_RTCCERTIFICATEGENERATOR_H_ diff --git a/rtc_base/rtccertificategenerator_unittest.cc b/rtc_base/rtccertificategenerator_unittest.cc index 829a6ee9a3..c8e1ab38c2 100644 --- a/rtc_base/rtccertificategenerator_unittest.cc +++ b/rtc_base/rtccertificategenerator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "rtc_base/rtccertificategenerator.h" #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" +#include "api/optional.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/safe_compare.h b/rtc_base/safe_compare.h index e9c622b24f..017f137a45 100644 --- a/rtc_base/safe_compare.h +++ b/rtc_base/safe_compare.h @@ -28,8 +28,8 @@ // zero; in the remaining cases, it is just a few machine instructions (no // branches). -#ifndef WEBRTC_RTC_BASE_SAFE_COMPARE_H_ -#define WEBRTC_RTC_BASE_SAFE_COMPARE_H_ +#ifndef RTC_BASE_SAFE_COMPARE_H_ +#define RTC_BASE_SAFE_COMPARE_H_ #include #include @@ -37,7 +37,7 @@ #include #include -#include "webrtc/rtc_base/type_traits.h" +#include "rtc_base/type_traits.h" namespace rtc { @@ -173,4 +173,4 @@ RTC_SAFECMP_MAKE_FUN(Ge) } // namespace rtc -#endif // WEBRTC_RTC_BASE_SAFE_COMPARE_H_ +#endif // RTC_BASE_SAFE_COMPARE_H_ diff --git a/rtc_base/safe_compare_unittest.cc b/rtc_base/safe_compare_unittest.cc index 2a135a157c..521f5f5efb 100644 --- a/rtc_base/safe_compare_unittest.cc +++ b/rtc_base/safe_compare_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/rtc_base/safe_compare.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/safe_compare.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_base/safe_conversions.h b/rtc_base/safe_conversions.h index 877f28ad26..73ac06733d 100644 --- a/rtc_base/safe_conversions.h +++ b/rtc_base/safe_conversions.h @@ -10,13 +10,13 @@ // Borrowed from Chromium's src/base/numerics/safe_conversions.h. -#ifndef WEBRTC_RTC_BASE_SAFE_CONVERSIONS_H_ -#define WEBRTC_RTC_BASE_SAFE_CONVERSIONS_H_ +#ifndef RTC_BASE_SAFE_CONVERSIONS_H_ +#define RTC_BASE_SAFE_CONVERSIONS_H_ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_conversions_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_conversions_impl.h" namespace rtc { @@ -73,4 +73,4 @@ inline Dst saturated_cast(Src value) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SAFE_CONVERSIONS_H_ +#endif // RTC_BASE_SAFE_CONVERSIONS_H_ diff --git a/rtc_base/safe_conversions_impl.h b/rtc_base/safe_conversions_impl.h index ef116cd94c..f9f625687f 100644 --- a/rtc_base/safe_conversions_impl.h +++ b/rtc_base/safe_conversions_impl.h @@ -10,8 +10,8 @@ // Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h. -#ifndef WEBRTC_RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ -#define WEBRTC_RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ +#ifndef RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ +#define RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ #include @@ -185,4 +185,4 @@ inline RangeCheckResult RangeCheck(Src value) { } // namespace internal } // namespace rtc -#endif // WEBRTC_RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ +#endif // RTC_BASE_SAFE_CONVERSIONS_IMPL_H_ diff --git a/rtc_base/safe_minmax.h b/rtc_base/safe_minmax.h index 77d75a14ec..d20aea822a 100644 --- a/rtc_base/safe_minmax.h +++ b/rtc_base/safe_minmax.h @@ -73,15 +73,15 @@ // result, then everything's fine, and the return type is as requested. But if // the requested type is too small, a static_assert is triggered. -#ifndef WEBRTC_RTC_BASE_SAFE_MINMAX_H_ -#define WEBRTC_RTC_BASE_SAFE_MINMAX_H_ +#ifndef RTC_BASE_SAFE_MINMAX_H_ +#define RTC_BASE_SAFE_MINMAX_H_ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/safe_compare.h" -#include "webrtc/rtc_base/type_traits.h" +#include "rtc_base/checks.h" +#include "rtc_base/safe_compare.h" +#include "rtc_base/type_traits.h" namespace rtc { @@ -332,4 +332,4 @@ R2 SafeClamp(T x, L min, H max) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SAFE_MINMAX_H_ +#endif // RTC_BASE_SAFE_MINMAX_H_ diff --git a/rtc_base/safe_minmax_unittest.cc b/rtc_base/safe_minmax_unittest.cc index a75b16d042..1e4f4b33a4 100644 --- a/rtc_base/safe_minmax_unittest.cc +++ b/rtc_base/safe_minmax_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/safe_minmax.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_base/sanitizer.h b/rtc_base/sanitizer.h index 73099ac6fa..1b94e1edf4 100644 --- a/rtc_base/sanitizer.h +++ b/rtc_base/sanitizer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SANITIZER_H_ -#define WEBRTC_RTC_BASE_SANITIZER_H_ +#ifndef RTC_BASE_SANITIZER_H_ +#define RTC_BASE_SANITIZER_H_ #include // for size_t @@ -115,4 +115,4 @@ inline void MsanCheckInitialized(const T& mem) { #endif // __cplusplus -#endif // WEBRTC_RTC_BASE_SANITIZER_H_ +#endif // RTC_BASE_SANITIZER_H_ diff --git a/rtc_base/scoped_ref_ptr.h b/rtc_base/scoped_ref_ptr.h index 69086dbc6c..0f4698a256 100644 --- a/rtc_base/scoped_ref_ptr.h +++ b/rtc_base/scoped_ref_ptr.h @@ -60,8 +60,8 @@ // } // -#ifndef WEBRTC_RTC_BASE_SCOPED_REF_PTR_H_ -#define WEBRTC_RTC_BASE_SCOPED_REF_PTR_H_ +#ifndef RTC_BASE_SCOPED_REF_PTR_H_ +#define RTC_BASE_SCOPED_REF_PTR_H_ #include @@ -160,4 +160,4 @@ class scoped_refptr { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SCOPED_REF_PTR_H_ +#endif // RTC_BASE_SCOPED_REF_PTR_H_ diff --git a/rtc_base/sequenced_task_checker.h b/rtc_base/sequenced_task_checker.h index 35bd3cd4ae..cc369be68e 100644 --- a/rtc_base/sequenced_task_checker.h +++ b/rtc_base/sequenced_task_checker.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_H_ -#define WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_H_ +#ifndef RTC_BASE_SEQUENCED_TASK_CHECKER_H_ +#define RTC_BASE_SEQUENCED_TASK_CHECKER_H_ // Apart from debug builds, we also enable the sequence checker in // builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots // with this define will get the same level of checking as debug bots. #define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sequenced_task_checker_impl.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sequenced_task_checker_impl.h" +#include "rtc_base/thread_annotations.h" namespace rtc { @@ -76,4 +76,4 @@ class RTC_SCOPED_LOCKABLE SequencedTaskCheckerScope { #undef ENABLE_SEQUENCED_TASK_CHECKER } // namespace rtc -#endif // WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_H_ +#endif // RTC_BASE_SEQUENCED_TASK_CHECKER_H_ diff --git a/rtc_base/sequenced_task_checker_impl.cc b/rtc_base/sequenced_task_checker_impl.cc index 0d2ae3ee34..d7f46ead7d 100644 --- a/rtc_base/sequenced_task_checker_impl.cc +++ b/rtc_base/sequenced_task_checker_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sequenced_task_checker_impl.h" +#include "rtc_base/sequenced_task_checker_impl.h" #if defined(WEBRTC_MAC) #include #endif -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" namespace rtc { diff --git a/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h index ac43030d22..0a5464efe8 100644 --- a/rtc_base/sequenced_task_checker_impl.h +++ b/rtc_base/sequenced_task_checker_impl.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ -#define WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ +#ifndef RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ +#define RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/thread_checker.h" namespace rtc { @@ -42,4 +42,4 @@ class SequencedTaskCheckerImpl { }; } // namespace rtc -#endif // WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ +#endif // RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ diff --git a/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc index 73bc8ea0e3..d77546289d 100644 --- a/rtc_base/sequenced_task_checker_unittest.cc +++ b/rtc_base/sequenced_task_checker_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/task_queue.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_base/sha1.cc b/rtc_base/sha1.cc index c12ebe0378..5b41f05370 100644 --- a/rtc_base/sha1.cc +++ b/rtc_base/sha1.cc @@ -107,7 +107,7 @@ // Disabling SHA1HANDSOFF the buffer will be modified (end swapped). #define SHA1HANDSOFF -#include "webrtc/rtc_base/sha1.h" +#include "rtc_base/sha1.h" #include #include diff --git a/rtc_base/sha1.h b/rtc_base/sha1.h index e4db148321..f3242b3498 100644 --- a/rtc_base/sha1.h +++ b/rtc_base/sha1.h @@ -7,8 +7,8 @@ // Ported to C++, Google style, under namespace rtc. -#ifndef WEBRTC_RTC_BASE_SHA1_H_ -#define WEBRTC_RTC_BASE_SHA1_H_ +#ifndef RTC_BASE_SHA1_H_ +#define RTC_BASE_SHA1_H_ #include #include @@ -30,4 +30,4 @@ void SHA1Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]); } // namespace rtc -#endif // WEBRTC_RTC_BASE_SHA1_H_ +#endif // RTC_BASE_SHA1_H_ diff --git a/rtc_base/sha1digest.cc b/rtc_base/sha1digest.cc index cf4de93cac..7f7190a3f1 100644 --- a/rtc_base/sha1digest.cc +++ b/rtc_base/sha1digest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sha1digest.h" +#include "rtc_base/sha1digest.h" namespace rtc { diff --git a/rtc_base/sha1digest.h b/rtc_base/sha1digest.h index 2f939ce5e5..322e22c833 100644 --- a/rtc_base/sha1digest.h +++ b/rtc_base/sha1digest.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SHA1DIGEST_H_ -#define WEBRTC_RTC_BASE_SHA1DIGEST_H_ +#ifndef RTC_BASE_SHA1DIGEST_H_ +#define RTC_BASE_SHA1DIGEST_H_ -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/sha1.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/sha1.h" namespace rtc { @@ -33,4 +33,4 @@ class Sha1Digest : public MessageDigest { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SHA1DIGEST_H_ +#endif // RTC_BASE_SHA1DIGEST_H_ diff --git a/rtc_base/sha1digest_unittest.cc b/rtc_base/sha1digest_unittest.cc index 24c30faede..b3dd8323da 100644 --- a/rtc_base/sha1digest_unittest.cc +++ b/rtc_base/sha1digest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sha1digest.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/sha1digest.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/signalthread.cc b/rtc_base/signalthread.cc index 93fa73d1e1..3856dac99e 100644 --- a/rtc_base/signalthread.cc +++ b/rtc_base/signalthread.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/signalthread.h" +#include "rtc_base/signalthread.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/signalthread.h b/rtc_base/signalthread.h index 1c6c876256..68b7f84085 100644 --- a/rtc_base/signalthread.h +++ b/rtc_base/signalthread.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SIGNALTHREAD_H_ -#define WEBRTC_RTC_BASE_SIGNALTHREAD_H_ +#ifndef RTC_BASE_SIGNALTHREAD_H_ +#define RTC_BASE_SIGNALTHREAD_H_ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/thread.h" namespace rtc { @@ -158,4 +158,4 @@ class SignalThread } // namespace rtc -#endif // WEBRTC_RTC_BASE_SIGNALTHREAD_H_ +#endif // RTC_BASE_SIGNALTHREAD_H_ diff --git a/rtc_base/signalthread_unittest.cc b/rtc_base/signalthread_unittest.cc index 99d3206a60..e434c81b48 100644 --- a/rtc_base/signalthread_unittest.cc +++ b/rtc_base/signalthread_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/signalthread.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/gunit.h" +#include "rtc_base/signalthread.h" +#include "rtc_base/thread.h" using namespace rtc; diff --git a/rtc_base/sigslot.cc b/rtc_base/sigslot.cc index 3f22af1fc3..9d792cbbcd 100644 --- a/rtc_base/sigslot.cc +++ b/rtc_base/sigslot.cc @@ -6,7 +6,7 @@ // the proviso that the author takes on no responsibility or liability for any // use. -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/sigslot.h" namespace sigslot { diff --git a/rtc_base/sigslot.h b/rtc_base/sigslot.h index ec4232cdca..318aca3cf3 100644 --- a/rtc_base/sigslot.h +++ b/rtc_base/sigslot.h @@ -93,8 +93,8 @@ // If signalx is single threaded the user must ensure that disconnect, connect // or signal is not happening concurrently or data race may occur. -#ifndef WEBRTC_RTC_BASE_SIGSLOT_H_ -#define WEBRTC_RTC_BASE_SIGSLOT_H_ +#ifndef RTC_BASE_SIGSLOT_H_ +#define RTC_BASE_SIGSLOT_H_ #include #include @@ -113,7 +113,7 @@ #if !defined(WIN32_LEAN_AND_MEAN) #define WIN32_LEAN_AND_MEAN #endif -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #elif defined(__GNUG__) || defined(SIGSLOT_USE_POSIX_THREADS) #define _SIGSLOT_HAS_POSIX_THREADS #include @@ -644,4 +644,4 @@ using signal8 = } // namespace sigslot -#endif // WEBRTC_RTC_BASE_SIGSLOT_H_ +#endif // RTC_BASE_SIGSLOT_H_ diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc index d538b0fa6b..b5cab9366c 100644 --- a/rtc_base/sigslot_unittest.cc +++ b/rtc_base/sigslot_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/sigslot.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" // This function, when passed a has_slots or signalx, will break the build if // its threading requirement is not single threaded diff --git a/rtc_base/sigslottester.h b/rtc_base/sigslottester.h index ed6dadc4ae..04c6302eec 100755 --- a/rtc_base/sigslottester.h +++ b/rtc_base/sigslottester.h @@ -12,8 +12,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ -#define WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ +#ifndef RTC_BASE_SIGSLOTTESTER_H_ +#define RTC_BASE_SIGSLOTTESTER_H_ // To generate sigslottester.h from sigslottester.h.pump, execute: // /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump @@ -39,8 +39,8 @@ // EXPECT_EQ("hello", capture); // /* See unit-tests for more examples */ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" namespace rtc { @@ -213,4 +213,4 @@ class SigslotTester5 : public sigslot::has_slots<> { }; } // namespace rtc -#endif // WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ +#endif // RTC_BASE_SIGSLOTTESTER_H_ diff --git a/rtc_base/sigslottester.h.pump b/rtc_base/sigslottester.h.pump index 381b7914fd..1029a0f4a7 100755 --- a/rtc_base/sigslottester.h.pump +++ b/rtc_base/sigslottester.h.pump @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ -#define WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ +#ifndef RTC_BASE_SIGSLOTTESTER_H_ +#define RTC_BASE_SIGSLOTTESTER_H_ // To generate sigslottester.h from sigslottester.h.pump, execute: // /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump @@ -35,8 +35,8 @@ // EXPECT_EQ("hello", capture); // /* See unit-tests for more examples */ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" namespace rtc { @@ -99,4 +99,4 @@ class SigslotTester$i : public sigslot::has_slots<> { ]] } // namespace rtc -#endif // WEBRTC_RTC_BASE_SIGSLOTTESTER_H_ +#endif // RTC_BASE_SIGSLOTTESTER_H_ diff --git a/rtc_base/sigslottester_unittest.cc b/rtc_base/sigslottester_unittest.cc index e0861d76bc..c8e87e5a86 100755 --- a/rtc_base/sigslottester_unittest.cc +++ b/rtc_base/sigslottester_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sigslottester.h" +#include "rtc_base/sigslottester.h" #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/gunit.h" +#include "rtc_base/sigslot.h" namespace rtc { diff --git a/rtc_base/socket.h b/rtc_base/socket.h index 2b2161d9bf..c78963b768 100644 --- a/rtc_base/socket.h +++ b/rtc_base/socket.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKET_H_ -#define WEBRTC_RTC_BASE_SOCKET_H_ +#ifndef RTC_BASE_SOCKET_H_ +#define RTC_BASE_SOCKET_H_ #include @@ -22,12 +22,12 @@ #endif #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/socketaddress.h" // Rather than converting errors into a private namespace, // Reuse the POSIX socket api errors. Note this depends on @@ -194,4 +194,4 @@ class Socket { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKET_H_ +#endif // RTC_BASE_SOCKET_H_ diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc index 5ef01679ff..5548c0262e 100644 --- a/rtc_base/socket_unittest.cc +++ b/rtc_base/socket_unittest.cc @@ -10,18 +10,18 @@ #include -#include "webrtc/rtc_base/socket_unittest.h" +#include "rtc_base/socket_unittest.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/buffer.h" +#include "rtc_base/gunit.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/socketserver.h" +#include "rtc_base/testclient.h" +#include "rtc_base/testutils.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/socket_unittest.h b/rtc_base/socket_unittest.h index c236339e57..41835d2c5c 100644 --- a/rtc_base/socket_unittest.h +++ b/rtc_base/socket_unittest.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_ -#define WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_ +#ifndef RTC_BASE_SOCKET_UNITTEST_H_ +#define RTC_BASE_SOCKET_UNITTEST_H_ -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/gunit.h" +#include "rtc_base/thread.h" namespace rtc { @@ -97,4 +97,4 @@ bool IsUnspecOrEmptyIP(const IPAddress& address); } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_ +#endif // RTC_BASE_SOCKET_UNITTEST_H_ diff --git a/rtc_base/socketadapters.cc b/rtc_base/socketadapters.cc index 8519b89093..175110bb30 100644 --- a/rtc_base/socketadapters.cc +++ b/rtc_base/socketadapters.cc @@ -26,13 +26,13 @@ #include -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/httpcommon.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/socketadapters.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/httpcommon.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketadapters.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/socketadapters.h b/rtc_base/socketadapters.h index 34dd19b852..c5d1bfcabb 100644 --- a/rtc_base/socketadapters.h +++ b/rtc_base/socketadapters.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETADAPTERS_H_ -#define WEBRTC_RTC_BASE_SOCKETADAPTERS_H_ +#ifndef RTC_BASE_SOCKETADAPTERS_H_ +#define RTC_BASE_SOCKETADAPTERS_H_ #include #include -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/cryptstring.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/cryptstring.h" +#include "rtc_base/logging.h" namespace rtc { @@ -204,4 +204,4 @@ class AsyncSocksProxyServerSocket : public AsyncProxyServerSocket { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETADAPTERS_H_ +#endif // RTC_BASE_SOCKETADAPTERS_H_ diff --git a/rtc_base/socketaddress.cc b/rtc_base/socketaddress.cc index 880841410b..8e2ce6caa9 100644 --- a/rtc_base/socketaddress.cc +++ b/rtc_base/socketaddress.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/safe_conversions.h" #if defined(WEBRTC_POSIX) #include @@ -28,13 +28,13 @@ #include -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nethelpers.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/nethelpers.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif namespace rtc { diff --git a/rtc_base/socketaddress.h b/rtc_base/socketaddress.h index 617e35534f..d58eed8428 100644 --- a/rtc_base/socketaddress.h +++ b/rtc_base/socketaddress.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETADDRESS_H_ -#define WEBRTC_RTC_BASE_SOCKETADDRESS_H_ +#ifndef RTC_BASE_SOCKETADDRESS_H_ +#define RTC_BASE_SOCKETADDRESS_H_ #include #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/ipaddress.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/ipaddress.h" #undef SetPort @@ -194,4 +194,4 @@ SocketAddress EmptySocketAddressWithFamily(int family); } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETADDRESS_H_ +#endif // RTC_BASE_SOCKETADDRESS_H_ diff --git a/rtc_base/socketaddress_unittest.cc b/rtc_base/socketaddress_unittest.cc index 19fbc50313..0d168dfcf4 100644 --- a/rtc_base/socketaddress_unittest.cc +++ b/rtc_base/socketaddress_unittest.cc @@ -12,9 +12,9 @@ #include // for sockaddr_in #endif -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socketaddress.h" namespace rtc { diff --git a/rtc_base/socketaddresspair.cc b/rtc_base/socketaddresspair.cc index 2be718fdcf..3e4748f421 100644 --- a/rtc_base/socketaddresspair.cc +++ b/rtc_base/socketaddresspair.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketaddresspair.h" +#include "rtc_base/socketaddresspair.h" namespace rtc { diff --git a/rtc_base/socketaddresspair.h b/rtc_base/socketaddresspair.h index cec84a7ac9..8ff0ee6c48 100644 --- a/rtc_base/socketaddresspair.h +++ b/rtc_base/socketaddresspair.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_ -#define WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_ +#ifndef RTC_BASE_SOCKETADDRESSPAIR_H_ +#define RTC_BASE_SOCKETADDRESSPAIR_H_ -#include "webrtc/rtc_base/socketaddress.h" +#include "rtc_base/socketaddress.h" namespace rtc { @@ -38,4 +38,4 @@ private: } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_ +#endif // RTC_BASE_SOCKETADDRESSPAIR_H_ diff --git a/rtc_base/socketfactory.h b/rtc_base/socketfactory.h index 749eb1771d..58bc0de399 100644 --- a/rtc_base/socketfactory.h +++ b/rtc_base/socketfactory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETFACTORY_H_ -#define WEBRTC_RTC_BASE_SOCKETFACTORY_H_ +#ifndef RTC_BASE_SOCKETFACTORY_H_ +#define RTC_BASE_SOCKETFACTORY_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/socket.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/socket.h" namespace rtc { @@ -35,4 +35,4 @@ public: } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETFACTORY_H_ +#endif // RTC_BASE_SOCKETFACTORY_H_ diff --git a/rtc_base/socketserver.h b/rtc_base/socketserver.h index dc99c2bf50..e29884e6b3 100644 --- a/rtc_base/socketserver.h +++ b/rtc_base/socketserver.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_SOCKETSERVER_H_ +#ifndef RTC_BASE_SOCKETSERVER_H_ +#define RTC_BASE_SOCKETSERVER_H_ #include -#include "webrtc/rtc_base/socketfactory.h" +#include "rtc_base/socketfactory.h" namespace rtc { @@ -59,4 +59,4 @@ class SocketServer : public SocketFactory { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETSERVER_H_ +#endif // RTC_BASE_SOCKETSERVER_H_ diff --git a/rtc_base/socketstream.cc b/rtc_base/socketstream.cc index 2c09fcf134..8b4c513ea8 100644 --- a/rtc_base/socketstream.cc +++ b/rtc_base/socketstream.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/socketstream.h" +#include "rtc_base/socketstream.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/socketstream.h b/rtc_base/socketstream.h index e78c876774..f781af10f0 100644 --- a/rtc_base/socketstream.h +++ b/rtc_base/socketstream.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SOCKETSTREAM_H_ -#define WEBRTC_RTC_BASE_SOCKETSTREAM_H_ +#ifndef RTC_BASE_SOCKETSTREAM_H_ +#define RTC_BASE_SOCKETSTREAM_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/stream.h" namespace rtc { @@ -58,4 +58,4 @@ class SocketStream : public StreamInterface, public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SOCKETSTREAM_H_ +#endif // RTC_BASE_SOCKETSTREAM_H_ diff --git a/rtc_base/ssladapter.cc b/rtc_base/ssladapter.cc index f26ebdab4b..4f56cf7f02 100644 --- a/rtc_base/ssladapter.cc +++ b/rtc_base/ssladapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/ssladapter.h" +#include "rtc_base/ssladapter.h" -#include "webrtc/rtc_base/openssladapter.h" +#include "rtc_base/openssladapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/ssladapter.h b/rtc_base/ssladapter.h index 922f42e1d5..5a17015cdc 100644 --- a/rtc_base/ssladapter.h +++ b/rtc_base/ssladapter.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SSLADAPTER_H_ -#define WEBRTC_RTC_BASE_SSLADAPTER_H_ +#ifndef RTC_BASE_SSLADAPTER_H_ +#define RTC_BASE_SSLADAPTER_H_ -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/sslstreamadapter.h" namespace rtc { @@ -96,4 +96,4 @@ bool CleanupSSL(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_SSLADAPTER_H_ +#endif // RTC_BASE_SSLADAPTER_H_ diff --git a/rtc_base/ssladapter_unittest.cc b/rtc_base/ssladapter_unittest.cc index 8e5d322b52..f82f89b502 100644 --- a/rtc_base/ssladapter_unittest.cc +++ b/rtc_base/ssladapter_unittest.cc @@ -11,15 +11,15 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/rtc_base/socketstream.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socketstream.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/virtualsocketserver.h" static const int kTimeout = 5000; diff --git a/rtc_base/sslfingerprint.cc b/rtc_base/sslfingerprint.cc index adf38518a5..3f4555bb87 100644 --- a/rtc_base/sslfingerprint.cc +++ b/rtc_base/sslfingerprint.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sslfingerprint.h" +#include "rtc_base/sslfingerprint.h" #include #include -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/sslfingerprint.h b/rtc_base/sslfingerprint.h index 557ac56c67..b5e9b72bb4 100644 --- a/rtc_base/sslfingerprint.h +++ b/rtc_base/sslfingerprint.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SSLFINGERPRINT_H_ -#define WEBRTC_RTC_BASE_SSLFINGERPRINT_H_ +#ifndef RTC_BASE_SSLFINGERPRINT_H_ +#define RTC_BASE_SSLFINGERPRINT_H_ #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/copyonwritebuffer.h" -#include "webrtc/rtc_base/rtccertificate.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sslidentity.h" namespace rtc { @@ -54,4 +54,4 @@ struct SSLFingerprint { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SSLFINGERPRINT_H_ +#endif // RTC_BASE_SSLFINGERPRINT_H_ diff --git a/rtc_base/sslidentity.cc b/rtc_base/sslidentity.cc index 38c27cac9e..6fd7ad5bbd 100644 --- a/rtc_base/sslidentity.cc +++ b/rtc_base/sslidentity.cc @@ -9,16 +9,16 @@ */ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/sslidentity.h" #include #include -#include "webrtc/rtc_base/base64.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/opensslidentity.h" -#include "webrtc/rtc_base/sslfingerprint.h" +#include "rtc_base/base64.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/sslfingerprint.h" namespace rtc { diff --git a/rtc_base/sslidentity.h b/rtc_base/sslidentity.h index e6ac527e77..d81d01302e 100644 --- a/rtc_base/sslidentity.h +++ b/rtc_base/sslidentity.h @@ -10,18 +10,18 @@ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. -#ifndef WEBRTC_RTC_BASE_SSLIDENTITY_H_ -#define WEBRTC_RTC_BASE_SSLIDENTITY_H_ +#ifndef RTC_BASE_SSLIDENTITY_H_ +#define RTC_BASE_SSLIDENTITY_H_ #include #include #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/messagedigest.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/messagedigest.h" +#include "rtc_base/timeutils.h" namespace rtc { @@ -271,4 +271,4 @@ extern const char kPemTypeEcPrivateKey[]; } // namespace rtc -#endif // WEBRTC_RTC_BASE_SSLIDENTITY_H_ +#endif // RTC_BASE_SSLIDENTITY_H_ diff --git a/rtc_base/sslidentity_unittest.cc b/rtc_base/sslidentity_unittest.cc index 9b90b4cad5..7d9f82c2c6 100644 --- a/rtc_base/sslidentity_unittest.cc +++ b/rtc_base/sslidentity_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/rtc_base/fakesslidentity.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslfingerprint.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/fakesslidentity.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslfingerprint.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/stringutils.h" using rtc::SSLIdentity; diff --git a/rtc_base/sslroots.h b/rtc_base/sslroots.h index b224332321..7309a0544a 100644 --- a/rtc_base/sslroots.h +++ b/rtc_base/sslroots.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SSLROOTS_H_ -#define WEBRTC_RTC_BASE_SSLROOTS_H_ +#ifndef RTC_BASE_SSLROOTS_H_ +#define RTC_BASE_SSLROOTS_H_ // This file is the root certificates in C form that are needed to connect to // Google. @@ -4277,4 +4277,4 @@ const size_t kSSLCertCertificateSizeList[] = { 1122, }; -#endif // WEBRTC_RTC_BASE_SSLROOTS_H_ +#endif // RTC_BASE_SSLROOTS_H_ diff --git a/rtc_base/sslstreamadapter.cc b/rtc_base/sslstreamadapter.cc index d55b6fea2a..b09c1440a4 100644 --- a/rtc_base/sslstreamadapter.cc +++ b/rtc_base/sslstreamadapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/sslstreamadapter.h" +#include "rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/opensslstreamadapter.h" +#include "rtc_base/opensslstreamadapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/sslstreamadapter.h b/rtc_base/sslstreamadapter.h index 7fb086714e..c1b2f3687d 100644 --- a/rtc_base/sslstreamadapter.h +++ b/rtc_base/sslstreamadapter.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SSLSTREAMADAPTER_H_ -#define WEBRTC_RTC_BASE_SSLSTREAMADAPTER_H_ +#ifndef RTC_BASE_SSLSTREAMADAPTER_H_ +#define RTC_BASE_SSLSTREAMADAPTER_H_ #include #include #include -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/stream.h" namespace rtc { @@ -276,4 +276,4 @@ class SSLStreamAdapter : public StreamAdapterInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_SSLSTREAMADAPTER_H_ +#endif // RTC_BASE_SSLSTREAMADAPTER_H_ diff --git a/rtc_base/sslstreamadapter_unittest.cc b/rtc_base/sslstreamadapter_unittest.cc index a2d63e8060..03aabd8a79 100644 --- a/rtc_base/sslstreamadapter_unittest.cc +++ b/rtc_base/sslstreamadapter_unittest.cc @@ -14,14 +14,14 @@ #include #include -#include "webrtc/rtc_base/bufferqueue.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/bufferqueue.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stream.h" using ::testing::WithParamInterface; using ::testing::Values; diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc index 32b9eac862..f64b32db07 100644 --- a/rtc_base/stream.cc +++ b/rtc_base/stream.cc @@ -18,18 +18,18 @@ #include #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #define fileno _fileno #endif diff --git a/rtc_base/stream.h b/rtc_base/stream.h index e8418ab759..171a09f1e0 100644 --- a/rtc_base/stream.h +++ b/rtc_base/stream.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_STREAM_H_ -#define WEBRTC_RTC_BASE_STREAM_H_ +#ifndef RTC_BASE_STREAM_H_ +#define RTC_BASE_STREAM_H_ #include #include -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/messagehandler.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/sigslot.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/sigslot.h" namespace rtc { @@ -713,4 +713,4 @@ StreamResult Flow(StreamInterface* source, } // namespace rtc -#endif // WEBRTC_RTC_BASE_STREAM_H_ +#endif // RTC_BASE_STREAM_H_ diff --git a/rtc_base/stream_unittest.cc b/rtc_base/stream_unittest.cc index 0f8fbf1bcb..ac23d77962 100644 --- a/rtc_base/stream_unittest.cc +++ b/rtc_base/stream_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/pathutils.h" +#include "rtc_base/stream.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/pathutils.h" namespace rtc { diff --git a/rtc_base/string_to_number.cc b/rtc_base/string_to_number.cc index 06107f5087..10df79ebfd 100644 --- a/rtc_base/string_to_number.cc +++ b/rtc_base/string_to_number.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/rtc_base/string_to_number.h" +#include "rtc_base/string_to_number.h" namespace rtc { namespace string_to_number_internal { diff --git a/rtc_base/string_to_number.h b/rtc_base/string_to_number.h index 93bd850f63..2cdc4b8440 100644 --- a/rtc_base/string_to_number.h +++ b/rtc_base/string_to_number.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_STRING_TO_NUMBER_H_ -#define WEBRTC_RTC_BASE_STRING_TO_NUMBER_H_ +#ifndef RTC_BASE_STRING_TO_NUMBER_H_ +#define RTC_BASE_STRING_TO_NUMBER_H_ #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace rtc { @@ -98,4 +98,4 @@ auto StringToNumber(const std::string& str, int base = 10) } // namespace rtc -#endif // WEBRTC_RTC_BASE_STRING_TO_NUMBER_H_ +#endif // RTC_BASE_STRING_TO_NUMBER_H_ diff --git a/rtc_base/string_to_number_unittest.cc b/rtc_base/string_to_number_unittest.cc index 2c1aeceaac..5a6a23709f 100644 --- a/rtc_base/string_to_number_unittest.cc +++ b/rtc_base/string_to_number_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/string_to_number.h" +#include "rtc_base/string_to_number.h" #include #include #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/stringencode.cc b/rtc_base/stringencode.cc index a4d594d88c..efd9843c46 100644 --- a/rtc_base/stringencode.cc +++ b/rtc_base/stringencode.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/stringencode.h b/rtc_base/stringencode.h index a4452c2e97..d99dd0d4a2 100644 --- a/rtc_base/stringencode.h +++ b/rtc_base/stringencode.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_STRINGENCODE_H_ -#define WEBRTC_RTC_BASE_STRINGENCODE_H_ +#ifndef RTC_BASE_STRINGENCODE_H_ +#define RTC_BASE_STRINGENCODE_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { @@ -225,4 +225,4 @@ char make_char_safe_for_filename(char c); } // namespace rtc -#endif // WEBRTC_RTC_BASE_STRINGENCODE_H__ +#endif // RTC_BASE_STRINGENCODE_H__ diff --git a/rtc_base/stringencode_unittest.cc b/rtc_base/stringencode_unittest.cc index 36071edd85..e4b5c960ad 100644 --- a/rtc_base/stringencode_unittest.cc +++ b/rtc_base/stringencode_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/gunit.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/stringize_macros.h b/rtc_base/stringize_macros.h index 992d35c2c0..aee8d14551 100644 --- a/rtc_base/stringize_macros.h +++ b/rtc_base/stringize_macros.h @@ -15,8 +15,8 @@ // symbols (or their output) and manipulating preprocessor symbols // that define strings. -#ifndef WEBRTC_RTC_BASE_STRINGIZE_MACROS_H_ -#define WEBRTC_RTC_BASE_STRINGIZE_MACROS_H_ +#ifndef RTC_BASE_STRINGIZE_MACROS_H_ +#define RTC_BASE_STRINGIZE_MACROS_H_ // This is not very useful as it does not expand defined symbols if // called directly. Use its counterpart without the _NO_EXPANSION @@ -35,4 +35,4 @@ // STRINGIZE(B(y)) produces "myobj->FunctionCall(y)" #define STRINGIZE(x) STRINGIZE_NO_EXPANSION(x) -#endif // WEBRTC_RTC_BASE_STRINGIZE_MACROS_H_ +#endif // RTC_BASE_STRINGIZE_MACROS_H_ diff --git a/rtc_base/stringize_macros_unittest.cc b/rtc_base/stringize_macros_unittest.cc index bb3a0f6a9b..d1dea5e2bf 100644 --- a/rtc_base/stringize_macros_unittest.cc +++ b/rtc_base/stringize_macros_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringize_macros.h" +#include "rtc_base/stringize_macros.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" // Macros as per documentation in header file. #define PREPROCESSOR_UTIL_UNITTEST_A FOO diff --git a/rtc_base/stringutils.cc b/rtc_base/stringutils.cc index b47bb16987..8671b52c5d 100644 --- a/rtc_base/stringutils.cc +++ b/rtc_base/stringutils.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/stringutils.h b/rtc_base/stringutils.h index 1a6392f34a..95e36eea1f 100644 --- a/rtc_base/stringutils.h +++ b/rtc_base/stringutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_STRINGUTILS_H_ -#define WEBRTC_RTC_BASE_STRINGUTILS_H_ +#ifndef RTC_BASE_STRINGUTILS_H_ +#define RTC_BASE_STRINGUTILS_H_ #include #include @@ -313,4 +313,4 @@ std::string string_trim(const std::string& s); } // namespace rtc -#endif // WEBRTC_RTC_BASE_STRINGUTILS_H_ +#endif // RTC_BASE_STRINGUTILS_H_ diff --git a/rtc_base/stringutils_unittest.cc b/rtc_base/stringutils_unittest.cc index 7689b838df..85d0c3cdba 100644 --- a/rtc_base/stringutils_unittest.cc +++ b/rtc_base/stringutils_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/gunit.h" namespace rtc { diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h index 95bae21bb8..f794ad91f9 100644 --- a/rtc_base/swap_queue.h +++ b/rtc_base/swap_queue.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_SWAP_QUEUE_H_ -#define WEBRTC_RTC_BASE_SWAP_QUEUE_H_ +#ifndef RTC_BASE_SWAP_QUEUE_H_ +#define RTC_BASE_SWAP_QUEUE_H_ #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" namespace webrtc { @@ -208,4 +208,4 @@ class SwapQueue { } // namespace webrtc -#endif // WEBRTC_RTC_BASE_SWAP_QUEUE_H_ +#endif // RTC_BASE_SWAP_QUEUE_H_ diff --git a/rtc_base/swap_queue_unittest.cc b/rtc_base/swap_queue_unittest.cc index ceda7eb353..28f870b20b 100644 --- a/rtc_base/swap_queue_unittest.cc +++ b/rtc_base/swap_queue_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/swap_queue.h" +#include "rtc_base/swap_queue.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h index 5ad0afb220..fe4ad5f4c0 100644 --- a/rtc_base/task_queue.h +++ b/rtc_base/task_queue.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TASK_QUEUE_H_ -#define WEBRTC_RTC_BASE_TASK_QUEUE_H_ +#ifndef RTC_BASE_TASK_QUEUE_H_ +#define RTC_BASE_TASK_QUEUE_H_ #include #include #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -240,4 +240,4 @@ class RTC_LOCKABLE TaskQueue { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TASK_QUEUE_H_ +#endif // RTC_BASE_TASK_QUEUE_H_ diff --git a/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc index 70a016b722..a13e088ede 100644 --- a/rtc_base/task_queue_gcd.cc +++ b/rtc_base/task_queue_gcd.cc @@ -12,17 +12,17 @@ // The implementation uses Grand Central Dispatch queues (GCD) to // do the actual task queuing. -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/task_queue.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/task_queue_posix.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcount.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/task_queue_posix.h" namespace rtc { namespace { diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc index 17da0f094d..3d9188ef33 100644 --- a/rtc_base/task_queue_libevent.cc +++ b/rtc_base/task_queue_libevent.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/task_queue.h" #include #include @@ -16,15 +16,15 @@ #include #include "base/third_party/libevent/event.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/task_queue_posix.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/refcount.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/task_queue_posix.h" +#include "rtc_base/timeutils.h" namespace rtc { using internal::GetQueuePtrTls; diff --git a/rtc_base/task_queue_posix.cc b/rtc_base/task_queue_posix.cc index 89956f1f90..520b8e9509 100644 --- a/rtc_base/task_queue_posix.cc +++ b/rtc_base/task_queue_posix.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue_posix.h" +#include "rtc_base/task_queue_posix.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/checks.h" +#include "rtc_base/task_queue.h" namespace rtc { namespace internal { diff --git a/rtc_base/task_queue_posix.h b/rtc_base/task_queue_posix.h index cab2009a22..3014e2011d 100644 --- a/rtc_base/task_queue_posix.h +++ b/rtc_base/task_queue_posix.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TASK_QUEUE_POSIX_H_ -#define WEBRTC_RTC_BASE_TASK_QUEUE_POSIX_H_ +#ifndef RTC_BASE_TASK_QUEUE_POSIX_H_ +#define RTC_BASE_TASK_QUEUE_POSIX_H_ #include @@ -33,4 +33,4 @@ pthread_key_t GetQueuePtrTls(); } // namespace internal } // namespace rtc -#endif // WEBRTC_RTC_BASE_TASK_QUEUE_POSIX_H_ +#endif // RTC_BASE_TASK_QUEUE_POSIX_H_ diff --git a/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc index 512c4eefe1..adc43c81af 100644 --- a/rtc_base/task_queue_unittest.cc +++ b/rtc_base/task_queue_unittest.cc @@ -18,11 +18,11 @@ #include #include -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/bind.h" +#include "rtc_base/event.h" +#include "rtc_base/gunit.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" namespace rtc { namespace { diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc index 6ff64c0789..1d069e6040 100644 --- a/rtc_base/task_queue_win.cc +++ b/rtc_base/task_queue_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/task_queue.h" #include #include @@ -16,15 +16,15 @@ #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/refcountedobject.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/refcount.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/timeutils.h" namespace rtc { namespace { diff --git a/rtc_base/template_util.h b/rtc_base/template_util.h index acadc9d29a..04e5e37fc0 100644 --- a/rtc_base/template_util.h +++ b/rtc_base/template_util.h @@ -10,8 +10,8 @@ // Borrowed from Chromium's src/base/template_util.h. -#ifndef WEBRTC_RTC_BASE_TEMPLATE_UTIL_H_ -#define WEBRTC_RTC_BASE_TEMPLATE_UTIL_H_ +#ifndef RTC_BASE_TEMPLATE_UTIL_H_ +#define RTC_BASE_TEMPLATE_UTIL_H_ #include // For size_t. @@ -124,4 +124,4 @@ struct is_class } // namespace rtc -#endif // WEBRTC_RTC_BASE_TEMPLATE_UTIL_H_ +#endif // RTC_BASE_TEMPLATE_UTIL_H_ diff --git a/rtc_base/testbase64.h b/rtc_base/testbase64.h index f8e7ac139b..dbbdec9fe4 100644 --- a/rtc_base/testbase64.h +++ b/rtc_base/testbase64.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TESTBASE64_H_ -#define WEBRTC_RTC_BASE_TESTBASE64_H_ +#ifndef RTC_BASE_TESTBASE64_H_ +#define RTC_BASE_TESTBASE64_H_ /* This file was generated by googleclient/talk/binary2header.sh */ @@ -17,4 +17,4 @@ static unsigned char testbase64[] = { 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x02, 0x01, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xe1, 0x0d, 0x07, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x4d, 0x4d, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x01, 0x0e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x9e, 0x01, 0x0f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xbe, 0x01, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xc3, 0x01, 0x12, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x1a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xcc, 0x01, 0x1b, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xd4, 0x01, 0x28, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x01, 0x31, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xdc, 0x01, 0x32, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x3c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x01, 0x04, 0x02, 0x13, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x87, 0x69, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x02, 0xc4, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x53, 0x4f, 0x4e, 0x59, 0x00, 0x44, 0x53, 0x43, 0x2d, 0x50, 0x32, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, 0x37, 0x2e, 0x30, 0x00, 0x32, 0x30, 0x30, 0x37, 0x3a, 0x30, 0x31, 0x3a, 0x33, 0x30, 0x20, 0x32, 0x33, 0x3a, 0x31, 0x30, 0x3a, 0x30, 0x34, 0x00, 0x4d, 0x61, 0x63, 0x20, 0x4f, 0x53, 0x20, 0x58, 0x20, 0x31, 0x30, 0x2e, 0x34, 0x2e, 0x38, 0x00, 0x00, 0x1c, 0x82, 0x9a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x6a, 0x82, 0x9d, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x72, 0x88, 0x22, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x88, 0x27, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x64, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x30, 0x32, 0x32, 0x30, 0x90, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x02, 0x7a, 0x90, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x02, 0x8e, 0x91, 0x01, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x01, 0x02, 0x03, 0x00, 0x91, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0xa2, 0x92, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0xaa, 0x92, 0x05, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0xb2, 0x92, 0x07, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x92, 0x08, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x92, 0x09, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0f, 0x00, 0x00, 0x92, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0xba, 0xa0, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x04, 0x30, 0x31, 0x30, 0x30, 0xa0, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x64, 0xa0, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x64, 0xa3, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0xa3, 0x01, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x06, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x08, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x09, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x0a, 0x32, 0x30, 0x30, 0x37, 0x3a, 0x30, 0x31, 0x3a, 0x32, 0x30, 0x20, 0x32, 0x33, 0x3a, 0x30, 0x35, 0x3a, 0x35, 0x32, 0x00, 0x32, 0x30, 0x30, 0x37, 0x3a, 0x30, 0x31, 0x3a, 0x32, 0x30, 0x20, 0x32, 0x33, 0x3a, 0x30, 0x35, 0x3a, 0x35, 0x32, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x06, 0x01, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x01, 0x1a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x12, 0x01, 0x1b, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x1a, 0x01, 0x28, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x22, 0x02, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x09, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x02, 0x01, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xed, 0x00, 0x0c, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x5f, 0x43, 0x4d, 0x00, 0x02, 0xff, 0xee, 0x00, 0x0e, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x00, 0x64, 0x80, 0x00, 0x00, 0x00, 0x01, 0xff, 0xdb, 0x00, 0x84, 0x00, 0x0c, 0x08, 0x08, 0x08, 0x09, 0x08, 0x0c, 0x09, 0x09, 0x0c, 0x11, 0x0b, 0x0a, 0x0b, 0x11, 0x15, 0x0f, 0x0c, 0x0c, 0x0f, 0x15, 0x18, 0x13, 0x13, 0x15, 0x13, 0x13, 0x18, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x01, 0x0d, 0x0b, 0x0b, 0x0d, 0x0e, 0x0d, 0x10, 0x0e, 0x0e, 0x10, 0x14, 0x0e, 0x0e, 0x0e, 0x14, 0x14, 0x0e, 0x0e, 0x0e, 0x0e, 0x14, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0x64, 0x00, 0x64, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xdd, 0x00, 0x04, 0x00, 0x07, 0xff, 0xc4, 0x01, 0x3f, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x01, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x10, 0x00, 0x01, 0x04, 0x01, 0x03, 0x02, 0x04, 0x02, 0x05, 0x07, 0x06, 0x08, 0x05, 0x03, 0x0c, 0x33, 0x01, 0x00, 0x02, 0x11, 0x03, 0x04, 0x21, 0x12, 0x31, 0x05, 0x41, 0x51, 0x61, 0x13, 0x22, 0x71, 0x81, 0x32, 0x06, 0x14, 0x91, 0xa1, 0xb1, 0x42, 0x23, 0x24, 0x15, 0x52, 0xc1, 0x62, 0x33, 0x34, 0x72, 0x82, 0xd1, 0x43, 0x07, 0x25, 0x92, 0x53, 0xf0, 0xe1, 0xf1, 0x63, 0x73, 0x35, 0x16, 0xa2, 0xb2, 0x83, 0x26, 0x44, 0x93, 0x54, 0x64, 0x45, 0xc2, 0xa3, 0x74, 0x36, 0x17, 0xd2, 0x55, 0xe2, 0x65, 0xf2, 0xb3, 0x84, 0xc3, 0xd3, 0x75, 0xe3, 0xf3, 0x46, 0x27, 0x94, 0xa4, 0x85, 0xb4, 0x95, 0xc4, 0xd4, 0xe4, 0xf4, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x37, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7, 0x11, 0x00, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x05, 0x06, 0x07, 0x07, 0x06, 0x05, 0x35, 0x01, 0x00, 0x02, 0x11, 0x03, 0x21, 0x31, 0x12, 0x04, 0x41, 0x51, 0x61, 0x71, 0x22, 0x13, 0x05, 0x32, 0x81, 0x91, 0x14, 0xa1, 0xb1, 0x42, 0x23, 0xc1, 0x52, 0xd1, 0xf0, 0x33, 0x24, 0x62, 0xe1, 0x72, 0x82, 0x92, 0x43, 0x53, 0x15, 0x63, 0x73, 0x34, 0xf1, 0x25, 0x06, 0x16, 0xa2, 0xb2, 0x83, 0x07, 0x26, 0x35, 0xc2, 0xd2, 0x44, 0x93, 0x54, 0xa3, 0x17, 0x64, 0x45, 0x55, 0x36, 0x74, 0x65, 0xe2, 0xf2, 0xb3, 0x84, 0xc3, 0xd3, 0x75, 0xe3, 0xf3, 0x46, 0x94, 0xa4, 0x85, 0xb4, 0x95, 0xc4, 0xd4, 0xe4, 0xf4, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0xf2, 0xed, 0xb2, 0x8d, 0x4d, 0x45, 0xcd, 0x2f, 0x3f, 0x44, 0x68, 0x93, 0xc3, 0x58, 0xc8, 0xf1, 0x1f, 0x8a, 0x33, 0x86, 0xda, 0x58, 0xc1, 0xa0, 0x02, 0x4f, 0xc4, 0xa1, 0x69, 0xa5, 0x9b, 0x5b, 0x4b, 0x84, 0x73, 0xdf, 0xc9, 0x15, 0xf8, 0xe3, 0xd1, 0x0e, 0x07, 0x93, 0xf3, 0xd1, 0x0f, 0x1c, 0x17, 0xef, 0x2e, 0x3b, 0x5b, 0xdc, 0xff, 0x00, 0xdf, 0x42, 0xbf, 0x8f, 0x8e, 0xdc, 0x82, 0xca, 0xd8, 0x37, 0x11, 0xa9, 0x3d, 0x82, 0x69, 0x2b, 0xc4, 0x6d, 0xc9, 0x75, 0x25, 0xbc, 0xf7, 0xec, 0xa1, 0xb5, 0x74, 0x19, 0x5d, 0x2e, 0x8a, 0x9a, 0x4b, 0x89, 0x7d, 0xc4, 0x68, 0xc6, 0xf6, 0xfe, 0xb2, 0xa0, 0x30, 0x1d, 0x60, 0x86, 0x88, 0x8d, 0x49, 0x3e, 0x01, 0x11, 0x20, 0xa3, 0x8c, 0xb9, 0xb1, 0xaa, 0x62, 0xad, 0xbf, 0x18, 0x97, 0x43, 0x47, 0x1d, 0xd2, 0xaf, 0x04, 0xd9, 0xb8, 0xc8, 0x0d, 0x68, 0xe4, 0xf7, 0x3e, 0x48, 0xf1, 0x05, 0xbc, 0x25, 0xaa, 0x07, 0x71, 0xd9, 0x14, 0x78, 0xf6, 0x49, 0xb5, 0x90, 0xfd, 0xa7, 0xc6, 0x14, 0xfd, 0x1b, 0x1c, 0xff, 0x00, 0x4d, 0x8d, 0x2e, 0x73, 0x8c, 0x35, 0xa3, 0x52, 0x4f, 0x92, 0x48, 0xa6, 0x1a, 0x24, 0xb6, 0x2a, 0xfa, 0xa5, 0x9e, 0x60, 0x64, 0x39, 0x94, 0x13, 0xcb, 0x27, 0x73, 0x80, 0xf3, 0x0c, 0xf6, 0xff, 0x00, 0xd2, 0x5a, 0x78, 0xbf, 0x53, 0x71, 0xf6, 0x01, 0x75, 0xb6, 0x97, 0x6a, 0x25, 0xa1, 0xad, 0x1f, 0xf4, 0xb7, 0x23, 0x48, 0xb7, 0x94, 0x84, 0x97, 0x5b, 0xff, 0x00, 0x32, 0xa9, 0xdd, 0xfc, 0xed, 0x9b, 0x7e, 0x0d, 0x9e, 0x52, 0x4a, 0x95, 0x61, 0xff, 0xd0, 0xf3, 0x3b, 0xa7, 0x70, 0xee, 0x01, 0x8f, 0xb9, 0x59, 0xfa, 0x7e, 0xdf, 0xe4, 0xc8, 0xf9, 0x2a, 0xc2, 0x5c, 0x63, 0xc3, 0x54, 0x67, 0x87, 0x6e, 0x10, 0x35, 0x68, 0xd4, 0x79, 0x1e, 0x53, 0x4a, 0xe0, 0xdc, 0xe9, 0xb8, 0x1f, 0x6a, 0xda, 0x6c, 0x25, 0x94, 0x37, 0xb0, 0xd0, 0xb8, 0xad, 0x67, 0xe4, 0x55, 0x8a, 0x5b, 0x8b, 0x82, 0xc0, 0x6f, 0x76, 0x80, 0x34, 0x49, 0x05, 0x2e, 0x9e, 0xc6, 0x1c, 0x66, 0x31, 0xba, 0x10, 0x23, 0xe0, 0xaf, 0xe1, 0x61, 0x53, 0x43, 0x8d, 0x81, 0xb3, 0x67, 0xef, 0x9e, 0x49, 0x2a, 0x12, 0x6c, 0xb6, 0x63, 0x1a, 0x0c, 0x31, 0xba, 0x55, 0xcd, 0xac, 0xfa, 0x8e, 0xdf, 0x91, 0x6e, 0x91, 0xd9, 0xb3, 0xc9, 0x73, 0x90, 0x7a, 0xab, 0x6a, 0xc2, 0xa4, 0x60, 0xe2, 0x8f, 0xd2, 0x38, 0x03, 0x7d, 0x9e, 0x0d, 0xff, 0x00, 0xcc, 0xd6, 0xd3, 0x6b, 0x71, 0x67, 0xd2, 0x3e, 0x64, 0x72, 0xab, 0xdb, 0x8d, 0x54, 0x39, 0xc5, 0x83, 0x6b, 0x3d, 0xee, 0x2e, 0xd4, 0x92, 0x3c, 0x4a, 0x56, 0xba, 0xb4, 0x79, 0x5c, 0xf7, 0xb2, 0x96, 0x6c, 0x8d, 0xaf, 0x80, 0x48, 0x3c, 0xf0, 0xb2, 0x1f, 0x63, 0x9c, 0xe9, 0x3f, 0x24, 0x5c, 0xdb, 0xdd, 0x76, 0x43, 0xde, 0xfd, 0x5c, 0xe3, 0x24, 0xfc, 0x50, 0x00, 0x93, 0x0a, 0x78, 0x8a, 0x0d, 0x49, 0xca, 0xcf, 0x93, 0x63, 0x1b, 0x7d, 0xd7, 0x57, 0x50, 0xd5, 0xef, 0x70, 0x6b, 0x4f, 0xc7, 0x45, 0xdb, 0x74, 0x9e, 0x8d, 0x5e, 0x33, 0x83, 0xd8, 0x37, 0xdd, 0xc3, 0xac, 0x3d, 0xbf, 0x92, 0xc5, 0x5b, 0xea, 0xbf, 0xd5, 0x62, 0xc0, 0xdc, 0xbc, 0xbd, 0x2d, 0x22, 0x5a, 0xcf, 0xdd, 0x69, 0xff, 0x00, 0xd1, 0x8e, 0x5d, 0xa5, 0x38, 0xb5, 0xb0, 0x00, 0xc6, 0xc4, 0x24, 0x4a, 0xd6, 0x8d, 0x18, 0x04, 0x49, 0x88, 0x9e, 0x55, 0xd6, 0x61, 0xb0, 0xc1, 0x70, 0x32, 0xdd, 0x3c, 0x95, 0xda, 0xf1, 0xfe, 0xf5, 0x62, 0xbc, 0x76, 0x8e, 0x75, 0x28, 0x02, 0xa2, 0xe7, 0x7d, 0x92, 0xb9, 0x84, 0x96, 0x96, 0xda, 0xf7, 0x70, 0x12, 0x4e, 0x5a, 0xff, 0x00, 0xff, 0xd1, 0xf3, 0x7a, 0x21, 0xaf, 0xde, 0xef, 0xa2, 0x22, 0x55, 0xfc, 0x5a, 0xbd, 0x42, 0xfb, 0x08, 0xfa, 0x67, 0x4f, 0x82, 0xcd, 0x6d, 0x85, 0xc0, 0x56, 0x3b, 0x90, 0xb7, 0xf0, 0x2a, 0x0e, 0x63, 0x58, 0x3b, 0xf2, 0xa3, 0x9e, 0x8c, 0xb8, 0x86, 0xbe, 0x49, 0xf1, 0x2c, 0x0c, 0x86, 0xb4, 0x4c, 0x69, 0xe4, 0xaf, 0x6e, 0xcc, 0x6b, 0x7d, 0x46, 0xb3, 0x70, 0xec, 0x38, 0x51, 0x7d, 0x02, 0x8a, 0xc7, 0xa6, 0xd9, 0x20, 0x68, 0x0f, 0x8f, 0x8a, 0xcf, 0xc9, 0xc2, 0xea, 0x59, 0x5b, 0x48, 0xb0, 0x91, 0xae, 0xe6, 0xc9, 0x03, 0xc9, 0x30, 0x51, 0x66, 0xd4, 0x0d, 0xad, 0xbd, 0x5f, 0x53, 0xcc, 0x6b, 0xb6, 0x90, 0x5a, 0x3b, 0x83, 0x0b, 0x43, 0x17, 0x31, 0xd6, 0xc3, 0x6e, 0x12, 0x3b, 0x79, 0xac, 0xc1, 0x89, 0x47, 0xd9, 0xe8, 0x63, 0x98, 0x45, 0xed, 0x6c, 0x5a, 0xf1, 0xa0, 0x27, 0xc5, 0x5b, 0xc3, 0x6f, 0xa6, 0xe0, 0x1c, 0x7d, 0xb3, 0xa2, 0x69, 0x34, 0x7b, 0xae, 0x1a, 0x8d, 0x45, 0x17, 0x9d, 0xeb, 0xfd, 0x21, 0xd8, 0xb9, 0xae, 0xb5, 0x80, 0xbb, 0x1e, 0xd2, 0x5c, 0xd7, 0x78, 0x13, 0xf9, 0xae, 0x4b, 0xea, 0xc7, 0x4a, 0x39, 0xbd, 0x55, 0xb3, 0xed, 0x66, 0x38, 0xf5, 0x09, 0x22, 0x41, 0x23, 0xe8, 0x37, 0xfb, 0x4b, 0xa1, 0xeb, 0xd6, 0xfe, 0x88, 0x31, 0xbf, 0x41, 0xc0, 0xee, 0xd2, 0x74, 0x02, 0x78, 0x53, 0xfa, 0x97, 0x43, 0x19, 0x85, 0x65, 0xff, 0x00, 0x9d, 0x71, 0x33, 0xe4, 0x1a, 0x7d, 0x8d, 0x53, 0x42, 0x56, 0x35, 0x6b, 0xe5, 0x80, 0x06, 0xc7, 0x57, 0xa7, 0xc4, 0xa9, 0xdb, 0xb6, 0x81, 0x1f, 0xeb, 0xd9, 0x69, 0x56, 0xc2, 0xd0, 0x00, 0xe5, 0x55, 0xc0, 0x12, 0xc2, 0xd7, 0x4e, 0xa2, 0x5a, 0x7c, 0x0a, 0xd0, 0x63, 0x9a, 0xd1, 0xaf, 0xd2, 0xe2, 0x3c, 0x12, 0x62, 0x66, 0xc6, 0x42, 0x23, 0x5a, 0x49, 0x8f, 0x10, 0xa2, 0xd2, 0x3e, 0x28, 0x9d, 0xc4, 0x88, 0x09, 0x29, 0x16, 0xc3, 0x3c, 0x24, 0x8d, 0xe6, 0x92, 0x72, 0x1f, 0xff, 0xd2, 0xf3, 0xbb, 0xb0, 0xfe, 0xcb, 0x99, 0xe9, 0xce, 0xf6, 0x88, 0x2d, 0x77, 0x91, 0x5b, 0x3d, 0x3d, 0xd0, 0xe6, 0x90, 0xa9, 0x65, 0x57, 0x38, 0x95, 0xdd, 0xcb, 0x9a, 0x7d, 0xce, 0xf2, 0x3f, 0x44, 0x23, 0x60, 0x58, 0x76, 0xe9, 0xca, 0x8c, 0xea, 0x1b, 0x31, 0x02, 0x32, 0x23, 0xea, 0xee, 0xb1, 0xcd, 0xb0, 0xc7, 0x87, 0x74, 0x7a, 0xeb, 0x70, 0x1a, 0x71, 0xe1, 0xfe, 0xe4, 0x1c, 0x1d, 0xae, 0xe5, 0x69, 0xd8, 0xfa, 0x99, 0x50, 0x0d, 0x1a, 0xf7, 0x2a, 0x3a, 0x0c, 0xf4, 0x1a, 0x8e, 0xc7, 0x27, 0x5d, 0xbf, 0x18, 0x41, 0xdc, 0xc2, 0xf0, 0x7f, 0x74, 0xf6, 0x3a, 0x22, 0x66, 0xdb, 0x68, 0xc6, 0x80, 0x48, 0x6b, 0x88, 0x06, 0x39, 0x0d, 0xee, 0xaa, 0x1f, 0xb3, 0xd5, 0x1b, 0x83, 0xd8, 0x3b, 0x38, 0x8f, 0x69, 0xfe, 0xdf, 0xd1, 0x4d, 0x29, 0xa1, 0x4c, 0x7a, 0xf4, 0xbf, 0xa7, 0x92, 0xcf, 0xa5, 0x20, 0x08, 0xf3, 0xf6, 0xff, 0x00, 0x15, 0xbb, 0xd1, 0x31, 0xd9, 0x5e, 0x3d, 0x75, 0x56, 0x36, 0x88, 0x00, 0x81, 0xe0, 0x16, 0x5e, 0x55, 0x74, 0x3f, 0x00, 0x9d, 0xe0, 0xcc, 0x69, 0xe7, 0x3a, 0x2d, 0xbe, 0x90, 0x00, 0xa9, 0xae, 0xef, 0x1f, 0x95, 0x4b, 0x0d, 0x9a, 0xdc, 0xc7, 0x45, 0xfe, 0xb1, 0x7d, 0x60, 0xa7, 0xa1, 0xe0, 0x1f, 0x4e, 0x1d, 0x99, 0x69, 0x02, 0x9a, 0xcf, 0x1f, 0xca, 0x7b, 0xbf, 0x90, 0xc5, 0xc2, 0xb3, 0xeb, 0x57, 0xd6, 0x03, 0x6b, 0xae, 0x39, 0xb6, 0x82, 0xe3, 0x31, 0xa1, 0x68, 0xf2, 0x6b, 0x5c, 0x12, 0xfa, 0xe1, 0x91, 0x66, 0x47, 0x5d, 0xb8, 0x3b, 0x4f, 0x44, 0x36, 0xb6, 0x8f, 0x28, 0xdd, 0xff, 0x00, 0x7e, 0x46, 0xab, 0x12, 0x2b, 0x65, 0x55, 0x32, 0xa7, 0x62, 0xb6, 0xbd, 0xf7, 0x64, 0x10, 0xdb, 0x03, 0x9f, 0x1b, 0x9e, 0xc7, 0xd9, 0xb8, 0x3b, 0x1f, 0x67, 0xf3, 0x6c, 0x52, 0x80, 0xd7, 0x7d, 0x0f, 0xea, 0x7f, 0x5d, 0x1d, 0x67, 0xa6, 0x0b, 0x1e, 0x47, 0xda, 0x69, 0x3b, 0x2e, 0x03, 0xc7, 0xf3, 0x5f, 0x1f, 0xf0, 0x8b, 0xa1, 0x02, 0x46, 0xba, 0x79, 0xaf, 0x32, 0xff, 0x00, 0x16, 0xad, 0xca, 0x1d, 0x57, 0x2a, 0xdc, 0x79, 0x18, 0x41, 0xb0, 0xf6, 0x9e, 0xe4, 0x9f, 0xd0, 0x8f, 0xeb, 0x31, 0xab, 0xd2, 0x83, 0xa4, 0xcb, 0x8c, 0xb8, 0xa0, 0x42, 0x12, 0x7b, 0x67, 0x9f, 0x2f, 0xf5, 0x09, 0x26, 0x96, 0xc4, 0xce, 0xa9, 0x20, 0xa7, 0xff, 0xd3, 0xf3, 0x2f, 0xb4, 0x5d, 0xe9, 0x0a, 0xb7, 0x9f, 0x4c, 0x19, 0xdb, 0x3a, 0x2d, 0x5e, 0x94, 0xfd, 0xc4, 0xb7, 0xc5, 0x62, 0xf9, 0x2b, 0xfd, 0x2e, 0xe3, 0x5d, 0xe0, 0x7c, 0x13, 0x48, 0xd1, 0x92, 0x12, 0xa9, 0x0b, 0x7a, 0xbc, 0x2d, 0xc2, 0x7f, 0x92, 0x60, 0xab, 0x4e, 0x79, 0x2e, 0x00, 0xf0, 0xaa, 0xe1, 0xda, 0x3d, 0x43, 0xfc, 0xad, 0x55, 0xbb, 0x80, 0x79, 0x81, 0xa0, 0xe6, 0x54, 0x32, 0x6d, 0x02, 0xbe, 0xf3, 0x61, 0x81, 0xa8, 0x44, 0x14, 0x03, 0x59, 0x0e, 0x1c, 0xf6, 0x1f, 0xdc, 0xb2, 0xec, 0xa3, 0x23, 0x77, 0xe8, 0x6e, 0x70, 0xf2, 0x25, 0x1f, 0x1f, 0x17, 0xa9, 0x6d, 0x71, 0x36, 0x97, 0x47, 0x00, 0xa4, 0x02, 0xe0, 0x2c, 0x7c, 0xc1, 0xab, 0xd5, 0x31, 0x85, 0x35, 0xd4, 0xe6, 0x13, 0x02, 0xd6, 0x4b, 0x67, 0x48, 0x2b, 0xa9, 0xe9, 0x2e, 0x02, 0xb6, 0x4f, 0x82, 0xe5, 0x7a, 0x95, 0x19, 0xc6, 0x87, 0x3d, 0xfb, 0xa2, 0xb8, 0x79, 0x1e, 0x4d, 0x3b, 0x96, 0xcf, 0x4f, 0xbd, 0xcd, 0xa2, 0xa2, 0x1f, 0xa0, 0x82, 0xd3, 0xfc, 0x97, 0x05, 0x24, 0x36, 0x6b, 0xf3, 0x31, 0xa2, 0x35, 0x79, 0xef, 0xad, 0xf8, 0xae, 0xaf, 0xaf, 0xd8, 0xf2, 0xd8, 0x6d, 0xed, 0x6b, 0xda, 0x7b, 0x18, 0x1b, 0x5d, 0xff, 0x00, 0x52, 0xb1, 0x6d, 0xf0, 0x81, 0x31, 0xca, 0xf4, 0x6e, 0xb1, 0x80, 0xce, 0xb1, 0x84, 0xc0, 0x21, 0xb7, 0xd6, 0x77, 0x31, 0xd1, 0x27, 0xc1, 0xcd, 0xfe, 0xd2, 0xe3, 0xec, 0xe8, 0x1d, 0x45, 0x96, 0xb0, 0x9a, 0xb7, 0x87, 0x3f, 0x68, 0x2d, 0xf7, 0x01, 0x1f, 0xbe, 0xd1, 0xf4, 0x7f, 0xb4, 0xa4, 0x0d, 0x77, 0xbb, 0xfa, 0x8f, 0x80, 0x3a, 0x7f, 0x43, 0xaa, 0xe2, 0xdf, 0xd2, 0x65, 0x7e, 0x95, 0xe4, 0x0f, 0x1f, 0xa1, 0xfe, 0x6b, 0x16, 0x9f, 0x52, 0xfa, 0xc1, 0xd3, 0xba, 0x6d, 0x26, 0xdc, 0xac, 0x86, 0xd4, 0xd9, 0x0d, 0x31, 0x2e, 0x74, 0x9e, 0xdb, 0x59, 0x2e, 0x55, 0xe8, 0xc9, 0xb2, 0x96, 0xd5, 0x4b, 0x9f, 0xb8, 0x6d, 0xda, 0x1c, 0x04, 0x09, 0x03, 0xfe, 0x8a, 0xc6, 0xfa, 0xd3, 0xf5, 0x6a, 0xbe, 0xbb, 0x5b, 0x2e, 0xc6, 0xb5, 0x94, 0xe6, 0xd5, 0x20, 0x97, 0x7d, 0x1b, 0x1b, 0xf9, 0xad, 0x7c, 0x7d, 0x17, 0xb7, 0xf3, 0x1e, 0x92, 0x1b, 0x7f, 0xf8, 0xe0, 0x7d, 0x59, 0xdd, 0xfd, 0x32, 0xd8, 0x8f, 0xa5, 0xe8, 0x3a, 0x12, 0x5c, 0x3f, 0xfc, 0xc4, 0xfa, 0xc3, 0xb3, 0x77, 0xa7, 0x56, 0xed, 0xdb, 0x76, 0x7a, 0x8d, 0xdd, 0x1f, 0xbf, 0xfd, 0x44, 0x92, 0x56, 0x8f, 0xff, 0xd4, 0xf2, 0xe8, 0x86, 0x17, 0x1e, 0xfa, 0x04, 0x56, 0x4b, 0x43, 0x6c, 0x6f, 0x2d, 0xe5, 0x46, 0x01, 0x64, 0x2b, 0x14, 0x32, 0x5b, 0xb4, 0xa0, 0x52, 0x1d, 0xde, 0x9b, 0x94, 0xdb, 0xab, 0x6b, 0x81, 0xf7, 0x05, 0xb0, 0xd7, 0x07, 0xb2, 0x27, 0x55, 0xc6, 0x57, 0x65, 0xd8, 0x76, 0x6e, 0x64, 0xed, 0xee, 0x16, 0xce, 0x27, 0x57, 0x63, 0xda, 0x0c, 0xc2, 0x8e, 0x51, 0x67, 0x84, 0xfa, 0x1d, 0xdd, 0x62, 0xc7, 0x07, 0xe9, 0xf7, 0xa3, 0xd6, 0x6c, 0x02, 0x41, 0x55, 0x31, 0xf3, 0x2b, 0xb3, 0xba, 0x2b, 0x2e, 0x68, 0x24, 0x1d, 0x47, 0x64, 0xca, 0xa6, 0x50, 0x41, 0x65, 0x90, 0x6c, 0xb1, 0xa5, 0xae, 0x33, 0x23, 0x51, 0xe4, 0xab, 0x7d, 0x5d, 0xcb, 0xb6, 0xcc, 0x37, 0xd0, 0x40, 0x73, 0x71, 0xde, 0x58, 0x09, 0xe7, 0x6f, 0x2c, 0x44, 0xc9, 0xc9, 0xae, 0xba, 0x9d, 0x63, 0x88, 0x01, 0xa0, 0x95, 0x9d, 0xf5, 0x3f, 0x2a, 0xe6, 0x67, 0xdb, 0x50, 0x83, 0x55, 0xad, 0x36, 0x3e, 0x78, 0x10, 0x74, 0x77, 0xfd, 0x2d, 0xaa, 0x4c, 0x7d, 0x58, 0x73, 0x91, 0xa0, 0x0f, 0x51, 0x45, 0xb7, 0x33, 0xdd, 0x58, 0x69, 0x1d, 0xd8, 0x0c, 0x9f, 0x96, 0x88, 0x19, 0x99, 0x19, 0xac, 0xcf, 0xa3, 0xd2, 0xad, 0xb5, 0xdb, 0x76, 0x8f, 0xad, 0xc4, 0xea, 0xcf, 0xdf, 0x7e, 0xdf, 0xdd, 0xfc, 0xd5, 0xa3, 0x5e, 0x43, 0x2b, 0x6b, 0xb2, 0xad, 0x3b, 0x6a, 0xa4, 0x13, 0xa7, 0x04, 0xac, 0x7a, 0x6f, 0xb3, 0x23, 0x26, 0xcc, 0xfb, 0xb4, 0x75, 0x8e, 0x01, 0x83, 0xf7, 0x58, 0x3e, 0x8b, 0x53, 0xa7, 0x2a, 0x1a, 0x31, 0x42, 0x36, 0x5d, 0x4c, 0x9a, 0xf2, 0xdc, 0xc6, 0xfe, 0x98, 0xb4, 0x34, 0xcb, 0x48, 0x0a, 0x8f, 0xdb, 0xb2, 0xeb, 0x76, 0xd6, 0x07, 0x5c, 0x59, 0xc9, 0x64, 0x8f, 0x93, 0xa7, 0x73, 0x16, 0x83, 0xaf, 0x0e, 0xa4, 0x33, 0xef, 0x50, 0xc5, 0x0c, 0xda, 0x59, 0x10, 0x06, 0x8a, 0x2e, 0x29, 0x0e, 0xac, 0xc2, 0x31, 0x3d, 0x36, 0x69, 0x7e, 0xd6, 0xcc, 0xf5, 0x3d, 0x6f, 0xb3, 0xeb, 0x1b, 0x76, 0xef, 0x3b, 0xa3, 0xfa, 0xc9, 0x2b, 0x5f, 0x66, 0x6f, 0xa9, 0x1e, 0x73, 0xf2, 0x49, 0x2e, 0x39, 0xf7, 0x4f, 0xb7, 0x8d, 0xff, 0xd5, 0xf3, 0x26, 0xfe, 0x0a, 0xc5, 0x1b, 0xa7, 0xcb, 0xb2, 0xcf, 0x49, 0x03, 0xb2, 0x46, 0xee, 0xd9, 0xd9, 0xb3, 0xf4, 0x9f, 0x25, 0x4a, 0xdf, 0x4b, 0x77, 0xe8, 0x27, 0xd4, 0xef, 0x1c, 0x2a, 0x29, 0x26, 0xc5, 0x7c, 0x9d, 0x6c, 0x7f, 0xb7, 0x6e, 0x1b, 0x26, 0x7f, 0x05, 0xa3, 0xfe, 0x53, 0x8d, 0x62, 0x57, 0x30, 0x92, 0x12, 0xfa, 0x2f, 0x86, 0xdf, 0xa4, 0xec, 0x67, 0xfe, 0xd0, 0xf4, 0xff, 0x00, 0x4d, 0xfc, 0xdf, 0x78, 0xe1, 0x68, 0x7d, 0x54, 0x99, 0xbf, 0x6f, 0xf3, 0xbe, 0xdf, 0x8e, 0xdd, 0x7f, 0xef, 0xeb, 0x97, 0x49, 0x3e, 0x3b, 0x7f, 0x06, 0x2c, 0x9f, 0x37, 0x5f, 0xf0, 0x9f, 0x4c, 0xeb, 0x7b, 0xbf, 0x67, 0x55, 0xe8, 0xff, 0x00, 0x31, 0xbc, 0x7a, 0x9e, 0x31, 0xdb, 0xfe, 0x92, 0xae, 0x37, 0x7a, 0x4d, 0xdb, 0xe2, 0x17, 0x9d, 0xa4, 0xa3, 0xc9, 0xba, 0xfc, 0x7b, 0x7d, 0x5f, 0x52, 0xa7, 0x7e, 0xd1, 0x28, 0xf8, 0xf3, 0xb0, 0xc7, 0x32, 0xbc, 0x99, 0x24, 0xc5, 0xe3, 0xab, 0xeb, 0x1f, 0xa4, 0xf5, 0xfc, 0xe1, 0x25, 0xe4, 0xe9, 0x24, 0x97, 0xff, 0xd9, 0xff, 0xed, 0x2e, 0x1c, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, 0x33, 0x2e, 0x30, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2b, 0x1c, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x1c, 0x02, 0x78, 0x00, 0x1f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xfb, 0x09, 0xa6, 0xbd, 0x07, 0x4c, 0x2a, 0x36, 0x9d, 0x8f, 0xe2, 0xcc, 0x57, 0xa9, 0xac, 0x85, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xea, 0x00, 0x00, 0x00, 0x00, 0x1d, 0xb0, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20, 0x70, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x22, 0x2d, 0x2f, 0x2f, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x2f, 0x44, 0x54, 0x44, 0x20, 0x50, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x31, 0x2e, 0x30, 0x2f, 0x2f, 0x45, 0x4e, 0x22, 0x20, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x54, 0x44, 0x73, 0x2f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x2d, 0x31, 0x2e, 0x30, 0x2e, 0x64, 0x74, 0x64, 0x22, 0x3e, 0x0a, 0x3c, 0x70, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x3e, 0x0a, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x48, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x48, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x32, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x31, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x53, 0x63, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x53, 0x63, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x31, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x32, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x63, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x63, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x31, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x73, 0x75, 0x62, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x30, 0x2e, 0x30, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x30, 0x2e, 0x30, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x33, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x35, 0x37, 0x36, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x70, 0x65, 0x72, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x4d, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x70, 0x65, 0x72, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x2d, 0x31, 0x38, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x2d, 0x31, 0x38, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x37, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x35, 0x39, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x50, 0x61, 0x70, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x50, 0x61, 0x70, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x6e, 0x61, 0x2d, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x33, 0x2d, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x54, 0x31, 0x37, 0x3a, 0x34, 0x39, 0x3a, 0x33, 0x36, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x31, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x55, 0x6e, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x55, 0x6e, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x30, 0x2e, 0x30, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x30, 0x2e, 0x30, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x33, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x35, 0x37, 0x36, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x55, 0x6e, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x70, 0x65, 0x72, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x4d, 0x55, 0x6e, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x65, 0x64, 0x50, 0x61, 0x70, 0x65, 0x72, 0x52, 0x65, 0x63, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x2d, 0x31, 0x38, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x2d, 0x31, 0x38, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x37, 0x37, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x35, 0x39, 0x34, 0x3c, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x2d, 0x33, 0x30, 0x54, 0x32, 0x32, 0x3a, 0x30, 0x38, 0x3a, 0x34, 0x31, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x30, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x70, 0x64, 0x2e, 0x50, 0x4d, 0x50, 0x61, 0x70, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x70, 0x64, 0x2e, 0x50, 0x4d, 0x50, 0x61, 0x70, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x55, 0x53, 0x20, 0x4c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x6d, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x44, 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x32, 0x30, 0x30, 0x33, 0x2d, 0x30, 0x37, 0x2d, 0x30, 0x31, 0x54, 0x31, 0x37, 0x3a, 0x34, 0x39, 0x3a, 0x33, 0x36, 0x5a, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x31, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x09, 0x3c, 0x2f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x41, 0x50, 0x49, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x30, 0x30, 0x2e, 0x32, 0x30, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2f, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x41, 0x50, 0x49, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x30, 0x30, 0x2e, 0x32, 0x30, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2f, 0x3e, 0x0a, 0x09, 0x3c, 0x6b, 0x65, 0x79, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x6b, 0x65, 0x79, 0x3e, 0x0a, 0x09, 0x3c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x3c, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x3c, 0x2f, 0x64, 0x69, 0x63, 0x74, 0x3e, 0x0a, 0x3c, 0x2f, 0x70, 0x6c, 0x69, 0x73, 0x74, 0x3e, 0x0a, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x00, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x02, 0xde, 0x02, 0x40, 0xff, 0xee, 0xff, 0xee, 0x03, 0x06, 0x02, 0x52, 0x03, 0x67, 0x05, 0x28, 0x03, 0xfc, 0x00, 0x02, 0x00, 0x00, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd8, 0x02, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x01, 0x7f, 0xff, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x08, 0x00, 0x19, 0x01, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xed, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x48, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1e, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1e, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x2f, 0x66, 0x66, 0x00, 0x01, 0x00, 0x6c, 0x66, 0x66, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2f, 0x66, 0x66, 0x00, 0x01, 0x00, 0xa1, 0x99, 0x9a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x32, 0x00, 0x00, 0x00, 0x01, 0x00, 0x5a, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x35, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x38, 0x42, 0x49, 0x4d, 0x03, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xe8, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x03, 0x45, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x08, 0x00, 0x44, 0x00, 0x53, 0x00, 0x43, 0x00, 0x30, 0x00, 0x32, 0x00, 0x33, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x75, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x4f, 0x62, 0x6a, 0x63, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x63, 0x74, 0x31, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x70, 0x20, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x74, 0x6f, 0x6d, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x52, 0x67, 0x68, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x73, 0x56, 0x6c, 0x4c, 0x73, 0x00, 0x00, 0x00, 0x01, 0x4f, 0x62, 0x6a, 0x63, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x07, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x49, 0x44, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x65, 0x6e, 0x75, 0x6d, 0x00, 0x00, 0x00, 0x0c, 0x45, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x6f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x54, 0x79, 0x70, 0x65, 0x65, 0x6e, 0x75, 0x6d, 0x00, 0x00, 0x00, 0x0a, 0x45, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x00, 0x00, 0x00, 0x00, 0x49, 0x6d, 0x67, 0x20, 0x00, 0x00, 0x00, 0x06, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x4f, 0x62, 0x6a, 0x63, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x63, 0x74, 0x31, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x70, 0x20, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x74, 0x6f, 0x6d, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x52, 0x67, 0x68, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72, 0x6c, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x75, 0x6c, 0x6c, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x73, 0x67, 0x65, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x61, 0x6c, 0x74, 0x54, 0x61, 0x67, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x63, 0x65, 0x6c, 0x6c, 0x54, 0x65, 0x78, 0x74, 0x49, 0x73, 0x48, 0x54, 0x4d, 0x4c, 0x62, 0x6f, 0x6f, 0x6c, 0x01, 0x00, 0x00, 0x00, 0x08, 0x63, 0x65, 0x6c, 0x6c, 0x54, 0x65, 0x78, 0x74, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x68, 0x6f, 0x72, 0x7a, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x65, 0x6e, 0x75, 0x6d, 0x00, 0x00, 0x00, 0x0f, 0x45, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x48, 0x6f, 0x72, 0x7a, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x00, 0x00, 0x00, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x00, 0x00, 0x09, 0x76, 0x65, 0x72, 0x74, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x65, 0x6e, 0x75, 0x6d, 0x00, 0x00, 0x00, 0x0f, 0x45, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x56, 0x65, 0x72, 0x74, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x00, 0x00, 0x00, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x00, 0x00, 0x0b, 0x62, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x65, 0x6e, 0x75, 0x6d, 0x00, 0x00, 0x00, 0x11, 0x45, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x42, 0x47, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x6f, 0x6e, 0x65, 0x00, 0x00, 0x00, 0x09, 0x74, 0x6f, 0x70, 0x4f, 0x75, 0x74, 0x73, 0x65, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x6c, 0x65, 0x66, 0x74, 0x4f, 0x75, 0x74, 0x73, 0x65, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x4f, 0x75, 0x74, 0x73, 0x65, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x72, 0x69, 0x67, 0x68, 0x74, 0x4f, 0x75, 0x74, 0x73, 0x65, 0x74, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x09, 0xf9, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x01, 0x2c, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0x09, 0xdd, 0x00, 0x18, 0x00, 0x01, 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x02, 0x01, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xed, 0x00, 0x0c, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x5f, 0x43, 0x4d, 0x00, 0x02, 0xff, 0xee, 0x00, 0x0e, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x00, 0x64, 0x80, 0x00, 0x00, 0x00, 0x01, 0xff, 0xdb, 0x00, 0x84, 0x00, 0x0c, 0x08, 0x08, 0x08, 0x09, 0x08, 0x0c, 0x09, 0x09, 0x0c, 0x11, 0x0b, 0x0a, 0x0b, 0x11, 0x15, 0x0f, 0x0c, 0x0c, 0x0f, 0x15, 0x18, 0x13, 0x13, 0x15, 0x13, 0x13, 0x18, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x01, 0x0d, 0x0b, 0x0b, 0x0d, 0x0e, 0x0d, 0x10, 0x0e, 0x0e, 0x10, 0x14, 0x0e, 0x0e, 0x0e, 0x14, 0x14, 0x0e, 0x0e, 0x0e, 0x0e, 0x14, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0x64, 0x00, 0x64, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xdd, 0x00, 0x04, 0x00, 0x07, 0xff, 0xc4, 0x01, 0x3f, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x01, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x10, 0x00, 0x01, 0x04, 0x01, 0x03, 0x02, 0x04, 0x02, 0x05, 0x07, 0x06, 0x08, 0x05, 0x03, 0x0c, 0x33, 0x01, 0x00, 0x02, 0x11, 0x03, 0x04, 0x21, 0x12, 0x31, 0x05, 0x41, 0x51, 0x61, 0x13, 0x22, 0x71, 0x81, 0x32, 0x06, 0x14, 0x91, 0xa1, 0xb1, 0x42, 0x23, 0x24, 0x15, 0x52, 0xc1, 0x62, 0x33, 0x34, 0x72, 0x82, 0xd1, 0x43, 0x07, 0x25, 0x92, 0x53, 0xf0, 0xe1, 0xf1, 0x63, 0x73, 0x35, 0x16, 0xa2, 0xb2, 0x83, 0x26, 0x44, 0x93, 0x54, 0x64, 0x45, 0xc2, 0xa3, 0x74, 0x36, 0x17, 0xd2, 0x55, 0xe2, 0x65, 0xf2, 0xb3, 0x84, 0xc3, 0xd3, 0x75, 0xe3, 0xf3, 0x46, 0x27, 0x94, 0xa4, 0x85, 0xb4, 0x95, 0xc4, 0xd4, 0xe4, 0xf4, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x37, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7, 0x11, 0x00, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x05, 0x06, 0x07, 0x07, 0x06, 0x05, 0x35, 0x01, 0x00, 0x02, 0x11, 0x03, 0x21, 0x31, 0x12, 0x04, 0x41, 0x51, 0x61, 0x71, 0x22, 0x13, 0x05, 0x32, 0x81, 0x91, 0x14, 0xa1, 0xb1, 0x42, 0x23, 0xc1, 0x52, 0xd1, 0xf0, 0x33, 0x24, 0x62, 0xe1, 0x72, 0x82, 0x92, 0x43, 0x53, 0x15, 0x63, 0x73, 0x34, 0xf1, 0x25, 0x06, 0x16, 0xa2, 0xb2, 0x83, 0x07, 0x26, 0x35, 0xc2, 0xd2, 0x44, 0x93, 0x54, 0xa3, 0x17, 0x64, 0x45, 0x55, 0x36, 0x74, 0x65, 0xe2, 0xf2, 0xb3, 0x84, 0xc3, 0xd3, 0x75, 0xe3, 0xf3, 0x46, 0x94, 0xa4, 0x85, 0xb4, 0x95, 0xc4, 0xd4, 0xe4, 0xf4, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0xf2, 0xed, 0xb2, 0x8d, 0x4d, 0x45, 0xcd, 0x2f, 0x3f, 0x44, 0x68, 0x93, 0xc3, 0x58, 0xc8, 0xf1, 0x1f, 0x8a, 0x33, 0x86, 0xda, 0x58, 0xc1, 0xa0, 0x02, 0x4f, 0xc4, 0xa1, 0x69, 0xa5, 0x9b, 0x5b, 0x4b, 0x84, 0x73, 0xdf, 0xc9, 0x15, 0xf8, 0xe3, 0xd1, 0x0e, 0x07, 0x93, 0xf3, 0xd1, 0x0f, 0x1c, 0x17, 0xef, 0x2e, 0x3b, 0x5b, 0xdc, 0xff, 0x00, 0xdf, 0x42, 0xbf, 0x8f, 0x8e, 0xdc, 0x82, 0xca, 0xd8, 0x37, 0x11, 0xa9, 0x3d, 0x82, 0x69, 0x2b, 0xc4, 0x6d, 0xc9, 0x75, 0x25, 0xbc, 0xf7, 0xec, 0xa1, 0xb5, 0x74, 0x19, 0x5d, 0x2e, 0x8a, 0x9a, 0x4b, 0x89, 0x7d, 0xc4, 0x68, 0xc6, 0xf6, 0xfe, 0xb2, 0xa0, 0x30, 0x1d, 0x60, 0x86, 0x88, 0x8d, 0x49, 0x3e, 0x01, 0x11, 0x20, 0xa3, 0x8c, 0xb9, 0xb1, 0xaa, 0x62, 0xad, 0xbf, 0x18, 0x97, 0x43, 0x47, 0x1d, 0xd2, 0xaf, 0x04, 0xd9, 0xb8, 0xc8, 0x0d, 0x68, 0xe4, 0xf7, 0x3e, 0x48, 0xf1, 0x05, 0xbc, 0x25, 0xaa, 0x07, 0x71, 0xd9, 0x14, 0x78, 0xf6, 0x49, 0xb5, 0x90, 0xfd, 0xa7, 0xc6, 0x14, 0xfd, 0x1b, 0x1c, 0xff, 0x00, 0x4d, 0x8d, 0x2e, 0x73, 0x8c, 0x35, 0xa3, 0x52, 0x4f, 0x92, 0x48, 0xa6, 0x1a, 0x24, 0xb6, 0x2a, 0xfa, 0xa5, 0x9e, 0x60, 0x64, 0x39, 0x94, 0x13, 0xcb, 0x27, 0x73, 0x80, 0xf3, 0x0c, 0xf6, 0xff, 0x00, 0xd2, 0x5a, 0x78, 0xbf, 0x53, 0x71, 0xf6, 0x01, 0x75, 0xb6, 0x97, 0x6a, 0x25, 0xa1, 0xad, 0x1f, 0xf4, 0xb7, 0x23, 0x48, 0xb7, 0x94, 0x84, 0x97, 0x5b, 0xff, 0x00, 0x32, 0xa9, 0xdd, 0xfc, 0xed, 0x9b, 0x7e, 0x0d, 0x9e, 0x52, 0x4a, 0x95, 0x61, 0xff, 0xd0, 0xf3, 0x3b, 0xa7, 0x70, 0xee, 0x01, 0x8f, 0xb9, 0x59, 0xfa, 0x7e, 0xdf, 0xe4, 0xc8, 0xf9, 0x2a, 0xc2, 0x5c, 0x63, 0xc3, 0x54, 0x67, 0x87, 0x6e, 0x10, 0x35, 0x68, 0xd4, 0x79, 0x1e, 0x53, 0x4a, 0xe0, 0xdc, 0xe9, 0xb8, 0x1f, 0x6a, 0xda, 0x6c, 0x25, 0x94, 0x37, 0xb0, 0xd0, 0xb8, 0xad, 0x67, 0xe4, 0x55, 0x8a, 0x5b, 0x8b, 0x82, 0xc0, 0x6f, 0x76, 0x80, 0x34, 0x49, 0x05, 0x2e, 0x9e, 0xc6, 0x1c, 0x66, 0x31, 0xba, 0x10, 0x23, 0xe0, 0xaf, 0xe1, 0x61, 0x53, 0x43, 0x8d, 0x81, 0xb3, 0x67, 0xef, 0x9e, 0x49, 0x2a, 0x12, 0x6c, 0xb6, 0x63, 0x1a, 0x0c, 0x31, 0xba, 0x55, 0xcd, 0xac, 0xfa, 0x8e, 0xdf, 0x91, 0x6e, 0x91, 0xd9, 0xb3, 0xc9, 0x73, 0x90, 0x7a, 0xab, 0x6a, 0xc2, 0xa4, 0x60, 0xe2, 0x8f, 0xd2, 0x38, 0x03, 0x7d, 0x9e, 0x0d, 0xff, 0x00, 0xcc, 0xd6, 0xd3, 0x6b, 0x71, 0x67, 0xd2, 0x3e, 0x64, 0x72, 0xab, 0xdb, 0x8d, 0x54, 0x39, 0xc5, 0x83, 0x6b, 0x3d, 0xee, 0x2e, 0xd4, 0x92, 0x3c, 0x4a, 0x56, 0xba, 0xb4, 0x79, 0x5c, 0xf7, 0xb2, 0x96, 0x6c, 0x8d, 0xaf, 0x80, 0x48, 0x3c, 0xf0, 0xb2, 0x1f, 0x63, 0x9c, 0xe9, 0x3f, 0x24, 0x5c, 0xdb, 0xdd, 0x76, 0x43, 0xde, 0xfd, 0x5c, 0xe3, 0x24, 0xfc, 0x50, 0x00, 0x93, 0x0a, 0x78, 0x8a, 0x0d, 0x49, 0xca, 0xcf, 0x93, 0x63, 0x1b, 0x7d, 0xd7, 0x57, 0x50, 0xd5, 0xef, 0x70, 0x6b, 0x4f, 0xc7, 0x45, 0xdb, 0x74, 0x9e, 0x8d, 0x5e, 0x33, 0x83, 0xd8, 0x37, 0xdd, 0xc3, 0xac, 0x3d, 0xbf, 0x92, 0xc5, 0x5b, 0xea, 0xbf, 0xd5, 0x62, 0xc0, 0xdc, 0xbc, 0xbd, 0x2d, 0x22, 0x5a, 0xcf, 0xdd, 0x69, 0xff, 0x00, 0xd1, 0x8e, 0x5d, 0xa5, 0x38, 0xb5, 0xb0, 0x00, 0xc6, 0xc4, 0x24, 0x4a, 0xd6, 0x8d, 0x18, 0x04, 0x49, 0x88, 0x9e, 0x55, 0xd6, 0x61, 0xb0, 0xc1, 0x70, 0x32, 0xdd, 0x3c, 0x95, 0xda, 0xf1, 0xfe, 0xf5, 0x62, 0xbc, 0x76, 0x8e, 0x75, 0x28, 0x02, 0xa2, 0xe7, 0x7d, 0x92, 0xb9, 0x84, 0x96, 0x96, 0xda, 0xf7, 0x70, 0x12, 0x4e, 0x5a, 0xff, 0x00, 0xff, 0xd1, 0xf3, 0x7a, 0x21, 0xaf, 0xde, 0xef, 0xa2, 0x22, 0x55, 0xfc, 0x5a, 0xbd, 0x42, 0xfb, 0x08, 0xfa, 0x67, 0x4f, 0x82, 0xcd, 0x6d, 0x85, 0xc0, 0x56, 0x3b, 0x90, 0xb7, 0xf0, 0x2a, 0x0e, 0x63, 0x58, 0x3b, 0xf2, 0xa3, 0x9e, 0x8c, 0xb8, 0x86, 0xbe, 0x49, 0xf1, 0x2c, 0x0c, 0x86, 0xb4, 0x4c, 0x69, 0xe4, 0xaf, 0x6e, 0xcc, 0x6b, 0x7d, 0x46, 0xb3, 0x70, 0xec, 0x38, 0x51, 0x7d, 0x02, 0x8a, 0xc7, 0xa6, 0xd9, 0x20, 0x68, 0x0f, 0x8f, 0x8a, 0xcf, 0xc9, 0xc2, 0xea, 0x59, 0x5b, 0x48, 0xb0, 0x91, 0xae, 0xe6, 0xc9, 0x03, 0xc9, 0x30, 0x51, 0x66, 0xd4, 0x0d, 0xad, 0xbd, 0x5f, 0x53, 0xcc, 0x6b, 0xb6, 0x90, 0x5a, 0x3b, 0x83, 0x0b, 0x43, 0x17, 0x31, 0xd6, 0xc3, 0x6e, 0x12, 0x3b, 0x79, 0xac, 0xc1, 0x89, 0x47, 0xd9, 0xe8, 0x63, 0x98, 0x45, 0xed, 0x6c, 0x5a, 0xf1, 0xa0, 0x27, 0xc5, 0x5b, 0xc3, 0x6f, 0xa6, 0xe0, 0x1c, 0x7d, 0xb3, 0xa2, 0x69, 0x34, 0x7b, 0xae, 0x1a, 0x8d, 0x45, 0x17, 0x9d, 0xeb, 0xfd, 0x21, 0xd8, 0xb9, 0xae, 0xb5, 0x80, 0xbb, 0x1e, 0xd2, 0x5c, 0xd7, 0x78, 0x13, 0xf9, 0xae, 0x4b, 0xea, 0xc7, 0x4a, 0x39, 0xbd, 0x55, 0xb3, 0xed, 0x66, 0x38, 0xf5, 0x09, 0x22, 0x41, 0x23, 0xe8, 0x37, 0xfb, 0x4b, 0xa1, 0xeb, 0xd6, 0xfe, 0x88, 0x31, 0xbf, 0x41, 0xc0, 0xee, 0xd2, 0x74, 0x02, 0x78, 0x53, 0xfa, 0x97, 0x43, 0x19, 0x85, 0x65, 0xff, 0x00, 0x9d, 0x71, 0x33, 0xe4, 0x1a, 0x7d, 0x8d, 0x53, 0x42, 0x56, 0x35, 0x6b, 0xe5, 0x80, 0x06, 0xc7, 0x57, 0xa7, 0xc4, 0xa9, 0xdb, 0xb6, 0x81, 0x1f, 0xeb, 0xd9, 0x69, 0x56, 0xc2, 0xd0, 0x00, 0xe5, 0x55, 0xc0, 0x12, 0xc2, 0xd7, 0x4e, 0xa2, 0x5a, 0x7c, 0x0a, 0xd0, 0x63, 0x9a, 0xd1, 0xaf, 0xd2, 0xe2, 0x3c, 0x12, 0x62, 0x66, 0xc6, 0x42, 0x23, 0x5a, 0x49, 0x8f, 0x10, 0xa2, 0xd2, 0x3e, 0x28, 0x9d, 0xc4, 0x88, 0x09, 0x29, 0x16, 0xc3, 0x3c, 0x24, 0x8d, 0xe6, 0x92, 0x72, 0x1f, 0xff, 0xd2, 0xf3, 0xbb, 0xb0, 0xfe, 0xcb, 0x99, 0xe9, 0xce, 0xf6, 0x88, 0x2d, 0x77, 0x91, 0x5b, 0x3d, 0x3d, 0xd0, 0xe6, 0x90, 0xa9, 0x65, 0x57, 0x38, 0x95, 0xdd, 0xcb, 0x9a, 0x7d, 0xce, 0xf2, 0x3f, 0x44, 0x23, 0x60, 0x58, 0x76, 0xe9, 0xca, 0x8c, 0xea, 0x1b, 0x31, 0x02, 0x32, 0x23, 0xea, 0xee, 0xb1, 0xcd, 0xb0, 0xc7, 0x87, 0x74, 0x7a, 0xeb, 0x70, 0x1a, 0x71, 0xe1, 0xfe, 0xe4, 0x1c, 0x1d, 0xae, 0xe5, 0x69, 0xd8, 0xfa, 0x99, 0x50, 0x0d, 0x1a, 0xf7, 0x2a, 0x3a, 0x0c, 0xf4, 0x1a, 0x8e, 0xc7, 0x27, 0x5d, 0xbf, 0x18, 0x41, 0xdc, 0xc2, 0xf0, 0x7f, 0x74, 0xf6, 0x3a, 0x22, 0x66, 0xdb, 0x68, 0xc6, 0x80, 0x48, 0x6b, 0x88, 0x06, 0x39, 0x0d, 0xee, 0xaa, 0x1f, 0xb3, 0xd5, 0x1b, 0x83, 0xd8, 0x3b, 0x38, 0x8f, 0x69, 0xfe, 0xdf, 0xd1, 0x4d, 0x29, 0xa1, 0x4c, 0x7a, 0xf4, 0xbf, 0xa7, 0x92, 0xcf, 0xa5, 0x20, 0x08, 0xf3, 0xf6, 0xff, 0x00, 0x15, 0xbb, 0xd1, 0x31, 0xd9, 0x5e, 0x3d, 0x75, 0x56, 0x36, 0x88, 0x00, 0x81, 0xe0, 0x16, 0x5e, 0x55, 0x74, 0x3f, 0x00, 0x9d, 0xe0, 0xcc, 0x69, 0xe7, 0x3a, 0x2d, 0xbe, 0x90, 0x00, 0xa9, 0xae, 0xef, 0x1f, 0x95, 0x4b, 0x0d, 0x9a, 0xdc, 0xc7, 0x45, 0xfe, 0xb1, 0x7d, 0x60, 0xa7, 0xa1, 0xe0, 0x1f, 0x4e, 0x1d, 0x99, 0x69, 0x02, 0x9a, 0xcf, 0x1f, 0xca, 0x7b, 0xbf, 0x90, 0xc5, 0xc2, 0xb3, 0xeb, 0x57, 0xd6, 0x03, 0x6b, 0xae, 0x39, 0xb6, 0x82, 0xe3, 0x31, 0xa1, 0x68, 0xf2, 0x6b, 0x5c, 0x12, 0xfa, 0xe1, 0x91, 0x66, 0x47, 0x5d, 0xb8, 0x3b, 0x4f, 0x44, 0x36, 0xb6, 0x8f, 0x28, 0xdd, 0xff, 0x00, 0x7e, 0x46, 0xab, 0x12, 0x2b, 0x65, 0x55, 0x32, 0xa7, 0x62, 0xb6, 0xbd, 0xf7, 0x64, 0x10, 0xdb, 0x03, 0x9f, 0x1b, 0x9e, 0xc7, 0xd9, 0xb8, 0x3b, 0x1f, 0x67, 0xf3, 0x6c, 0x52, 0x80, 0xd7, 0x7d, 0x0f, 0xea, 0x7f, 0x5d, 0x1d, 0x67, 0xa6, 0x0b, 0x1e, 0x47, 0xda, 0x69, 0x3b, 0x2e, 0x03, 0xc7, 0xf3, 0x5f, 0x1f, 0xf0, 0x8b, 0xa1, 0x02, 0x46, 0xba, 0x79, 0xaf, 0x32, 0xff, 0x00, 0x16, 0xad, 0xca, 0x1d, 0x57, 0x2a, 0xdc, 0x79, 0x18, 0x41, 0xb0, 0xf6, 0x9e, 0xe4, 0x9f, 0xd0, 0x8f, 0xeb, 0x31, 0xab, 0xd2, 0x83, 0xa4, 0xcb, 0x8c, 0xb8, 0xa0, 0x42, 0x12, 0x7b, 0x67, 0x9f, 0x2f, 0xf5, 0x09, 0x26, 0x96, 0xc4, 0xce, 0xa9, 0x20, 0xa7, 0xff, 0xd3, 0xf3, 0x2f, 0xb4, 0x5d, 0xe9, 0x0a, 0xb7, 0x9f, 0x4c, 0x19, 0xdb, 0x3a, 0x2d, 0x5e, 0x94, 0xfd, 0xc4, 0xb7, 0xc5, 0x62, 0xf9, 0x2b, 0xfd, 0x2e, 0xe3, 0x5d, 0xe0, 0x7c, 0x13, 0x48, 0xd1, 0x92, 0x12, 0xa9, 0x0b, 0x7a, 0xbc, 0x2d, 0xc2, 0x7f, 0x92, 0x60, 0xab, 0x4e, 0x79, 0x2e, 0x00, 0xf0, 0xaa, 0xe1, 0xda, 0x3d, 0x43, 0xfc, 0xad, 0x55, 0xbb, 0x80, 0x79, 0x81, 0xa0, 0xe6, 0x54, 0x32, 0x6d, 0x02, 0xbe, 0xf3, 0x61, 0x81, 0xa8, 0x44, 0x14, 0x03, 0x59, 0x0e, 0x1c, 0xf6, 0x1f, 0xdc, 0xb2, 0xec, 0xa3, 0x23, 0x77, 0xe8, 0x6e, 0x70, 0xf2, 0x25, 0x1f, 0x1f, 0x17, 0xa9, 0x6d, 0x71, 0x36, 0x97, 0x47, 0x00, 0xa4, 0x02, 0xe0, 0x2c, 0x7c, 0xc1, 0xab, 0xd5, 0x31, 0x85, 0x35, 0xd4, 0xe6, 0x13, 0x02, 0xd6, 0x4b, 0x67, 0x48, 0x2b, 0xa9, 0xe9, 0x2e, 0x02, 0xb6, 0x4f, 0x82, 0xe5, 0x7a, 0x95, 0x19, 0xc6, 0x87, 0x3d, 0xfb, 0xa2, 0xb8, 0x79, 0x1e, 0x4d, 0x3b, 0x96, 0xcf, 0x4f, 0xbd, 0xcd, 0xa2, 0xa2, 0x1f, 0xa0, 0x82, 0xd3, 0xfc, 0x97, 0x05, 0x24, 0x36, 0x6b, 0xf3, 0x31, 0xa2, 0x35, 0x79, 0xef, 0xad, 0xf8, 0xae, 0xaf, 0xaf, 0xd8, 0xf2, 0xd8, 0x6d, 0xed, 0x6b, 0xda, 0x7b, 0x18, 0x1b, 0x5d, 0xff, 0x00, 0x52, 0xb1, 0x6d, 0xf0, 0x81, 0x31, 0xca, 0xf4, 0x6e, 0xb1, 0x80, 0xce, 0xb1, 0x84, 0xc0, 0x21, 0xb7, 0xd6, 0x77, 0x31, 0xd1, 0x27, 0xc1, 0xcd, 0xfe, 0xd2, 0xe3, 0xec, 0xe8, 0x1d, 0x45, 0x96, 0xb0, 0x9a, 0xb7, 0x87, 0x3f, 0x68, 0x2d, 0xf7, 0x01, 0x1f, 0xbe, 0xd1, 0xf4, 0x7f, 0xb4, 0xa4, 0x0d, 0x77, 0xbb, 0xfa, 0x8f, 0x80, 0x3a, 0x7f, 0x43, 0xaa, 0xe2, 0xdf, 0xd2, 0x65, 0x7e, 0x95, 0xe4, 0x0f, 0x1f, 0xa1, 0xfe, 0x6b, 0x16, 0x9f, 0x52, 0xfa, 0xc1, 0xd3, 0xba, 0x6d, 0x26, 0xdc, 0xac, 0x86, 0xd4, 0xd9, 0x0d, 0x31, 0x2e, 0x74, 0x9e, 0xdb, 0x59, 0x2e, 0x55, 0xe8, 0xc9, 0xb2, 0x96, 0xd5, 0x4b, 0x9f, 0xb8, 0x6d, 0xda, 0x1c, 0x04, 0x09, 0x03, 0xfe, 0x8a, 0xc6, 0xfa, 0xd3, 0xf5, 0x6a, 0xbe, 0xbb, 0x5b, 0x2e, 0xc6, 0xb5, 0x94, 0xe6, 0xd5, 0x20, 0x97, 0x7d, 0x1b, 0x1b, 0xf9, 0xad, 0x7c, 0x7d, 0x17, 0xb7, 0xf3, 0x1e, 0x92, 0x1b, 0x7f, 0xf8, 0xe0, 0x7d, 0x59, 0xdd, 0xfd, 0x32, 0xd8, 0x8f, 0xa5, 0xe8, 0x3a, 0x12, 0x5c, 0x3f, 0xfc, 0xc4, 0xfa, 0xc3, 0xb3, 0x77, 0xa7, 0x56, 0xed, 0xdb, 0x76, 0x7a, 0x8d, 0xdd, 0x1f, 0xbf, 0xfd, 0x44, 0x92, 0x56, 0x8f, 0xff, 0xd4, 0xf2, 0xe8, 0x86, 0x17, 0x1e, 0xfa, 0x04, 0x56, 0x4b, 0x43, 0x6c, 0x6f, 0x2d, 0xe5, 0x46, 0x01, 0x64, 0x2b, 0x14, 0x32, 0x5b, 0xb4, 0xa0, 0x52, 0x1d, 0xde, 0x9b, 0x94, 0xdb, 0xab, 0x6b, 0x81, 0xf7, 0x05, 0xb0, 0xd7, 0x07, 0xb2, 0x27, 0x55, 0xc6, 0x57, 0x65, 0xd8, 0x76, 0x6e, 0x64, 0xed, 0xee, 0x16, 0xce, 0x27, 0x57, 0x63, 0xda, 0x0c, 0xc2, 0x8e, 0x51, 0x67, 0x84, 0xfa, 0x1d, 0xdd, 0x62, 0xc7, 0x07, 0xe9, 0xf7, 0xa3, 0xd6, 0x6c, 0x02, 0x41, 0x55, 0x31, 0xf3, 0x2b, 0xb3, 0xba, 0x2b, 0x2e, 0x68, 0x24, 0x1d, 0x47, 0x64, 0xca, 0xa6, 0x50, 0x41, 0x65, 0x90, 0x6c, 0xb1, 0xa5, 0xae, 0x33, 0x23, 0x51, 0xe4, 0xab, 0x7d, 0x5d, 0xcb, 0xb6, 0xcc, 0x37, 0xd0, 0x40, 0x73, 0x71, 0xde, 0x58, 0x09, 0xe7, 0x6f, 0x2c, 0x44, 0xc9, 0xc9, 0xae, 0xba, 0x9d, 0x63, 0x88, 0x01, 0xa0, 0x95, 0x9d, 0xf5, 0x3f, 0x2a, 0xe6, 0x67, 0xdb, 0x50, 0x83, 0x55, 0xad, 0x36, 0x3e, 0x78, 0x10, 0x74, 0x77, 0xfd, 0x2d, 0xaa, 0x4c, 0x7d, 0x58, 0x73, 0x91, 0xa0, 0x0f, 0x51, 0x45, 0xb7, 0x33, 0xdd, 0x58, 0x69, 0x1d, 0xd8, 0x0c, 0x9f, 0x96, 0x88, 0x19, 0x99, 0x19, 0xac, 0xcf, 0xa3, 0xd2, 0xad, 0xb5, 0xdb, 0x76, 0x8f, 0xad, 0xc4, 0xea, 0xcf, 0xdf, 0x7e, 0xdf, 0xdd, 0xfc, 0xd5, 0xa3, 0x5e, 0x43, 0x2b, 0x6b, 0xb2, 0xad, 0x3b, 0x6a, 0xa4, 0x13, 0xa7, 0x04, 0xac, 0x7a, 0x6f, 0xb3, 0x23, 0x26, 0xcc, 0xfb, 0xb4, 0x75, 0x8e, 0x01, 0x83, 0xf7, 0x58, 0x3e, 0x8b, 0x53, 0xa7, 0x2a, 0x1a, 0x31, 0x42, 0x36, 0x5d, 0x4c, 0x9a, 0xf2, 0xdc, 0xc6, 0xfe, 0x98, 0xb4, 0x34, 0xcb, 0x48, 0x0a, 0x8f, 0xdb, 0xb2, 0xeb, 0x76, 0xd6, 0x07, 0x5c, 0x59, 0xc9, 0x64, 0x8f, 0x93, 0xa7, 0x73, 0x16, 0x83, 0xaf, 0x0e, 0xa4, 0x33, 0xef, 0x50, 0xc5, 0x0c, 0xda, 0x59, 0x10, 0x06, 0x8a, 0x2e, 0x29, 0x0e, 0xac, 0xc2, 0x31, 0x3d, 0x36, 0x69, 0x7e, 0xd6, 0xcc, 0xf5, 0x3d, 0x6f, 0xb3, 0xeb, 0x1b, 0x76, 0xef, 0x3b, 0xa3, 0xfa, 0xc9, 0x2b, 0x5f, 0x66, 0x6f, 0xa9, 0x1e, 0x73, 0xf2, 0x49, 0x2e, 0x39, 0xf7, 0x4f, 0xb7, 0x8d, 0xff, 0xd5, 0xf3, 0x26, 0xfe, 0x0a, 0xc5, 0x1b, 0xa7, 0xcb, 0xb2, 0xcf, 0x49, 0x03, 0xb2, 0x46, 0xee, 0xd9, 0xd9, 0xb3, 0xf4, 0x9f, 0x25, 0x4a, 0xdf, 0x4b, 0x77, 0xe8, 0x27, 0xd4, 0xef, 0x1c, 0x2a, 0x29, 0x26, 0xc5, 0x7c, 0x9d, 0x6c, 0x7f, 0xb7, 0x6e, 0x1b, 0x26, 0x7f, 0x05, 0xa3, 0xfe, 0x53, 0x8d, 0x62, 0x57, 0x30, 0x92, 0x12, 0xfa, 0x2f, 0x86, 0xdf, 0xa4, 0xec, 0x67, 0xfe, 0xd0, 0xf4, 0xff, 0x00, 0x4d, 0xfc, 0xdf, 0x78, 0xe1, 0x68, 0x7d, 0x54, 0x99, 0xbf, 0x6f, 0xf3, 0xbe, 0xdf, 0x8e, 0xdd, 0x7f, 0xef, 0xeb, 0x97, 0x49, 0x3e, 0x3b, 0x7f, 0x06, 0x2c, 0x9f, 0x37, 0x5f, 0xf0, 0x9f, 0x4c, 0xeb, 0x7b, 0xbf, 0x67, 0x55, 0xe8, 0xff, 0x00, 0x31, 0xbc, 0x7a, 0x9e, 0x31, 0xdb, 0xfe, 0x92, 0xae, 0x37, 0x7a, 0x4d, 0xdb, 0xe2, 0x17, 0x9d, 0xa4, 0xa3, 0xc9, 0xba, 0xfc, 0x7b, 0x7d, 0x5f, 0x52, 0xa7, 0x7e, 0xd1, 0x28, 0xf8, 0xf3, 0xb0, 0xc7, 0x32, 0xbc, 0x99, 0x24, 0xc5, 0xe3, 0xab, 0xeb, 0x1f, 0xa4, 0xf5, 0xfc, 0xe1, 0x25, 0xe4, 0xe9, 0x24, 0x97, 0xff, 0xd9, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x00, 0x00, 0x13, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x00, 0x37, 0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x01, 0x00, 0x38, 0x42, 0x49, 0x4d, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xff, 0xe1, 0x15, 0x67, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x61, 0x70, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x00, 0x3c, 0x3f, 0x78, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x20, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x3d, 0x27, 0xef, 0xbb, 0xbf, 0x27, 0x20, 0x69, 0x64, 0x3d, 0x27, 0x57, 0x35, 0x4d, 0x30, 0x4d, 0x70, 0x43, 0x65, 0x68, 0x69, 0x48, 0x7a, 0x72, 0x65, 0x53, 0x7a, 0x4e, 0x54, 0x63, 0x7a, 0x6b, 0x63, 0x39, 0x64, 0x27, 0x3f, 0x3e, 0x0a, 0x3c, 0x3f, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2d, 0x78, 0x61, 0x70, 0x2d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x20, 0x65, 0x73, 0x63, 0x3d, 0x22, 0x43, 0x52, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x78, 0x3a, 0x78, 0x61, 0x70, 0x6d, 0x65, 0x74, 0x61, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x78, 0x3d, 0x27, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x3a, 0x6e, 0x73, 0x3a, 0x6d, 0x65, 0x74, 0x61, 0x2f, 0x27, 0x20, 0x78, 0x3a, 0x78, 0x61, 0x70, 0x74, 0x6b, 0x3d, 0x27, 0x58, 0x4d, 0x50, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x6b, 0x69, 0x74, 0x20, 0x32, 0x2e, 0x38, 0x2e, 0x32, 0x2d, 0x33, 0x33, 0x2c, 0x20, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x31, 0x2e, 0x35, 0x27, 0x3e, 0x0a, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x72, 0x64, 0x66, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x31, 0x39, 0x39, 0x39, 0x2f, 0x30, 0x32, 0x2f, 0x32, 0x32, 0x2d, 0x72, 0x64, 0x66, 0x2d, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2d, 0x6e, 0x73, 0x23, 0x27, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x69, 0x58, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x58, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x27, 0x3e, 0x0a, 0x0a, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x27, 0x75, 0x75, 0x69, 0x64, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x61, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x70, 0x64, 0x66, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x64, 0x66, 0x2f, 0x31, 0x2e, 0x33, 0x2f, 0x27, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x70, 0x64, 0x66, 0x3a, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x69, 0x73, 0x20, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x0a, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x27, 0x75, 0x75, 0x69, 0x64, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x61, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x27, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x3a, 0x43, 0x61, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x0a, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x27, 0x75, 0x75, 0x69, 0x64, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x61, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x78, 0x61, 0x70, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x61, 0x70, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x27, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x78, 0x61, 0x70, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x0a, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x27, 0x75, 0x75, 0x69, 0x64, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x61, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x78, 0x61, 0x70, 0x4d, 0x4d, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x73, 0x2e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x61, 0x70, 0x2f, 0x31, 0x2e, 0x30, 0x2f, 0x6d, 0x6d, 0x2f, 0x27, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x78, 0x61, 0x70, 0x4d, 0x4d, 0x3a, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x3e, 0x61, 0x64, 0x6f, 0x62, 0x65, 0x3a, 0x64, 0x6f, 0x63, 0x69, 0x64, 0x3a, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x36, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x3c, 0x2f, 0x78, 0x61, 0x70, 0x4d, 0x4d, 0x3a, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x3e, 0x0a, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x0a, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x27, 0x75, 0x75, 0x69, 0x64, 0x3a, 0x32, 0x32, 0x64, 0x30, 0x32, 0x62, 0x30, 0x61, 0x2d, 0x62, 0x32, 0x34, 0x39, 0x2d, 0x31, 0x31, 0x64, 0x62, 0x2d, 0x38, 0x61, 0x66, 0x38, 0x2d, 0x39, 0x31, 0x64, 0x35, 0x34, 0x30, 0x33, 0x66, 0x39, 0x32, 0x66, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x64, 0x63, 0x3d, 0x27, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x75, 0x72, 0x6c, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x64, 0x63, 0x2f, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x31, 0x2e, 0x31, 0x2f, 0x27, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x64, 0x63, 0x3a, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x41, 0x6c, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x72, 0x64, 0x66, 0x3a, 0x6c, 0x69, 0x20, 0x78, 0x6d, 0x6c, 0x3a, 0x6c, 0x61, 0x6e, 0x67, 0x3d, 0x27, 0x78, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x27, 0x3e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x6c, 0x69, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x41, 0x6c, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x64, 0x63, 0x3a, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x0a, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, 0x3e, 0x0a, 0x3c, 0x2f, 0x78, 0x3a, 0x78, 0x61, 0x70, 0x6d, 0x65, 0x74, 0x61, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x3c, 0x3f, 0x78, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x20, 0x65, 0x6e, 0x64, 0x3d, 0x27, 0x77, 0x27, 0x3f, 0x3e, 0xff, 0xee, 0x00, 0x0e, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x00, 0x64, 0x40, 0x00, 0x00, 0x00, 0x01, 0xff, 0xdb, 0x00, 0x84, 0x00, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x03, 0x03, 0x04, 0x06, 0x04, 0x03, 0x04, 0x06, 0x07, 0x05, 0x04, 0x04, 0x05, 0x07, 0x08, 0x06, 0x06, 0x07, 0x06, 0x06, 0x08, 0x0a, 0x08, 0x09, 0x09, 0x09, 0x09, 0x08, 0x0a, 0x0a, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x01, 0x04, 0x05, 0x05, 0x08, 0x07, 0x08, 0x0f, 0x0a, 0x0a, 0x0f, 0x14, 0x0e, 0x0e, 0x0e, 0x14, 0x14, 0x0e, 0x0e, 0x0e, 0x0e, 0x14, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0x64, 0x00, 0x64, 0x03, 0x01, 0x11, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xdd, 0x00, 0x04, 0x00, 0x0d, 0xff, 0xc4, 0x01, 0xa2, 0x00, 0x00, 0x00, 0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x03, 0x02, 0x06, 0x01, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x01, 0x00, 0x02, 0x02, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x02, 0x06, 0x07, 0x03, 0x04, 0x02, 0x06, 0x02, 0x73, 0x01, 0x02, 0x03, 0x11, 0x04, 0x00, 0x05, 0x21, 0x12, 0x31, 0x41, 0x51, 0x06, 0x13, 0x61, 0x22, 0x71, 0x81, 0x14, 0x32, 0x91, 0xa1, 0x07, 0x15, 0xb1, 0x42, 0x23, 0xc1, 0x52, 0xd1, 0xe1, 0x33, 0x16, 0x62, 0xf0, 0x24, 0x72, 0x82, 0xf1, 0x25, 0x43, 0x34, 0x53, 0x92, 0xa2, 0xb2, 0x63, 0x73, 0xc2, 0x35, 0x44, 0x27, 0x93, 0xa3, 0xb3, 0x36, 0x17, 0x54, 0x64, 0x74, 0xc3, 0xd2, 0xe2, 0x08, 0x26, 0x83, 0x09, 0x0a, 0x18, 0x19, 0x84, 0x94, 0x45, 0x46, 0xa4, 0xb4, 0x56, 0xd3, 0x55, 0x28, 0x1a, 0xf2, 0xe3, 0xf3, 0xc4, 0xd4, 0xe4, 0xf4, 0x65, 0x75, 0x85, 0x95, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x37, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7, 0x38, 0x48, 0x58, 0x68, 0x78, 0x88, 0x98, 0xa8, 0xb8, 0xc8, 0xd8, 0xe8, 0xf8, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79, 0x89, 0x99, 0xa9, 0xb9, 0xc9, 0xd9, 0xe9, 0xf9, 0x2a, 0x3a, 0x4a, 0x5a, 0x6a, 0x7a, 0x8a, 0x9a, 0xaa, 0xba, 0xca, 0xda, 0xea, 0xfa, 0x11, 0x00, 0x02, 0x02, 0x01, 0x02, 0x03, 0x05, 0x05, 0x04, 0x05, 0x06, 0x04, 0x08, 0x03, 0x03, 0x6d, 0x01, 0x00, 0x02, 0x11, 0x03, 0x04, 0x21, 0x12, 0x31, 0x41, 0x05, 0x51, 0x13, 0x61, 0x22, 0x06, 0x71, 0x81, 0x91, 0x32, 0xa1, 0xb1, 0xf0, 0x14, 0xc1, 0xd1, 0xe1, 0x23, 0x42, 0x15, 0x52, 0x62, 0x72, 0xf1, 0x33, 0x24, 0x34, 0x43, 0x82, 0x16, 0x92, 0x53, 0x25, 0xa2, 0x63, 0xb2, 0xc2, 0x07, 0x73, 0xd2, 0x35, 0xe2, 0x44, 0x83, 0x17, 0x54, 0x93, 0x08, 0x09, 0x0a, 0x18, 0x19, 0x26, 0x36, 0x45, 0x1a, 0x27, 0x64, 0x74, 0x55, 0x37, 0xf2, 0xa3, 0xb3, 0xc3, 0x28, 0x29, 0xd3, 0xe3, 0xf3, 0x84, 0x94, 0xa4, 0xb4, 0xc4, 0xd4, 0xe4, 0xf4, 0x65, 0x75, 0x85, 0x95, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5, 0x46, 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6, 0x47, 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7, 0x38, 0x48, 0x58, 0x68, 0x78, 0x88, 0x98, 0xa8, 0xb8, 0xc8, 0xd8, 0xe8, 0xf8, 0x39, 0x49, 0x59, 0x69, 0x79, 0x89, 0x99, 0xa9, 0xb9, 0xc9, 0xd9, 0xe9, 0xf9, 0x2a, 0x3a, 0x4a, 0x5a, 0x6a, 0x7a, 0x8a, 0x9a, 0xaa, 0xba, 0xca, 0xda, 0xea, 0xfa, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0xf0, 0x67, 0xa6, 0x5c, 0x0f, 0x01, 0xd4, 0x7e, 0x18, 0x12, 0x98, 0xe9, 0xd6, 0x2d, 0x34, 0x6d, 0x70, 0xdf, 0xdc, 0xa1, 0xe3, 0xec, 0x5b, 0xfb, 0x32, 0x24, 0xb2, 0x01, 0x1f, 0x15, 0xa4, 0x52, 0x4a, 0x82, 0x31, 0xf1, 0xfe, 0xd1, 0x3d, 0x14, 0x64, 0x49, 0x64, 0x22, 0x98, 0xcf, 0xa5, 0x46, 0x6c, 0x16, 0x55, 0x71, 0x56, 0x62, 0x28, 0x07, 0xc5, 0x45, 0x15, 0xa0, 0xc8, 0x89, 0x33, 0xe1, 0x63, 0xd2, 0xd8, 0x34, 0x44, 0x17, 0xa0, 0x2c, 0x4d, 0x16, 0xbb, 0xed, 0xdc, 0xf8, 0x64, 0xc1, 0x6b, 0x31, 0x42, 0x18, 0x8e, 0xc7, 0xb5, 0x2a, 0x7d, 0xb2, 0x56, 0xc5, 0x61, 0x8c, 0xf2, 0xa0, 0x1b, 0x1e, 0x83, 0x0d, 0xa1, 0x63, 0x50, 0x1f, 0x97, 0x7c, 0x2a, 0xa9, 0x1a, 0x9a, 0x86, 0x4f, 0xb4, 0xb4, 0x38, 0x0a, 0xa6, 0x0b, 0xb8, 0x0c, 0x05, 0x14, 0xf8, 0x76, 0x3e, 0x19, 0x14, 0xb6, 0x78, 0xf8, 0x8c, 0x2a, 0xd5, 0x01, 0xdc, 0x6f, 0x8a, 0x1a, 0xe3, 0x8d, 0xab, 0xff, 0xd0, 0xf0, 0xec, 0xe9, 0x15, 0xb5, 0xb9, 0x5a, 0x7c, 0x4c, 0xa2, 0x9e, 0x24, 0xf5, 0xca, 0xc6, 0xe5, 0x99, 0xd9, 0x34, 0x99, 0x04, 0x3a, 0x7d, 0xb5, 0xba, 0xd5, 0x51, 0x63, 0x0e, 0xc7, 0xc5, 0x9b, 0x73, 0xf8, 0xe4, 0x6f, 0x76, 0xca, 0xd9, 0xda, 0x54, 0x6d, 0x72, 0x2e, 0x1a, 0x57, 0x11, 0x44, 0x40, 0x0d, 0x27, 0x7a, 0x0f, 0xd9, 0x5f, 0x12, 0x69, 0x4c, 0x84, 0xcd, 0x36, 0xe3, 0x85, 0xb2, 0xcd, 0x2f, 0x4a, 0x8b, 0x58, 0x36, 0xf6, 0x76, 0xa8, 0x64, 0x64, 0x3c, 0xa4, 0x93, 0xaa, 0x25, 0x3c, 0x49, 0xda, 0xa4, 0xe5, 0x26, 0x54, 0xe4, 0x8c, 0x7c, 0x5c, 0x93, 0x4d, 0x67, 0xc9, 0x3a, 0x6e, 0x9f, 0x13, 0xb4, 0xce, 0xf7, 0x3a, 0x9b, 0xad, 0x52, 0xd6, 0x2a, 0xd1, 0x49, 0xee, 0xc7, 0xf8, 0x64, 0x46, 0x42, 0x4e, 0xcd, 0x92, 0xc2, 0x00, 0xdd, 0x8a, 0x47, 0xe5, 0x69, 0x6e, 0xd4, 0xa4, 0x08, 0x16, 0x83, 0x9c, 0x8c, 0xdd, 0x95, 0x6b, 0xb9, 0xf6, 0xef, 0x97, 0x78, 0x94, 0xe3, 0x78, 0x04, 0xa4, 0xf3, 0xe8, 0xee, 0x64, 0xe1, 0x12, 0x10, 0x05, 0x6a, 0xc7, 0xc0, 0x6f, 0x53, 0xf3, 0xc9, 0x89, 0xb4, 0x9c, 0x4e, 0xb4, 0xf2, 0xd3, 0xde, 0x7a, 0xd2, 0x19, 0x16, 0x38, 0x61, 0x5d, 0xd9, 0x88, 0x05, 0x9c, 0xf4, 0x0a, 0x0f, 0x5f, 0x73, 0x84, 0xe4, 0xa4, 0xc7, 0x0d, 0xa5, 0xf1, 0x59, 0xba, 0x5c, 0x08, 0x98, 0x6f, 0xc8, 0x20, 0xfa, 0x4e, 0x4e, 0xf6, 0x69, 0xe1, 0xa2, 0x89, 0xfd, 0x1f, 0x77, 0x2c, 0xe6, 0xce, 0xd6, 0x17, 0x9a, 0x69, 0xdb, 0xd3, 0x86, 0x18, 0xc1, 0x67, 0x77, 0x26, 0x80, 0x28, 0x1b, 0x93, 0x88, 0x41, 0x0f, 0x40, 0xb0, 0xfc, 0x87, 0xf3, 0x43, 0x98, 0xd7, 0x58, 0x96, 0xdb, 0x4d, 0x91, 0x88, 0xe5, 0x6c, 0x58, 0xdc, 0x5c, 0x2a, 0xf7, 0x2c, 0xb1, 0xfc, 0x20, 0x8f, 0x02, 0xd9, 0x65, 0x06, 0xbe, 0x26, 0x6f, 0xa2, 0x7f, 0xce, 0x3d, 0x69, 0x26, 0xdd, 0x13, 0x52, 0xbf, 0xbd, 0x92, 0x62, 0x59, 0x4c, 0x90, 0xac, 0x50, 0x45, 0x5e, 0xbb, 0x09, 0x03, 0x12, 0x29, 0x84, 0x00, 0xc4, 0xc9, 0x11, 0xff, 0x00, 0x42, 0xe7, 0xa7, 0x7a, 0xd4, 0xfd, 0x21, 0x79, 0xe9, 0x78, 0x71, 0x8b, 0x95, 0x39, 0x75, 0xaf, 0x4e, 0x98, 0x78, 0x42, 0x38, 0xdf, 0xff, 0xd1, 0xf0, 0xe6, 0xa0, 0x58, 0xc8, 0x84, 0x9a, 0xaa, 0x30, 0x55, 0xf9, 0x0a, 0x6f, 0x90, 0x0c, 0xca, 0x72, 0x48, 0xb8, 0x1e, 0x89, 0xa7, 0x23, 0x17, 0x24, 0xff, 0x00, 0x61, 0xb6, 0x54, 0x76, 0x6e, 0x1b, 0xa7, 0xbe, 0x50, 0xf2, 0xc1, 0xd7, 0x4c, 0x52, 0x5e, 0x33, 0x5b, 0xe9, 0x10, 0xf4, 0x54, 0x3c, 0x5e, 0x77, 0xee, 0x49, 0xec, 0x2b, 0xb6, 0x63, 0xe4, 0xc9, 0xc3, 0xef, 0x73, 0xf0, 0xe1, 0x32, 0x1b, 0xf2, 0x7a, 0x05, 0xce, 0xad, 0x65, 0xa1, 0x98, 0xb4, 0x0f, 0x2a, 0x5b, 0x23, 0xeb, 0x12, 0x00, 0x88, 0xb0, 0xa8, 0x66, 0x46, 0x3d, 0xea, 0x7b, 0xfb, 0x9e, 0x99, 0x89, 0xbc, 0x8d, 0x97, 0x3a, 0x34, 0x05, 0x32, 0x5d, 0x1f, 0xc9, 0x1a, 0x8c, 0x36, 0x8c, 0x6f, 0x66, 0xfa, 0xc6, 0xb7, 0x7d, 0xf0, 0x94, 0x04, 0xf0, 0x88, 0xc9, 0xd5, 0x9d, 0x8d, 0x4b, 0x11, 0xd4, 0x9f, 0xbb, 0x25, 0xc5, 0xdc, 0xa2, 0x03, 0x99, 0x4b, 0xbc, 0xf3, 0x0d, 0x97, 0x96, 0x74, 0xe5, 0xf2, 0xb6, 0x80, 0x95, 0xbd, 0x99, 0x15, 0xf5, 0x4b, 0xd2, 0x37, 0x58, 0x46, 0xd4, 0x27, 0xc5, 0xce, 0xc1, 0x7c, 0x30, 0x8e, 0x68, 0x94, 0x7b, 0x9e, 0x6d, 0xe6, 0x7b, 0x9b, 0x5d, 0x3a, 0xd8, 0xdb, 0x32, 0xfa, 0x77, 0x65, 0x15, 0xe4, 0x57, 0xa7, 0x21, 0x55, 0x04, 0x57, 0xef, 0xd8, 0x66, 0x56, 0x38, 0x19, 0x1b, 0xe8, 0xe0, 0x67, 0x98, 0xc7, 0x1a, 0x1c, 0xde, 0x71, 0x71, 0x79, 0x2c, 0xf2, 0xfa, 0x8c, 0x48, 0xec, 0xb5, 0x24, 0x9a, 0x0c, 0xce, 0x75, 0x29, 0xae, 0x8c, 0x67, 0xd4, 0xb5, 0x0b, 0x4b, 0x04, 0x05, 0xef, 0x2e, 0x66, 0x8e, 0x18, 0x08, 0x15, 0xdd, 0x8f, 0x11, 0xb0, 0xeb, 0x4c, 0x04, 0x5b, 0x21, 0x2a, 0x7d, 0x41, 0xe4, 0x4f, 0xcb, 0xcb, 0x5d, 0x12, 0x45, 0xb8, 0xb7, 0x53, 0x71, 0xaa, 0x9f, 0x86, 0x5b, 0xd6, 0x50, 0x4a, 0xed, 0xba, 0x46, 0x77, 0x00, 0x13, 0xd4, 0x8c, 0x85, 0xd3, 0x12, 0x6d, 0xeb, 0x1a, 0x67, 0x95, 0xd9, 0x39, 0x39, 0x50, 0xac, 0xff, 0x00, 0x6f, 0xc4, 0xff, 0x00, 0x1c, 0x81, 0x92, 0xb2, 0x6b, 0x6d, 0x02, 0xdd, 0xbd, 0x36, 0x92, 0x36, 0x2d, 0x1f, 0xc0, 0x2a, 0x0b, 0x28, 0x1b, 0x91, 0x41, 0xf4, 0x9c, 0xb6, 0x25, 0x81, 0x46, 0xfe, 0x81, 0xb5, 0xad, 0x3d, 0xba, 0x57, 0xb7, 0xf9, 0xf6, 0xc9, 0xb0, 0x7f, 0xff, 0xd2, 0xf0, 0xe2, 0x86, 0x95, 0xc4, 0x67, 0x7e, 0x3f, 0x11, 0xf7, 0xa8, 0x19, 0x06, 0x69, 0x8d, 0xca, 0xca, 0x24, 0x8f, 0xd3, 0x52, 0x24, 0x89, 0x47, 0x25, 0x1f, 0xcb, 0x20, 0xf8, 0xb2, 0xb2, 0x76, 0x6e, 0x88, 0x36, 0xf6, 0x6f, 0x2a, 0xc1, 0x6e, 0xfa, 0x45, 0xad, 0xbc, 0x3f, 0x0b, 0x46, 0x81, 0x4d, 0x46, 0xea, 0x7a, 0x9a, 0x83, 0x9a, 0xa9, 0xdd, 0xbb, 0xec, 0x7b, 0x06, 0x5b, 0xe5, 0xcf, 0x2e, 0x69, 0xfa, 0x5c, 0xcd, 0x7b, 0x14, 0x5e, 0xa5, 0xee, 0xf5, 0xb8, 0x7d, 0xdd, 0x99, 0xba, 0xef, 0x91, 0x16, 0x5b, 0x36, 0xb6, 0x65, 0x0d, 0xac, 0xb2, 0x5b, 0xed, 0x34, 0x81, 0x7a, 0xbb, 0x46, 0x40, 0x6a, 0x9e, 0xb4, 0x39, 0x31, 0x13, 0x49, 0xda, 0xd2, 0x9b, 0xed, 0x1e, 0xc4, 0x24, 0xb3, 0x35, 0xb2, 0x88, 0x60, 0x06, 0xe6, 0x56, 0x98, 0x96, 0x79, 0x1e, 0x31, 0x51, 0xc9, 0x8f, 0xcb, 0x00, 0xe6, 0xb3, 0xe4, 0xf9, 0x2b, 0xcc, 0x7a, 0x94, 0xda, 0x96, 0xa9, 0x71, 0x77, 0x70, 0x79, 0xcd, 0x33, 0x97, 0x76, 0x3f, 0xcc, 0xc6, 0xa6, 0x9f, 0x2e, 0x99, 0xb9, 0xc6, 0x2a, 0x21, 0xe6, 0x73, 0xca, 0xe6, 0x4a, 0x51, 0x1a, 0x99, 0x1c, 0x28, 0x04, 0x93, 0xd0, 0x0e, 0xa4, 0xe4, 0xda, 0x5f, 0x50, 0xfe, 0x4a, 0xfe, 0x48, 0xb5, 0xb2, 0xc1, 0xe6, 0x1f, 0x31, 0x7e, 0xef, 0x52, 0x91, 0x43, 0xc3, 0x6e, 0x77, 0xf4, 0x22, 0x6d, 0xbf, 0xe4, 0x63, 0x0e, 0xbf, 0xca, 0x36, 0xeb, 0x5c, 0x84, 0xa5, 0x48, 0x7d, 0x3b, 0x61, 0xa1, 0xdb, 0x5b, 0x2c, 0x71, 0xda, 0x45, 0xc4, 0x28, 0x00, 0x81, 0xdb, 0x31, 0xc9, 0xb4, 0xb2, 0x3b, 0x5d, 0x27, 0xa5, 0x05, 0x1b, 0xc7, 0xdb, 0x10, 0xa9, 0xbd, 0xa6, 0x93, 0x0c, 0x75, 0xe4, 0x39, 0x35, 0x41, 0x3d, 0xc5, 0x06, 0xdb, 0x8e, 0xfd, 0x46, 0x5b, 0x1d, 0x98, 0x95, 0x4f, 0x46, 0xdb, 0xd5, 0xfb, 0x29, 0x5e, 0x9d, 0x0d, 0x32, 0xeb, 0x61, 0x4f, 0xff, 0xd3, 0xf1, 0x46, 0x9a, 0x16, 0x1b, 0x91, 0x71, 0x28, 0xac, 0x4a, 0x14, 0x30, 0x3e, 0x19, 0x54, 0xb9, 0x36, 0xc7, 0x9b, 0x2d, 0xd1, 0x6c, 0x45, 0xe3, 0xdc, 0xde, 0xc8, 0x95, 0x5b, 0x87, 0xf8, 0x41, 0x1d, 0x10, 0x54, 0x01, 0x98, 0x79, 0x25, 0xd1, 0xda, 0xe9, 0xe1, 0xb5, 0x9e, 0xac, 0xeb, 0x42, 0xba, 0x8e, 0xdf, 0x8c, 0x31, 0x21, 0x70, 0xb4, 0x5d, 0xbe, 0xc5, 0x7c, 0x2b, 0xed, 0xe1, 0x94, 0x18, 0xb9, 0x51, 0x3d, 0x03, 0x2c, 0x13, 0x6b, 0xf1, 0x42, 0x6e, 0xe2, 0xb7, 0x12, 0xa0, 0xdd, 0x50, 0x9f, 0x4f, 0x6f, 0xa7, 0x6f, 0xc7, 0x03, 0x61, 0xa0, 0x83, 0xb5, 0xf3, 0x97, 0x98, 0x20, 0x9c, 0x44, 0xea, 0xd0, 0xad, 0x48, 0x64, 0x90, 0x21, 0xd8, 0x9f, 0xa7, 0xa6, 0x44, 0xca, 0x99, 0xc6, 0x36, 0xcb, 0x74, 0x5d, 0x7e, 0x5b, 0xfe, 0x31, 0x6a, 0x31, 0xf3, 0x8c, 0xd0, 0xad, 0x40, 0xa3, 0x1f, 0x7c, 0x44, 0xd6, 0x51, 0xd9, 0xe0, 0x5f, 0x9a, 0x7e, 0x41, 0x9f, 0x40, 0xf3, 0x14, 0xba, 0x85, 0xba, 0x34, 0xba, 0x2d, 0xfb, 0x34, 0xd0, 0xcf, 0x4f, 0xb0, 0xce, 0x6a, 0x51, 0xe9, 0xb0, 0x20, 0xf4, 0xf1, 0x19, 0xb2, 0xc3, 0x90, 0x11, 0x4e, 0x97, 0x55, 0x80, 0x83, 0xc4, 0x17, 0x7e, 0x4c, 0x79, 0x19, 0xfc, 0xd1, 0xe7, 0x78, 0x4b, 0x91, 0x1d, 0xae, 0x92, 0xa6, 0xf6, 0x46, 0x75, 0xe4, 0xad, 0x22, 0x1f, 0xdd, 0xa1, 0x07, 0xb3, 0x1e, 0xfe, 0xd9, 0x92, 0xeb, 0x4b, 0xed, 0xfd, 0x0a, 0xc2, 0x63, 0x27, 0xa4, 0x88, 0x17, 0x60, 0x49, 0x35, 0xdc, 0x8e, 0xa5, 0x7d, 0xab, 0xd3, 0x28, 0x90, 0x50, 0xcd, 0xed, 0x2d, 0xda, 0x15, 0x55, 0x51, 0xf1, 0x1a, 0x0a, 0xf7, 0x39, 0x5d, 0xaa, 0x77, 0x6f, 0x01, 0x8e, 0xa7, 0x7d, 0xfa, 0xff, 0x00, 0x66, 0x10, 0xa8, 0xb8, 0x63, 0x76, 0x90, 0xa8, 0x20, 0x06, 0x56, 0xdb, 0x61, 0xda, 0xbd, 0x4f, 0xcb, 0x24, 0x15, 0x0f, 0xf5, 0x66, 0xe5, 0x5f, 0x4c, 0x53, 0xc3, 0xb7, 0xce, 0x99, 0x6b, 0x17, 0xff, 0xd4, 0xf0, 0xec, 0x57, 0x6f, 0x32, 0xa5, 0xa4, 0x43, 0x76, 0x75, 0xa9, 0xf1, 0x03, 0xfa, 0x64, 0x08, 0x6c, 0x8e, 0xfb, 0x3d, 0x7f, 0xcb, 0x16, 0x2b, 0x3d, 0xbc, 0x16, 0xa3, 0x66, 0x6d, 0x98, 0xfb, 0x1e, 0xb9, 0xac, 0xc8, 0x77, 0xb7, 0x7d, 0x01, 0xb3, 0x37, 0xb8, 0xd3, 0x46, 0x95, 0x68, 0x86, 0xd2, 0x2e, 0x4e, 0xab, 0xf0, 0x23, 0x11, 0x4e, 0x5f, 0xcd, 0x98, 0xe7, 0x25, 0x96, 0x71, 0x83, 0x0f, 0xd6, 0x3c, 0xb9, 0xe7, 0x0d, 0x7c, 0x41, 0x22, 0x5e, 0xb3, 0x20, 0x0c, 0x65, 0x80, 0xc8, 0x63, 0x8e, 0xbb, 0x95, 0xa5, 0x07, 0xeb, 0xcc, 0xac, 0x73, 0x83, 0x4e, 0x5c, 0x59, 0x09, 0xd8, 0xec, 0xc8, 0x57, 0x41, 0xd3, 0x4e, 0x95, 0xa5, 0x5b, 0x4b, 0x6a, 0xcb, 0xab, 0x43, 0x10, 0x4b, 0xeb, 0x85, 0xa2, 0x2c, 0x8e, 0x3f, 0x68, 0x54, 0xf5, 0x00, 0xd3, 0x97, 0x7a, 0x65, 0x79, 0xa6, 0x24, 0x76, 0x6f, 0xd3, 0x62, 0x96, 0x30, 0x78, 0xcb, 0x21, 0xf2, 0xf4, 0x22, 0xce, 0x54, 0x8e, 0x46, 0x26, 0x10, 0x7e, 0x0a, 0xf5, 0xd8, 0xf5, 0x1f, 0x31, 0x98, 0x83, 0x73, 0xb3, 0x91, 0xcd, 0x67, 0xe6, 0x7d, 0xe8, 0x16, 0x69, 0x6f, 0x10, 0x1f, 0x54, 0x9a, 0x37, 0xf5, 0x41, 0x5e, 0x7f, 0x0a, 0x29, 0x62, 0x02, 0xf8, 0x9c, 0xc8, 0x8c, 0x77, 0x6a, 0x99, 0xa0, 0x89, 0xff, 0x00, 0x9c, 0x74, 0xd2, 0xed, 0xed, 0xfc, 0xbb, 0x7b, 0xaa, 0x9a, 0x7d, 0x62, 0xfe, 0x46, 0x2d, 0xfe, 0x4c, 0x51, 0x31, 0x11, 0xa9, 0xf6, 0xef, 0x9b, 0x30, 0x5e, 0x7b, 0x38, 0xdd, 0xf4, 0x7f, 0x95, 0x94, 0xbc, 0x12, 0x43, 0x30, 0x6a, 0xb2, 0xf3, 0x86, 0x40, 0x3e, 0xcb, 0xd7, 0x6a, 0xd7, 0xb1, 0xe9, 0x8f, 0x37, 0x19, 0x97, 0x41, 0x2c, 0x71, 0x20, 0xf5, 0x36, 0x9c, 0x55, 0x78, 0x1d, 0x8a, 0x91, 0xd7, 0x11, 0x14, 0x5a, 0x3e, 0x19, 0x03, 0x10, 0x6b, 0xca, 0xbd, 0x86, 0xf8, 0x9d, 0x95, 0x18, 0x36, 0x65, 0x2e, 0xbc, 0x54, 0x1f, 0xa2, 0x99, 0x00, 0x59, 0x2a, 0x6f, 0x5e, 0x55, 0x15, 0xe9, 0x5f, 0xc3, 0x2f, 0xb6, 0x14, 0xff, 0x00, 0xff, 0xd5, 0xf1, 0x95, 0xfe, 0x80, 0x74, 0x0d, 0x7c, 0xd9, 0x89, 0x3d, 0x78, 0x57, 0x8b, 0xc5, 0x28, 0xe8, 0x55, 0xf7, 0x1f, 0x48, 0xca, 0x38, 0xb8, 0x83, 0x9f, 0x93, 0x07, 0x85, 0x3a, 0x7a, 0x6f, 0x95, 0x66, 0x2b, 0x2c, 0x4c, 0x0d, 0x14, 0x00, 0x3e, 0x9c, 0xc3, 0x98, 0x76, 0xb8, 0x45, 0xbd, 0x02, 0xde, 0x48, 0xee, 0xdc, 0xa0, 0x15, 0xe2, 0x2b, 0xc8, 0x8a, 0x8a, 0xfd, 0x3b, 0x66, 0x3f, 0x00, 0x73, 0x84, 0x2d, 0x36, 0xb5, 0xb5, 0x9e, 0x35, 0x1c, 0x29, 0xc4, 0xfe, 0xc8, 0x04, 0x7f, 0xc4, 0x69, 0x91, 0xe1, 0x67, 0x2c, 0x4a, 0xd2, 0xe9, 0x4e, 0xe3, 0xd4, 0xf4, 0x81, 0x5a, 0x12, 0xc5, 0x41, 0x3f, 0x79, 0x38, 0x9b, 0x60, 0x20, 0x07, 0x34, 0xb0, 0xc9, 0x03, 0x5c, 0x23, 0x03, 0x53, 0x13, 0x56, 0x88, 0xdf, 0x09, 0xda, 0x9b, 0xd3, 0xb6, 0x52, 0x0e, 0xec, 0xe4, 0x29, 0x24, 0xfc, 0xd0, 0xe7, 0x75, 0xe5, 0x57, 0x6b, 0x61, 0xfb, 0xf0, 0xca, 0xaa, 0x57, 0xa8, 0xe6, 0x78, 0x1a, 0x7d, 0xf9, 0x95, 0x8a, 0x5e, 0xa0, 0xe3, 0x67, 0x8f, 0xa0, 0xbd, 0x5b, 0xf2, 0xdf, 0x4a, 0x82, 0xcb, 0x4a, 0xb3, 0xb0, 0xb4, 0x41, 0x0a, 0x70, 0x48, 0xd9, 0x57, 0x60, 0x51, 0x3a, 0x8f, 0xbc, 0xe6, 0x7b, 0xcb, 0xe4, 0x3b, 0xa7, 0x3f, 0x9b, 0x9f, 0x9a, 0xba, 0x77, 0xe5, 0x5f, 0x95, 0x9c, 0x59, 0x94, 0x9f, 0xcd, 0x37, 0x8c, 0xa9, 0xa6, 0xd9, 0x39, 0xaa, 0xd0, 0x7d, 0xa9, 0x1c, 0x03, 0x5e, 0x09, 0xff, 0x00, 0x0c, 0x76, 0xcb, 0x62, 0x2d, 0xa5, 0xf2, 0x85, 0xbf, 0xe7, 0x87, 0xe6, 0xa3, 0x5e, 0x4d, 0xa8, 0xc9, 0xe6, 0x8b, 0xd5, 0x69, 0x5c, 0xb0, 0x4a, 0xab, 0xc4, 0xb5, 0x35, 0x0a, 0xaa, 0xea, 0x40, 0x03, 0xa0, 0xf6, 0xcb, 0x40, 0x4d, 0x3e, 0xdb, 0xff, 0x00, 0x9c, 0x7f, 0xfc, 0xce, 0x4f, 0xcc, 0xbf, 0x26, 0x25, 0xe5, 0xd3, 0x2f, 0xe9, 0xdd, 0x3d, 0xfe, 0xab, 0xa9, 0xaa, 0xd2, 0xa6, 0x40, 0x2a, 0xb2, 0x71, 0x00, 0x01, 0xea, 0x0d, 0xe8, 0x3a, 0x64, 0x25, 0x16, 0x1c, 0x8b, 0xd9, 0x51, 0x39, 0x28, 0x12, 0x51, 0x41, 0xfd, 0xa3, 0xd2, 0xb9, 0x4f, 0x0d, 0x33, 0xb5, 0xf4, 0x87, 0x9d, 0x79, 0x0e, 0xb4, 0xaf, 0x6a, 0xf8, 0xf1, 0xf0, 0xc9, 0xda, 0xbf, 0xff, 0xd6, 0xf2, 0xc6, 0xb5, 0x68, 0x64, 0xd0, 0x6d, 0x35, 0x20, 0x39, 0xcd, 0x13, 0x0f, 0x5e, 0x61, 0xfc, 0x8f, 0x40, 0x8b, 0x5e, 0xe0, 0x66, 0x1c, 0x4f, 0xaa, 0x9d, 0xe6, 0xa6, 0x1e, 0x91, 0x2e, 0xa9, 0x87, 0x95, 0xee, 0x9c, 0xc5, 0x55, 0x34, 0x60, 0x40, 0xae, 0x57, 0x30, 0xd9, 0xa7, 0x95, 0xbd, 0x6f, 0xcb, 0x26, 0x39, 0x40, 0x0d, 0x4e, 0xc0, 0x9f, 0x9e, 0x50, 0x5d, 0xac, 0x79, 0x33, 0x8b, 0xbb, 0x9b, 0x3b, 0x6b, 0x35, 0x48, 0x54, 0x09, 0x29, 0x56, 0x7f, 0xe1, 0x86, 0x72, 0x00, 0x2c, 0x6e, 0xf7, 0x63, 0x3e, 0x63, 0xbd, 0xbd, 0x5d, 0x20, 0x2a, 0xb3, 0xa4, 0x33, 0x48, 0xab, 0x21, 0x43, 0xf1, 0x2c, 0x47, 0xed, 0x1d, 0xbc, 0x73, 0x18, 0x9b, 0x64, 0x28, 0x96, 0x3a, 0xc7, 0x49, 0xb0, 0xf4, 0xcc, 0xe9, 0x73, 0x6c, 0xb4, 0xf8, 0x67, 0x92, 0x32, 0x21, 0x70, 0x7b, 0x89, 0x05, 0x57, 0xef, 0x38, 0x28, 0x94, 0x4a, 0x7d, 0x13, 0x7d, 0x6a, 0xd3, 0x4c, 0xb8, 0xf2, 0xc3, 0xc8, 0x2e, 0x03, 0xf3, 0xe2, 0x7d, 0x33, 0xb7, 0xc5, 0xcc, 0x71, 0x03, 0xc6, 0xb9, 0x64, 0x06, 0xe2, 0x9a, 0xf2, 0x4f, 0xd2, 0x6d, 0xe9, 0xfe, 0x41, 0x45, 0x5b, 0x18, 0x66, 0xa5, 0x64, 0x09, 0xf4, 0xd5, 0xb7, 0xcd, 0x93, 0xc7, 0xcf, 0x9b, 0xe5, 0x6f, 0xf9, 0xc8, 0x0d, 0x56, 0xeb, 0x59, 0xfc, 0xce, 0xd5, 0x12, 0x61, 0xc4, 0x69, 0xe9, 0x0d, 0xa4, 0x4b, 0xfe, 0x48, 0x40, 0xd5, 0x3e, 0xe4, 0xb6, 0x64, 0x8e, 0x4c, 0x02, 0x61, 0x65, 0xa0, 0x14, 0xb4, 0xb6, 0xb0, 0xb1, 0xb6, 0xb2, 0x97, 0xcb, 0xf1, 0x5a, 0x2d, 0xc6, 0xa5, 0xac, 0xb4, 0x70, 0x5d, 0xc7, 0x3d, 0xc1, 0x51, 0x24, 0x91, 0xc9, 0x31, 0x75, 0x6b, 0x70, 0x9f, 0x14, 0x68, 0x01, 0x46, 0xe4, 0xb5, 0xa3, 0x17, 0xcb, 0x40, 0x61, 0x6f, 0x47, 0xff, 0x00, 0x9c, 0x3a, 0x8f, 0x5b, 0x4f, 0x3c, 0x6b, 0xb7, 0xfa, 0x30, 0x91, 0x3c, 0xa4, 0xb1, 0x95, 0xb9, 0x82, 0x42, 0x0a, 0xbc, 0x8e, 0xe4, 0xdb, 0xa9, 0xef, 0xc9, 0x17, 0x91, 0x24, 0x7c, 0xb2, 0x05, 0x64, 0xfb, 0x75, 0x64, 0x32, 0x39, 0x69, 0x5b, 0x9c, 0xad, 0xb9, 0xdb, 0xa7, 0xb5, 0x3b, 0x53, 0x2a, 0x21, 0x41, 0x44, 0xf3, 0x8b, 0x8f, 0x2e, 0x43, 0x9d, 0x2b, 0xd4, 0x57, 0x23, 0x41, 0x36, 0xff, 0x00, 0xff, 0xd7, 0xf0, 0xc0, 0xd5, 0xb5, 0x11, 0x64, 0xb6, 0x3f, 0x59, 0x90, 0xd9, 0xab, 0x06, 0xf4, 0x79, 0x7c, 0x3b, 0x74, 0xc8, 0x08, 0x8b, 0xb6, 0xe3, 0x96, 0x55, 0x57, 0xb3, 0x3e, 0xf2, 0x35, 0xc7, 0xd6, 0x0b, 0x45, 0x5d, 0xdc, 0x8a, 0x7d, 0xd9, 0x8d, 0x94, 0x3b, 0x3d, 0x1c, 0x9e, 0xc3, 0xe5, 0xc3, 0x2c, 0x7c, 0xc5, 0x0f, 0xee, 0xdb, 0x8b, 0x0c, 0xc4, 0x26, 0x9d, 0xa0, 0x9a, 0x7d, 0x2c, 0xe5, 0xe4, 0x55, 0x7f, 0xee, 0xc1, 0x15, 0x04, 0xd0, 0x12, 0x3c, 0x72, 0x89, 0x1b, 0x2c, 0xcc, 0xa8, 0x2a, 0x8b, 0x87, 0xbb, 0x63, 0x1a, 0x28, 0x65, 0xf0, 0xed, 0xf2, 0xc3, 0xc2, 0x0a, 0x06, 0x4a, 0x46, 0xc7, 0xa5, 0xa3, 0x59, 0xc8, 0xb2, 0xc7, 0x45, 0x22, 0x9c, 0x14, 0x54, 0x10, 0x46, 0xf5, 0x1d, 0x32, 0x5c, 0x14, 0x14, 0xe4, 0x32, 0x2f, 0x3a, 0xf3, 0xb6, 0x90, 0x9a, 0x6d, 0xae, 0x9f, 0x3d, 0xab, 0xb8, 0x8a, 0x3b, 0xf8, 0x39, 0x44, 0x58, 0xf0, 0x08, 0xd5, 0x14, 0xa5, 0x7b, 0x65, 0x98, 0x8e, 0xfb, 0xb5, 0x67, 0x87, 0xa5, 0xef, 0x5e, 0x44, 0x96, 0x35, 0xb5, 0xb6, 0x59, 0x36, 0xfd, 0xd8, 0xa0, 0xf1, 0x20, 0x53, 0x33, 0xc0, 0x79, 0x59, 0x73, 0x7c, 0xd7, 0xf9, 0xfb, 0xa2, 0xcd, 0x67, 0xf9, 0xa7, 0x7b, 0x72, 0xf1, 0x71, 0x83, 0x53, 0x86, 0x0b, 0x98, 0x24, 0x22, 0x8a, 0xcc, 0x88, 0x23, 0x7f, 0xb8, 0xae, 0xf9, 0x7c, 0x50, 0x1e, 0x5f, 0x7c, 0x48, 0x21, 0x44, 0x6b, 0xce, 0x9b, 0xb0, 0x1b, 0x9e, 0xf5, 0xaf, 0x8e, 0x4d, 0x5f, 0x7a, 0x7f, 0xce, 0x34, 0xf9, 0x5d, 0x3c, 0xa3, 0xf9, 0x69, 0x63, 0xa9, 0x3c, 0x27, 0xeb, 0xda, 0xe1, 0x37, 0xd7, 0x2e, 0xaa, 0xdb, 0x06, 0xda, 0x30, 0x49, 0xfe, 0x54, 0x03, 0x03, 0x49, 0xdc, 0xb3, 0xaf, 0x38, 0xfe, 0x6a, 0xf9, 0x47, 0xc9, 0x3a, 0x74, 0x97, 0xfa, 0xf6, 0xaf, 0x15, 0x85, 0xb8, 0x75, 0x89, 0xb8, 0x87, 0x9a, 0x72, 0xee, 0x2a, 0x14, 0x24, 0x60, 0xb1, 0xa8, 0xdf, 0x07, 0x0b, 0x2d, 0xcb, 0xcf, 0x7f, 0xe8, 0x6a, 0xff, 0x00, 0x26, 0xbd, 0x6a, 0x7f, 0x89, 0x2f, 0xf8, 0x52, 0x9e, 0xb7, 0xe8, 0xb9, 0xb8, 0x57, 0xc2, 0x95, 0xe9, 0x8f, 0x08, 0x5a, 0x2f, 0xff, 0xd0, 0xf0, 0x4d, 0x40, 0xaa, 0xd7, 0x00, 0x64, 0xcb, 0x3c, 0x97, 0xa8, 0xb5, 0x9e, 0xa3, 0x1a, 0xd6, 0x84, 0x95, 0x3f, 0x45, 0x72, 0x9c, 0xa2, 0xc3, 0x99, 0xa5, 0x9d, 0x49, 0xf4, 0x17, 0x97, 0xaf, 0x63, 0x17, 0x52, 0x6f, 0xf0, 0xc8, 0x43, 0x6f, 0x9a, 0xe9, 0x07, 0x70, 0x0e, 0xec, 0x83, 0x51, 0x44, 0xb8, 0x61, 0x1a, 0x9e, 0x11, 0xd3, 0x91, 0x60, 0x68, 0x6b, 0xd3, 0x31, 0x4f, 0x36, 0xd3, 0x4c, 0x52, 0xef, 0x4c, 0xd5, 0x0c, 0xc4, 0x69, 0xda, 0x94, 0xc8, 0x3a, 0xf0, 0x66, 0x07, 0x73, 0xe0, 0x40, 0xfd, 0x79, 0x93, 0x12, 0x1c, 0x9c, 0x32, 0xc7, 0xfc, 0x41, 0x33, 0xd2, 0xb4, 0x6f, 0x38, 0x98, 0x65, 0x76, 0xbf, 0x69, 0x42, 0xd0, 0xaa, 0xc9, 0xde, 0x95, 0xad, 0x28, 0x46, 0x4e, 0xac, 0x39, 0x77, 0x80, 0x11, 0xbf, 0xd8, 0xc7, 0x7c, 0xe1, 0xa5, 0xf9, 0x92, 0x4d, 0x32, 0x5b, 0x8b, 0x93, 0x27, 0xa7, 0x68, 0x56, 0xe2, 0x45, 0xda, 0x85, 0x61, 0x6e, 0x67, 0xad, 0x6b, 0xb0, 0x38, 0xc2, 0x81, 0xe4, 0xc7, 0x52, 0x31, 0x1c, 0x67, 0x86, 0x5b, 0xbd, 0x37, 0xca, 0x7a, 0x94, 0xb1, 0x69, 0xb6, 0x2e, 0xb7, 0x15, 0x48, 0xc2, 0xb4, 0x52, 0x53, 0xac, 0x32, 0xaf, 0xb1, 0xed, 0x9b, 0x10, 0x36, 0x78, 0x5c, 0x9f, 0x51, 0x64, 0x1f, 0x98, 0x3e, 0x58, 0xb6, 0xfc, 0xc8, 0xf2, 0xe5, 0xbc, 0x68, 0x52, 0x2d, 0x5a, 0xd1, 0x84, 0xb6, 0xf3, 0x95, 0x0e, 0xc0, 0x85, 0xe2, 0xcb, 0xd8, 0xd1, 0xbb, 0xe4, 0xc1, 0xa6, 0x97, 0xce, 0x17, 0x5f, 0x95, 0xde, 0x6d, 0xb6, 0xbe, 0xb7, 0x69, 0x34, 0xf3, 0x3c, 0x72, 0xcf, 0xe8, 0xa3, 0x45, 0x49, 0x95, 0x4a, 0x90, 0x3e, 0x35, 0x5a, 0x95, 0x1d, 0xfe, 0x21, 0x93, 0x4d, 0xbe, 0xd2, 0xd2, 0xf5, 0x8b, 0xbd, 0x32, 0x2d, 0x3f, 0x4c, 0x9a, 0xe4, 0xca, 0x9e, 0x90, 0x85, 0x65, 0x55, 0x08, 0x85, 0x91, 0x01, 0x3b, 0x0a, 0x05, 0xe9, 0xb0, 0xc0, 0x5a, 0xc3, 0xcd, 0x3f, 0x3b, 0x7f, 0x26, 0xec, 0xff, 0x00, 0x35, 0x6d, 0x6d, 0xb5, 0x3d, 0x16, 0xfe, 0x0d, 0x3b, 0xcd, 0x96, 0x01, 0x92, 0x46, 0x9e, 0xa2, 0x0b, 0xc8, 0xb7, 0x28, 0x92, 0x71, 0xfb, 0x2e, 0xa7, 0xec, 0x3d, 0x0f, 0xc2, 0x68, 0x71, 0x05, 0x95, 0xd3, 0xe7, 0x9f, 0xfa, 0x16, 0x2f, 0xcd, 0x7f, 0x43, 0xd6, 0xfa, 0xa5, 0x97, 0xab, 0xeb, 0x7a, 0x5f, 0x55, 0xfa, 0xec, 0x5e, 0xaf, 0x0f, 0xf7, 0xed, 0x2b, 0x4e, 0x15, 0xff, 0x00, 0x65, 0xdf, 0x8e, 0x14, 0xf1, 0xbf, 0xff, 0xd1, 0xf0, 0x5a, 0xa7, 0x18, 0x5e, 0x56, 0x1f, 0x68, 0x71, 0x5f, 0xa7, 0xbe, 0x2a, 0x98, 0xdb, 0xfa, 0x90, 0x24, 0x37, 0xb0, 0xfd, 0xb8, 0xa8, 0x58, 0x78, 0xae, 0x43, 0xc9, 0xb4, 0x6d, 0xbb, 0xda, 0x3c, 0xa1, 0xad, 0x43, 0xa8, 0xda, 0xc5, 0x2a, 0x3d, 0x26, 0x5a, 0x02, 0x2b, 0xbe, 0x60, 0x64, 0x8d, 0x17, 0x6f, 0x8b, 0x20, 0x90, 0x7a, 0x3c, 0x32, 0x8b, 0xa8, 0x02, 0xf3, 0xfd, 0xe0, 0x1b, 0x11, 0x98, 0x66, 0x3b, 0xb9, 0x62, 0x54, 0x83, 0x36, 0xf2, 0xa4, 0xe4, 0x29, 0x34, 0xeb, 0xc8, 0x74, 0xae, 0x0d, 0xc3, 0x65, 0x82, 0x13, 0x6b, 0x57, 0xba, 0x54, 0xe4, 0x8c, 0x41, 0x1b, 0x75, 0xa7, 0xe0, 0x72, 0x5c, 0x4c, 0x84, 0x50, 0x5a, 0xb3, 0xdd, 0xdd, 0xc3, 0x24, 0x33, 0xb1, 0x60, 0xe0, 0x86, 0x52, 0x45, 0x38, 0xd2, 0x87, 0x24, 0x26, 0x6d, 0x8c, 0xe1, 0x41, 0x25, 0xfc, 0xa3, 0xd7, 0x2f, 0x6f, 0x3c, 0xbf, 0x73, 0xa5, 0xb2, 0x2c, 0xd1, 0x69, 0x17, 0x2f, 0x6b, 0x14, 0x8c, 0x0f, 0x21, 0x0d, 0x79, 0x46, 0x09, 0x15, 0xed, 0xb7, 0x4e, 0xd9, 0xb9, 0x8b, 0xcb, 0xe4, 0xa2, 0x5e, 0xa3, 0xa6, 0xdf, 0x6a, 0x36, 0xe4, 0xcd, 0x69, 0x1c, 0x4e, 0x84, 0x7c, 0x76, 0xab, 0x21, 0x67, 0xa8, 0xa7, 0xd9, 0xf8, 0x4d, 0x2b, 0xf3, 0xc3, 0x4d, 0x49, 0x57, 0x98, 0x75, 0x6f, 0x31, 0xda, 0xf9, 0xa3, 0x4b, 0xfd, 0x1f, 0x69, 0x1d, 0xae, 0xa1, 0xa9, 0x7e, 0xee, 0xe6, 0xd2, 0x79, 0x18, 0xf3, 0xb5, 0x1f, 0xee, 0xd9, 0x0a, 0x01, 0x4e, 0x3f, 0xb3, 0x4d, 0xf2, 0x9c, 0xb9, 0x04, 0x05, 0xb7, 0xe2, 0x87, 0x1e, 0xdd, 0x19, 0x3e, 0xaf, 0x6b, 0xae, 0xcb, 0x6d, 0x13, 0x0d, 0x45, 0xa2, 0x8e, 0x06, 0xe5, 0x13, 0x2a, 0x02, 0x01, 0x5e, 0x82, 0xb5, 0x04, 0xe6, 0x11, 0xd4, 0xcd, 0xda, 0x43, 0x49, 0x8e, 0xb7, 0xdc, 0xb1, 0x51, 0xe6, 0x4d, 0x76, 0xd2, 0x61, 0x15, 0xaa, 0x4b, 0xa8, 0xc9, 0x6e, 0x49, 0x79, 0x20, 0xe6, 0x8c, 0x49, 0xad, 0x43, 0x16, 0xe4, 0xa7, 0xaf, 0x43, 0xd3, 0x26, 0x35, 0x75, 0xcd, 0xa8, 0xe8, 0x87, 0x46, 0xbf, 0xc7, 0x9a, 0xff, 0x00, 0xd6, 0xbf, 0x48, 0xfe, 0x88, 0xfd, 0xe7, 0x0f, 0xab, 0xfa, 0x3f, 0x58, 0x7f, 0x5f, 0x8d, 0x3f, 0x9f, 0xa7, 0x5e, 0xd4, 0xc3, 0xf9, 0xd1, 0x7c, 0xb6, 0x47, 0xe4, 0x3a, 0x5b, 0xff, 0xd2, 0xf0, 0xb7, 0xa6, 0x1e, 0xdf, 0xd3, 0xf6, 0xa5, 0x71, 0x54, 0xdb, 0x4b, 0x80, 0x3c, 0x42, 0x26, 0xee, 0x29, 0xbe, 0x51, 0x23, 0x4e, 0x44, 0x05, 0x84, 0x45, 0xa5, 0xd5, 0xf7, 0x97, 0x2e, 0xfd, 0x6b, 0x6a, 0x98, 0x09, 0xab, 0xc7, 0xfc, 0x46, 0x3b, 0x4c, 0x26, 0x32, 0x30, 0x3e, 0x4f, 0x49, 0xd0, 0xfc, 0xfb, 0x05, 0xd4, 0x4a, 0x7d, 0x40, 0xac, 0x3a, 0x8e, 0x84, 0x1c, 0xc5, 0x96, 0x2a, 0x73, 0xe1, 0x9c, 0x16, 0x6d, 0xa5, 0x79, 0x86, 0xd6, 0xec, 0x80, 0x5a, 0xa0, 0xf5, 0xca, 0xcc, 0x5c, 0xa1, 0x2b, 0x1b, 0x26, 0x30, 0x6a, 0x31, 0x46, 0xcf, 0x1c, 0x87, 0x94, 0x64, 0x9e, 0x3d, 0xb6, 0xf0, 0xca, 0xa8, 0x39, 0x51, 0x99, 0x42, 0x6b, 0x1a, 0xc5, 0xa5, 0xa5, 0x94, 0xf7, 0x92, 0xc8, 0xaa, 0xb1, 0x23, 0x30, 0x04, 0xf8, 0x0e, 0x9f, 0x4e, 0x4a, 0x11, 0xb2, 0xd5, 0x9b, 0x25, 0x06, 0x1b, 0xff, 0x00, 0x38, 0xfd, 0xad, 0xdf, 0xda, 0xf9, 0xa2, 0xfe, 0xc5, 0x42, 0xbe, 0x9b, 0x7f, 0x0b, 0xdd, 0xdd, 0x07, 0xaf, 0x14, 0x68, 0xd8, 0x71, 0x6d, 0xbb, 0x90, 0xfc, 0x73, 0x6e, 0xf2, 0xf2, 0xdd, 0xf4, 0xad, 0xa6, 0xab, 0x6d, 0x69, 0x14, 0xfa, 0xee, 0xa0, 0xe2, 0x0b, 0x0d, 0x39, 0x19, 0xfe, 0x11, 0xc5, 0x1a, 0x4a, 0x1d, 0x8f, 0x73, 0x4f, 0xf8, 0x96, 0x0b, 0x40, 0x8d, 0xec, 0xf3, 0x6d, 0x3f, 0x52, 0xba, 0xd6, 0x35, 0x8b, 0xbf, 0x36, 0x6a, 0x5f, 0x0d, 0xc5, 0xdc, 0xa8, 0xb6, 0xa8, 0x7a, 0xc5, 0x6c, 0x9b, 0x22, 0x0f, 0xa3, 0x73, 0x9a, 0xbc, 0xb3, 0xe2, 0x36, 0xed, 0xb1, 0x43, 0x80, 0x53, 0xd0, 0xa7, 0xd4, 0x44, 0xfa, 0x7a, 0xda, 0x83, 0xbd, 0x3e, 0x2f, 0xa7, 0x2b, 0xad, 0x9b, 0xb8, 0x8d, 0xa8, 0xe8, 0x91, 0xdb, 0xfa, 0x2d, 0x6f, 0xc3, 0x8a, 0x2d, 0x56, 0xa3, 0xad, 0x4f, 0x5c, 0xa4, 0x0d, 0xdc, 0xa3, 0xca, 0xd0, 0xbf, 0xa1, 0xe3, 0xfa, 0xe7, 0x0f, 0xf2, 0xb9, 0x57, 0xbf, 0x1a, 0xe4, 0xb8, 0x57, 0xc5, 0xdd, 0xff, 0xd3, 0xf0, 0xcc, 0x5d, 0x7b, 0x70, 0xc5, 0x53, 0x6d, 0x2f, 0xd5, 0xe4, 0x69, 0xfd, 0xdf, 0xec, 0xd7, 0xad, 0x7d, 0xb2, 0x8c, 0x8d, 0xd8, 0xed, 0x91, 0x9f, 0x43, 0xea, 0xe7, 0xeb, 0x94, 0xad, 0x3e, 0x1e, 0x95, 0xfc, 0x72, 0x81, 0x7d, 0x1c, 0x9d, 0xba, 0xb1, 0x7b, 0xdf, 0xa9, 0x7a, 0xdf, 0xee, 0x2f, 0xd4, 0xfa, 0xe7, 0xed, 0x7a, 0x7f, 0xdd, 0xff, 0x00, 0xb2, 0xae, 0x64, 0x0b, 0xea, 0xe3, 0x9a, 0xbf, 0x4a, 0x6f, 0xa4, 0xff, 0x00, 0x89, 0xbd, 0x45, 0xfa, 0xb5, 0x79, 0xf7, 0xeb, 0xc7, 0xe9, 0xae, 0x57, 0x2e, 0x17, 0x23, 0x1f, 0x89, 0xd1, 0x99, 0x8f, 0xf1, 0xa7, 0x11, 0xcf, 0xd3, 0xf5, 0x29, 0xb5, 0x6b, 0xd3, 0xe8, 0xcc, 0x7f, 0x45, 0xb9, 0xa3, 0xc5, 0x62, 0xbe, 0x68, 0xff, 0x00, 0x15, 0xfd, 0x4c, 0xfe, 0x90, 0xaf, 0xd4, 0xab, 0xf1, 0x7a, 0x7f, 0x62, 0x9d, 0xab, 0xdf, 0x32, 0xb1, 0x70, 0x5e, 0xdc, 0xdc, 0x2d, 0x47, 0x8b, 0x5e, 0xae, 0x4c, 0xbf, 0xf2, 0x37, 0x9f, 0x3d, 0x5b, 0xd2, 0xff, 0x00, 0x8e, 0x87, 0xee, 0x29, 0x5a, 0xf2, 0xf4, 0xaa, 0xd4, 0xa5, 0x36, 0xa7, 0x3a, 0x57, 0xfd, 0x8e, 0x64, 0x3a, 0xf2, 0xf6, 0xbf, 0xcc, 0x7f, 0x5b, 0xfc, 0x23, 0xa7, 0xfe, 0x8e, 0xff, 0x00, 0x8e, 0x37, 0xd6, 0x63, 0xfa, 0xe5, 0x2b, 0xcb, 0x87, 0xec, 0xd6, 0xbd, 0xb9, 0x7d, 0xac, 0xc7, 0xcd, 0x7c, 0x2d, 0xf8, 0x2b, 0x89, 0x26, 0x8f, 0xd4, 0xfa, 0x94, 0x3e, 0x85, 0x29, 0xc9, 0x69, 0xfc, 0x33, 0x58, 0x5d, 0x9c, 0x79, 0xb2, 0xbb, 0x0f, 0xac, 0x7a, 0x2b, 0xea, 0x75, 0xef, 0x92, 0x0c, 0x53, 0x3d, 0x2f, 0xd4, 0xfa, 0xbb, 0xfa, 0x74, 0xf5, 0x39, 0x9a, 0xd7, 0xe7, 0x80, 0x53, 0x79, 0xba, 0x5b, 0xfe, 0x97, 0xfa, 0x4b, 0xfc, 0xba, 0x7f, 0xb1, 0xc7, 0xab, 0x1e, 0x8f, 0xff, 0xd9 }; -#endif // WEBRTC_RTC_BASE_TESTBASE64_H_ +#endif // RTC_BASE_TESTBASE64_H_ diff --git a/rtc_base/testclient.cc b/rtc_base/testclient.cc index a54122cc5a..585db77785 100644 --- a/rtc_base/testclient.cc +++ b/rtc_base/testclient.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/testclient.h" +#include "rtc_base/testclient.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/gunit.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/testclient.h b/rtc_base/testclient.h index 18fe71afec..c0dbe65bc8 100644 --- a/rtc_base/testclient.h +++ b/rtc_base/testclient.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TESTCLIENT_H_ -#define WEBRTC_RTC_BASE_TESTCLIENT_H_ +#ifndef RTC_BASE_TESTCLIENT_H_ +#define RTC_BASE_TESTCLIENT_H_ #include #include -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/fakeclock.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/fakeclock.h" namespace rtc { @@ -111,4 +111,4 @@ class TestClient : public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TESTCLIENT_H_ +#endif // RTC_BASE_TESTCLIENT_H_ diff --git a/rtc_base/testclient_unittest.cc b/rtc_base/testclient_unittest.cc index 2607dbb3ec..f3c8561b06 100644 --- a/rtc_base/testclient_unittest.cc +++ b/rtc_base/testclient_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testechoserver.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/testclient.h" +#include "rtc_base/gunit.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/testechoserver.h" +#include "rtc_base/thread.h" using namespace rtc; diff --git a/rtc_base/testechoserver.h b/rtc_base/testechoserver.h index e11533293f..7ef512da12 100644 --- a/rtc_base/testechoserver.h +++ b/rtc_base/testechoserver.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TESTECHOSERVER_H_ -#define WEBRTC_RTC_BASE_TESTECHOSERVER_H_ +#ifndef RTC_BASE_TESTECHOSERVER_H_ +#define RTC_BASE_TESTECHOSERVER_H_ #include #include -#include "webrtc/rtc_base/asynctcpsocket.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" namespace rtc { @@ -72,4 +72,4 @@ class TestEchoServer : public sigslot::has_slots<> { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TESTECHOSERVER_H_ +#endif // RTC_BASE_TESTECHOSERVER_H_ diff --git a/rtc_base/testutils.h b/rtc_base/testutils.h index 615f094e60..e05488052b 100644 --- a/rtc_base/testutils.h +++ b/rtc_base/testutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TESTUTILS_H_ -#define WEBRTC_RTC_BASE_TESTUTILS_H_ +#ifndef RTC_BASE_TESTUTILS_H_ +#define RTC_BASE_TESTUTILS_H_ // Utilities for testing rtc infrastructure in unittests @@ -26,16 +26,16 @@ #include #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringencode.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" namespace webrtc { namespace testing { @@ -563,4 +563,4 @@ inline bool IsScreencastingAvailable() { } // namespace testing } // namespace webrtc -#endif // WEBRTC_RTC_BASE_TESTUTILS_H_ +#endif // RTC_BASE_TESTUTILS_H_ diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc index 9ba0f51349..1bc0c0cd85 100644 --- a/rtc_base/thread.cc +++ b/rtc_base/thread.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/thread.h" #if defined(WEBRTC_WIN) #include @@ -16,13 +16,13 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace rtc { diff --git a/rtc_base/thread.h b/rtc_base/thread.h index d072fac09b..b4ce7d7542 100644 --- a/rtc_base/thread.h +++ b/rtc_base/thread.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_THREAD_H_ -#define WEBRTC_RTC_BASE_THREAD_H_ +#ifndef RTC_BASE_THREAD_H_ +#define RTC_BASE_THREAD_H_ #include #include @@ -20,13 +20,13 @@ #if defined(WEBRTC_POSIX) #include #endif -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/platform_thread_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/event.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/platform_thread_types.h" #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #endif namespace rtc { @@ -334,4 +334,4 @@ class AutoSocketServerThread : public Thread { } // namespace rtc -#endif // WEBRTC_RTC_BASE_THREAD_H_ +#endif // RTC_BASE_THREAD_H_ diff --git a/rtc_base/thread_annotations.h b/rtc_base/thread_annotations.h index bbd2c7191e..de0c5c90da 100644 --- a/rtc_base/thread_annotations.h +++ b/rtc_base/thread_annotations.h @@ -16,8 +16,8 @@ // of their multi-threaded code. The annotations can also help program // analysis tools to identify potential thread safety issues. -#ifndef WEBRTC_RTC_BASE_THREAD_ANNOTATIONS_H_ -#define WEBRTC_RTC_BASE_THREAD_ANNOTATIONS_H_ +#ifndef RTC_BASE_THREAD_ANNOTATIONS_H_ +#define RTC_BASE_THREAD_ANNOTATIONS_H_ #if defined(__clang__) && (!defined(SWIG)) #define RTC_THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) @@ -98,4 +98,4 @@ #define RTC_NO_THREAD_SAFETY_ANALYSIS \ RTC_THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis) -#endif // WEBRTC_RTC_BASE_THREAD_ANNOTATIONS_H_ +#endif // RTC_BASE_THREAD_ANNOTATIONS_H_ diff --git a/rtc_base/thread_annotations_unittest.cc b/rtc_base/thread_annotations_unittest.cc index c8c3c3701e..2dc2ee7a54 100644 --- a/rtc_base/thread_annotations_unittest.cc +++ b/rtc_base/thread_annotations_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/thread_annotations.h" +#include "test/gtest.h" namespace { diff --git a/rtc_base/thread_checker.h b/rtc_base/thread_checker.h index 89428fd9d5..028e9bf367 100644 --- a/rtc_base/thread_checker.h +++ b/rtc_base/thread_checker.h @@ -10,8 +10,8 @@ // Borrowed from Chromium's src/base/threading/thread_checker.h. -#ifndef WEBRTC_RTC_BASE_THREAD_CHECKER_H_ -#define WEBRTC_RTC_BASE_THREAD_CHECKER_H_ +#ifndef RTC_BASE_THREAD_CHECKER_H_ +#define RTC_BASE_THREAD_CHECKER_H_ // Apart from debug builds, we also enable the thread checker in // builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots @@ -19,10 +19,10 @@ // debug bots. #define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker_impl.h" namespace rtc { @@ -173,4 +173,4 @@ class RTC_SCOPED_LOCKABLE AnnounceOnThread { rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \ RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object)) -#endif // WEBRTC_RTC_BASE_THREAD_CHECKER_H_ +#endif // RTC_BASE_THREAD_CHECKER_H_ diff --git a/rtc_base/thread_checker_impl.cc b/rtc_base/thread_checker_impl.cc index 307d6f8d19..6ec5c91d2e 100644 --- a/rtc_base/thread_checker_impl.cc +++ b/rtc_base/thread_checker_impl.cc @@ -10,9 +10,9 @@ // Borrowed from Chromium's src/base/threading/thread_checker_impl.cc. -#include "webrtc/rtc_base/thread_checker_impl.h" +#include "rtc_base/thread_checker_impl.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/platform_thread.h" namespace rtc { diff --git a/rtc_base/thread_checker_impl.h b/rtc_base/thread_checker_impl.h index 628e9b3f3e..c82fe1de5d 100644 --- a/rtc_base/thread_checker_impl.h +++ b/rtc_base/thread_checker_impl.h @@ -10,11 +10,11 @@ // Borrowed from Chromium's src/base/threading/thread_checker_impl.h. -#ifndef WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_ -#define WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_ +#ifndef RTC_BASE_THREAD_CHECKER_IMPL_H_ +#define RTC_BASE_THREAD_CHECKER_IMPL_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread_types.h" namespace rtc { @@ -45,4 +45,4 @@ class ThreadCheckerImpl { } // namespace rtc -#endif // WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_ +#endif // RTC_BASE_THREAD_CHECKER_IMPL_H_ diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc index ba5c695801..071815d136 100644 --- a/rtc_base/thread_checker_unittest.cc +++ b/rtc_base/thread_checker_unittest.cc @@ -12,13 +12,13 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_checker.h" +#include "test/gtest.h" // Duplicated from base/threading/thread_checker.h so that we can be // good citizens there and undef the macro. diff --git a/rtc_base/thread_darwin.mm b/rtc_base/thread_darwin.mm index a673f28502..ab42d6e4e1 100644 --- a/rtc_base/thread_darwin.mm +++ b/rtc_base/thread_darwin.mm @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/thread.h" #import -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/platform_thread.h" /* * This file contains platform-specific implementations for several diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc index 7631f5eba9..dfaa51a0ac 100644 --- a/rtc_base/thread_unittest.cc +++ b/rtc_base/thread_unittest.cc @@ -10,15 +10,15 @@ #include -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/asyncudpsocket.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/sigslot.h" -#include "webrtc/rtc_base/socketaddress.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/event.h" +#include "rtc_base/gunit.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/sigslot.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" #if defined(WEBRTC_WIN) #include // NOLINT diff --git a/rtc_base/timedelta.h b/rtc_base/timedelta.h index ae4bda4390..c8dcf03bd3 100644 --- a/rtc_base/timedelta.h +++ b/rtc_base/timedelta.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TIMEDELTA_H_ -#define WEBRTC_RTC_BASE_TIMEDELTA_H_ +#ifndef RTC_BASE_TIMEDELTA_H_ +#define RTC_BASE_TIMEDELTA_H_ #include -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/timeutils.h" // Convenience class to convert between different units of relative time. // Stores time to precision of nanoseconds, as int64_t internally. @@ -126,4 +126,4 @@ inline TimeDelta operator*(T a, TimeDelta td) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TIMEDELTA_H_ +#endif // RTC_BASE_TIMEDELTA_H_ diff --git a/rtc_base/timestampaligner.cc b/rtc_base/timestampaligner.cc index fdce141073..22a44364ae 100644 --- a/rtc_base/timestampaligner.cc +++ b/rtc_base/timestampaligner.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timestampaligner.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timestampaligner.h" +#include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/timestampaligner.h b/rtc_base/timestampaligner.h index dde877c583..6fa8d697e3 100644 --- a/rtc_base/timestampaligner.h +++ b/rtc_base/timestampaligner.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TIMESTAMPALIGNER_H_ -#define WEBRTC_RTC_BASE_TIMESTAMPALIGNER_H_ +#ifndef RTC_BASE_TIMESTAMPALIGNER_H_ +#define RTC_BASE_TIMESTAMPALIGNER_H_ #include -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/constructormagic.h" namespace rtc { @@ -71,4 +71,4 @@ class TimestampAligner { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TIMESTAMPALIGNER_H_ +#endif // RTC_BASE_TIMESTAMPALIGNER_H_ diff --git a/rtc_base/timestampaligner_unittest.cc b/rtc_base/timestampaligner_unittest.cc index 0c838aff73..8ba5be9975 100644 --- a/rtc_base/timestampaligner_unittest.cc +++ b/rtc_base/timestampaligner_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timestampaligner.h" +#include "rtc_base/gunit.h" +#include "rtc_base/random.h" +#include "rtc_base/timestampaligner.h" namespace rtc { diff --git a/rtc_base/timeutils.cc b/rtc_base/timeutils.cc index 36f9d3fbc7..f924d5fddc 100644 --- a/rtc_base/timeutils.cc +++ b/rtc_base/timeutils.cc @@ -26,8 +26,8 @@ #include #endif -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/timeutils.h b/rtc_base/timeutils.h index c7f035cdb8..f602d483d5 100644 --- a/rtc_base/timeutils.h +++ b/rtc_base/timeutils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TIMEUTILS_H_ -#define WEBRTC_RTC_BASE_TIMEUTILS_H_ +#ifndef RTC_BASE_TIMEUTILS_H_ +#define RTC_BASE_TIMEUTILS_H_ #include #include @@ -17,7 +17,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { @@ -155,4 +155,4 @@ class IntervalRange { } // namespace rtc -#endif // WEBRTC_RTC_BASE_TIMEUTILS_H_ +#endif // RTC_BASE_TIMEUTILS_H_ diff --git a/rtc_base/timeutils_unittest.cc b/rtc_base/timeutils_unittest.cc index a409fb679c..592b7f82b9 100644 --- a/rtc_base/timeutils_unittest.cc +++ b/rtc_base/timeutils_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/helpers.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/event.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/trace_event.h b/rtc_base/trace_event.h index 6a1476d917..9497a2d38f 100644 --- a/rtc_base/trace_event.h +++ b/rtc_base/trace_event.h @@ -3,12 +3,12 @@ // found in the LICENSE file under third_party_mods/chromium or at: // http://src.chromium.org/svn/trunk/src/LICENSE -#ifndef WEBRTC_RTC_BASE_TRACE_EVENT_H_ -#define WEBRTC_RTC_BASE_TRACE_EVENT_H_ +#ifndef RTC_BASE_TRACE_EVENT_H_ +#define RTC_BASE_TRACE_EVENT_H_ #include -#include "webrtc/rtc_base/event_tracer.h" +#include "rtc_base/event_tracer.h" #if defined(TRACE_EVENT0) #error "Another copy of trace_event.h has already been included." @@ -913,4 +913,4 @@ class TraceEndOnScopeClose { } // namespace trace_event_internal } // namespace webrtc -#endif // WEBRTC_RTC_BASE_TRACE_EVENT_H_ +#endif // RTC_BASE_TRACE_EVENT_H_ diff --git a/rtc_base/transformadapter.cc b/rtc_base/transformadapter.cc index 3243e6db4a..943a5b9672 100644 --- a/rtc_base/transformadapter.cc +++ b/rtc_base/transformadapter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/transformadapter.h" +#include "rtc_base/transformadapter.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/transformadapter.h b/rtc_base/transformadapter.h index 21e11ed453..5e8aa9a4aa 100644 --- a/rtc_base/transformadapter.h +++ b/rtc_base/transformadapter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_ -#define WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_ +#ifndef RTC_BASE_TRANSFORMADAPTER_H_ +#define RTC_BASE_TRANSFORMADAPTER_H_ -#include "webrtc/rtc_base/stream.h" +#include "rtc_base/stream.h" namespace rtc { /////////////////////////////////////////////////////////////////////////////// @@ -81,4 +81,4 @@ private: } // namespace rtc -#endif // WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_ +#endif // RTC_BASE_TRANSFORMADAPTER_H_ diff --git a/rtc_base/type_traits.h b/rtc_base/type_traits.h index 5ecbc07590..4f004cda8b 100644 --- a/rtc_base/type_traits.h +++ b/rtc_base/type_traits.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_TYPE_TRAITS_H_ -#define WEBRTC_RTC_BASE_TYPE_TRAITS_H_ +#ifndef RTC_BASE_TYPE_TRAITS_H_ +#define RTC_BASE_TYPE_TRAITS_H_ #include #include @@ -137,4 +137,4 @@ static_assert(!IsIntlike::value, ""); } // namespace rtc -#endif // WEBRTC_RTC_BASE_TYPE_TRAITS_H_ +#endif // RTC_BASE_TYPE_TRAITS_H_ diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc index b7738c6a6e..48e804737a 100644 --- a/rtc_base/unittest_main.cc +++ b/rtc_base/unittest_main.cc @@ -14,17 +14,17 @@ #include #endif -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/rtc_base/sslstreamadapter.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/flags.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslstreamadapter.h" +#include "test/field_trial.h" +#include "test/testsupport/fileutils.h" #if defined(WEBRTC_IOS) -#include "webrtc/test/ios/test_support.h" +#include "test/ios/test_support.h" #endif DEFINE_bool(help, false, "prints this message"); diff --git a/rtc_base/unixfilesystem.cc b/rtc_base/unixfilesystem.cc index 898fdd6662..8355141bd1 100644 --- a/rtc_base/unixfilesystem.cc +++ b/rtc_base/unixfilesystem.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/unixfilesystem.h" +#include "rtc_base/unixfilesystem.h" #include #include @@ -20,7 +20,7 @@ #include #include #include -#include "webrtc/rtc_base/macutils.h" +#include "rtc_base/macutils.h" #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) || defined(WEBRTC_IOS) @@ -44,12 +44,12 @@ #include #endif -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/unixfilesystem.h b/rtc_base/unixfilesystem.h index 116df2101c..27966f3aec 100644 --- a/rtc_base/unixfilesystem.h +++ b/rtc_base/unixfilesystem.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_UNIXFILESYSTEM_H_ -#define WEBRTC_RTC_BASE_UNIXFILESYSTEM_H_ +#ifndef RTC_BASE_UNIXFILESYSTEM_H_ +#define RTC_BASE_UNIXFILESYSTEM_H_ #include -#include "webrtc/rtc_base/fileutils.h" +#include "rtc_base/fileutils.h" namespace rtc { @@ -55,4 +55,4 @@ class UnixFilesystem : public FilesystemInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_UNIXFILESYSTEM_H_ +#endif // RTC_BASE_UNIXFILESYSTEM_H_ diff --git a/rtc_base/virtualsocket_unittest.cc b/rtc_base/virtualsocket_unittest.cc index b58bdd8e71..785d32c5c4 100644 --- a/rtc_base/virtualsocket_unittest.cc +++ b/rtc_base/virtualsocket_unittest.cc @@ -16,16 +16,16 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/testclient.h" -#include "webrtc/rtc_base/testutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/testclient.h" +#include "rtc_base/testutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/virtualsocketserver.h" using namespace rtc; diff --git a/rtc_base/virtualsocketserver.cc b/rtc_base/virtualsocketserver.cc index 23e94a2d65..e799ceaa42 100644 --- a/rtc_base/virtualsocketserver.cc +++ b/rtc_base/virtualsocketserver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/virtualsocketserver.h" +#include "rtc_base/virtualsocketserver.h" #include #include @@ -18,13 +18,13 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/physicalsocketserver.h" -#include "webrtc/rtc_base/socketaddresspair.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/logging.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socketaddresspair.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace rtc { #if defined(WEBRTC_WIN) diff --git a/rtc_base/virtualsocketserver.h b/rtc_base/virtualsocketserver.h index 089e73a13d..e25a5ff9ca 100644 --- a/rtc_base/virtualsocketserver.h +++ b/rtc_base/virtualsocketserver.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_VIRTUALSOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_VIRTUALSOCKETSERVER_H_ +#ifndef RTC_BASE_VIRTUALSOCKETSERVER_H_ +#define RTC_BASE_VIRTUALSOCKETSERVER_H_ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/socketserver.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/event.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/socketserver.h" namespace rtc { @@ -402,4 +402,4 @@ class VirtualSocket : public AsyncSocket, } // namespace rtc -#endif // WEBRTC_RTC_BASE_VIRTUALSOCKETSERVER_H_ +#endif // RTC_BASE_VIRTUALSOCKETSERVER_H_ diff --git a/rtc_base/weak_ptr.cc b/rtc_base/weak_ptr.cc index 3693a94e24..453a22e8e4 100644 --- a/rtc_base/weak_ptr.cc +++ b/rtc_base/weak_ptr.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/weak_ptr.h" +#include "rtc_base/weak_ptr.h" // The implementation is borrowed from chromium except that it does not // implement SupportsWeakPtr. diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h index 0e82612ad5..7c1c15cdf9 100644 --- a/rtc_base/weak_ptr.h +++ b/rtc_base/weak_ptr.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WEAK_PTR_H_ -#define WEBRTC_RTC_BASE_WEAK_PTR_H_ +#ifndef RTC_BASE_WEAK_PTR_H_ +#define RTC_BASE_WEAK_PTR_H_ #include #include -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sequenced_task_checker.h" // The implementation is borrowed from chromium except that it does not // implement SupportsWeakPtr. @@ -269,4 +269,4 @@ class WeakPtrFactory { } // namespace rtc -#endif // WEBRTC_RTC_BASE_WEAK_PTR_H_ +#endif // RTC_BASE_WEAK_PTR_H_ diff --git a/rtc_base/weak_ptr_unittest.cc b/rtc_base/weak_ptr_unittest.cc index d6da2346fa..0a2dceaf57 100644 --- a/rtc_base/weak_ptr_unittest.cc +++ b/rtc_base/weak_ptr_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/weak_ptr.h" +#include "rtc_base/gunit.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/weak_ptr.h" namespace rtc { diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc index 276b74bbfe..42c3d811ad 100644 --- a/rtc_base/win32.cc +++ b/rtc_base/win32.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include #include #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/win32.h b/rtc_base/win32.h index be1195e37d..5b214290cd 100644 --- a/rtc_base/win32.h +++ b/rtc_base/win32.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WIN32_H_ -#define WEBRTC_RTC_BASE_WIN32_H_ +#ifndef RTC_BASE_WIN32_H_ +#define RTC_BASE_WIN32_H_ #if defined(WEBRTC_WIN) @@ -38,8 +38,8 @@ typedef struct _TOKEN_MANDATORY_LABEL { #include -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/stringutils.h" namespace rtc { @@ -125,4 +125,4 @@ inline bool IsCurrentProcessLowIntegrity() { } // namespace rtc #endif // WEBRTC_WIN -#endif // WEBRTC_RTC_BASE_WIN32_H_ +#endif // RTC_BASE_WIN32_H_ diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc index 831b4b315c..8084540aa1 100644 --- a/rtc_base/win32_unittest.cc +++ b/rtc_base/win32_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/nethelpers.h" -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/gunit.h" +#include "rtc_base/nethelpers.h" +#include "rtc_base/win32.h" #if !defined(WEBRTC_WIN) #error Only for Windows diff --git a/rtc_base/win32filesystem.cc b/rtc_base/win32filesystem.cc index 19122e5808..024aa84a12 100644 --- a/rtc_base/win32filesystem.cc +++ b/rtc_base/win32filesystem.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32filesystem.h" +#include "rtc_base/win32filesystem.h" #include #include #include -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/fileutils.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/stream.h" -#include "webrtc/rtc_base/stringutils.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/fileutils.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/stream.h" +#include "rtc_base/stringutils.h" // In several places in this file, we test the integrity level of the process // before calling GetLongPathName. We do this because calling GetLongPathName diff --git a/rtc_base/win32filesystem.h b/rtc_base/win32filesystem.h index 95c820ca72..e65d127cb2 100644 --- a/rtc_base/win32filesystem.h +++ b/rtc_base/win32filesystem.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WIN32FILESYSTEM_H_ -#define WEBRTC_RTC_BASE_WIN32FILESYSTEM_H_ +#ifndef RTC_BASE_WIN32FILESYSTEM_H_ +#define RTC_BASE_WIN32FILESYSTEM_H_ #include "fileutils.h" @@ -46,4 +46,4 @@ class Win32Filesystem : public FilesystemInterface { } // namespace rtc -#endif // WEBRTC_RTC_BASE_WIN32FILESYSTEM_H_ +#endif // RTC_BASE_WIN32FILESYSTEM_H_ diff --git a/rtc_base/win32securityerrors.cc b/rtc_base/win32securityerrors.cc index 0cc9bce7e6..2f8530a6bc 100644 --- a/rtc_base/win32securityerrors.cc +++ b/rtc_base/win32securityerrors.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/logging.h" +#include "rtc_base/win32.h" namespace rtc { diff --git a/rtc_base/win32socketinit.cc b/rtc_base/win32socketinit.cc index 1a54c444d0..5bf65468fa 100644 --- a/rtc_base/win32socketinit.cc +++ b/rtc_base/win32socketinit.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketinit.h" +#include "rtc_base/win32socketinit.h" -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" namespace rtc { diff --git a/rtc_base/win32socketinit.h b/rtc_base/win32socketinit.h index 6acac9f956..ea74809995 100644 --- a/rtc_base/win32socketinit.h +++ b/rtc_base/win32socketinit.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WIN32SOCKETINIT_H_ -#define WEBRTC_RTC_BASE_WIN32SOCKETINIT_H_ +#ifndef RTC_BASE_WIN32SOCKETINIT_H_ +#define RTC_BASE_WIN32SOCKETINIT_H_ namespace rtc { @@ -17,4 +17,4 @@ void EnsureWinsockInit(); } // namespace rtc -#endif // WEBRTC_RTC_BASE_WIN32SOCKETINIT_H_ +#endif // RTC_BASE_WIN32SOCKETINIT_H_ diff --git a/rtc_base/win32socketserver.cc b/rtc_base/win32socketserver.cc index 1405c82ace..889e49537f 100644 --- a/rtc_base/win32socketserver.cc +++ b/rtc_base/win32socketserver.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketserver.h" +#include "rtc_base/win32socketserver.h" #include #include // NOLINT -#include "webrtc/rtc_base/byteorder.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/win32window.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/win32window.h" namespace rtc { diff --git a/rtc_base/win32socketserver.h b/rtc_base/win32socketserver.h index 1255a80e3d..63b662c715 100644 --- a/rtc_base/win32socketserver.h +++ b/rtc_base/win32socketserver.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WIN32SOCKETSERVER_H_ -#define WEBRTC_RTC_BASE_WIN32SOCKETSERVER_H_ +#ifndef RTC_BASE_WIN32SOCKETSERVER_H_ +#define RTC_BASE_WIN32SOCKETSERVER_H_ #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/asyncsocket.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/messagequeue.h" -#include "webrtc/rtc_base/socket.h" -#include "webrtc/rtc_base/socketfactory.h" -#include "webrtc/rtc_base/socketserver.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/win32window.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketfactory.h" +#include "rtc_base/socketserver.h" +#include "rtc_base/thread.h" +#include "rtc_base/win32window.h" namespace rtc { @@ -159,4 +159,4 @@ class Win32Thread : public Thread { #endif // WEBRTC_WIN -#endif // WEBRTC_RTC_BASE_WIN32SOCKETSERVER_H_ +#endif // RTC_BASE_WIN32SOCKETSERVER_H_ diff --git a/rtc_base/win32socketserver_unittest.cc b/rtc_base/win32socketserver_unittest.cc index 9eacff774a..60295f1074 100644 --- a/rtc_base/win32socketserver_unittest.cc +++ b/rtc_base/win32socketserver_unittest.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32socketserver.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/socket_unittest.h" -#include "webrtc/rtc_base/thread.h" +#include "rtc_base/win32socketserver.h" +#include "rtc_base/gunit.h" +#include "rtc_base/socket_unittest.h" +#include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/win32window.cc b/rtc_base/win32window.cc index e005ba1516..f55a8ba8fb 100644 --- a/rtc_base/win32window.cc +++ b/rtc_base/win32window.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32window.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/win32window.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace rtc { diff --git a/rtc_base/win32window.h b/rtc_base/win32window.h index a9fe8437d6..c7b7fa9d16 100644 --- a/rtc_base/win32window.h +++ b/rtc_base/win32window.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WIN32WINDOW_H_ -#define WEBRTC_RTC_BASE_WIN32WINDOW_H_ +#ifndef RTC_BASE_WIN32WINDOW_H_ +#define RTC_BASE_WIN32WINDOW_H_ #if defined(WEBRTC_WIN) -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" namespace rtc { @@ -57,4 +57,4 @@ class Win32Window { #endif // WEBRTC_WIN -#endif // WEBRTC_RTC_BASE_WIN32WINDOW_H_ +#endif // RTC_BASE_WIN32WINDOW_H_ diff --git a/rtc_base/win32window_unittest.cc b/rtc_base/win32window_unittest.cc index 9bd2d34c9b..f1d8e84af8 100644 --- a/rtc_base/win32window_unittest.cc +++ b/rtc_base/win32window_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/win32window.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/win32window.h" +#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" static LRESULT kDummyResult = 0x1234ABCD; diff --git a/rtc_base/window.h b/rtc_base/window.h index 10ed9f7a95..29b3170f30 100644 --- a/rtc_base/window.h +++ b/rtc_base/window.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_BASE_WINDOW_H_ -#define WEBRTC_RTC_BASE_WINDOW_H_ +#ifndef RTC_BASE_WINDOW_H_ +#define RTC_BASE_WINDOW_H_ #include -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" // Define platform specific window types. #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) typedef unsigned long Window; // Avoid include . #elif defined(WEBRTC_WIN) // We commonly include win32.h in webrtc/rtc_base so just include it here. -#include "webrtc/rtc_base/win32.h" // Include HWND, HMONITOR. +#include "rtc_base/win32.h" // Include HWND, HMONITOR. #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) typedef unsigned int CGWindowID; typedef unsigned int CGDirectDisplayID; @@ -75,4 +75,4 @@ inline std::string ToString(const WindowId& window) { } // namespace rtc -#endif // WEBRTC_RTC_BASE_WINDOW_H_ +#endif // RTC_BASE_WINDOW_H_ diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 21669784fb..5dca268967 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -190,7 +190,7 @@ if (!build_with_chromium) { sources = [ "event_log_visualizer/chart.proto", ] - proto_out_dir = "webrtc/rtc_tools/event_log_visualizer" + proto_out_dir = "rtc_tools/event_log_visualizer" } rtc_static_library("event_log_visualizer_utils") { @@ -281,9 +281,9 @@ if (rtc_include_tests) { } tools_unittests_resources = [ - "../../resources/foreman_cif.yuv", - "../../resources/reference_less_video_test_file.y4m", - "../../resources/video_quality_analysis_frame.txt", + "../resources/foreman_cif.yuv", + "../resources/reference_less_video_test_file.y4m", + "../resources/video_quality_analysis_frame.txt", ] if (is_ios) { diff --git a/rtc_tools/DEPS b/rtc_tools/DEPS index 69b7e58721..c21ca8f254 100644 --- a/rtc_tools/DEPS +++ b/rtc_tools/DEPS @@ -1,16 +1,16 @@ include_rules = [ - "+webrtc/call", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_coding/audio_network_adaptor", - "+webrtc/modules/audio_coding/neteq/tools", - "+webrtc/modules/audio_processing", - "+webrtc/modules/bitrate_controller", - "+webrtc/modules/congestion_controller", - "+webrtc/modules/pacing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/system_wrappers", - "+webrtc/p2p", + "+call", + "+common_video", + "+logging/rtc_event_log", + "+modules/audio_device", + "+modules/audio_coding/audio_network_adaptor", + "+modules/audio_coding/neteq/tools", + "+modules/audio_processing", + "+modules/bitrate_controller", + "+modules/congestion_controller", + "+modules/pacing", + "+modules/rtp_rtcp", + "+system_wrappers", + "+p2p", ] diff --git a/rtc_tools/agc/activity_metric.cc b/rtc_tools/agc/activity_metric.cc index 2cca66b006..ce0840a51b 100644 --- a/rtc_tools/agc/activity_metric.cc +++ b/rtc_tools/agc/activity_metric.cc @@ -16,17 +16,17 @@ #include #include -#include "webrtc/modules/audio_processing/agc/agc.h" -#include "webrtc/modules/audio_processing/agc/loudness_histogram.h" -#include "webrtc/modules/audio_processing/agc/utility.h" -#include "webrtc/modules/audio_processing/vad/common.h" -#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h" -#include "webrtc/modules/audio_processing/vad/standalone_vad.h" -#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/test/gtest.h" +#include "modules/audio_processing/agc/agc.h" +#include "modules/audio_processing/agc/loudness_histogram.h" +#include "modules/audio_processing/agc/utility.h" +#include "modules/audio_processing/vad/common.h" +#include "modules/audio_processing/vad/pitch_based_vad.h" +#include "modules/audio_processing/vad/standalone_vad.h" +#include "modules/audio_processing/vad/vad_audio_proc.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/flags.h" +#include "rtc_base/safe_minmax.h" +#include "test/gtest.h" static const int kAgcAnalWindowSamples = 100; static const float kDefaultActivityThreshold = 0.3f; diff --git a/rtc_tools/converter/converter.cc b/rtc_tools/converter/converter.cc index 0216ff53df..ee1316efc2 100644 --- a/rtc_tools/converter/converter.cc +++ b/rtc_tools/converter/converter.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/rtc_tools/converter/converter.h" +#include "rtc_tools/converter/converter.h" #ifdef WIN32 #define SEPARATOR '\\' diff --git a/rtc_tools/converter/converter.h b/rtc_tools/converter/converter.h index 2c19923283..e8bee0414e 100644 --- a/rtc_tools/converter/converter.h +++ b/rtc_tools/converter/converter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_ -#define WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_ +#ifndef RTC_TOOLS_CONVERTER_CONVERTER_H_ +#define RTC_TOOLS_CONVERTER_CONVERTER_H_ #include @@ -106,4 +106,4 @@ class Converter { } // namespace test } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_ +#endif // RTC_TOOLS_CONVERTER_CONVERTER_H_ diff --git a/rtc_tools/converter/rgba_to_i420_converter.cc b/rtc_tools/converter/rgba_to_i420_converter.cc index 723893e6db..23342402a8 100644 --- a/rtc_tools/converter/rgba_to_i420_converter.cc +++ b/rtc_tools/converter/rgba_to_i420_converter.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/rtc_tools/converter/converter.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/converter/converter.h" +#include "rtc_tools/simple_command_line_parser.h" /* * A command-line tool based on libyuv to convert a set of RGBA files to a YUV diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index 8358d3b24b..44ea831ed5 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h" +#include "rtc_tools/event_log_visualizer/analyzer.h" #include #include @@ -17,34 +17,34 @@ #include #include -#include "webrtc/call/audio_receive_stream.h" -#include "webrtc/call/audio_send_stream.h" -#include "webrtc/call/call.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" -#include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" -#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/rate_statistics.h" +#include "call/audio_receive_stream.h" +#include "call/audio_send_stream.h" +#include "call/call.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "common_types.h" +#include "modules/audio_coding/neteq/tools/audio_sink.h" +#include "modules/audio_coding/neteq/tools/fake_decode_from_file.h" +#include "modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" +#include "modules/audio_coding/neteq/tools/neteq_replacement_input.h" +#include "modules/audio_coding/neteq/tools/neteq_test.h" +#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/rate_statistics.h" namespace webrtc { namespace plotting { diff --git a/rtc_tools/event_log_visualizer/analyzer.h b/rtc_tools/event_log_visualizer/analyzer.h index 328fc531ba..65ca19bfb4 100644 --- a/rtc_tools/event_log_visualizer/analyzer.h +++ b/rtc_tools/event_log_visualizer/analyzer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ -#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ +#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ +#define RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ #include #include @@ -18,12 +18,12 @@ #include #include -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/rtc_base/function_view.h" -#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "rtc_base/function_view.h" +#include "rtc_tools/event_log_visualizer/plot_base.h" namespace webrtc { namespace plotting { @@ -204,4 +204,4 @@ class EventLogAnalyzer { } // namespace plotting } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ +#endif // RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_ diff --git a/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/event_log_visualizer/main.cc index 0aafb2c361..aa92a7f644 100644 --- a/rtc_tools/event_log_visualizer/main.cc +++ b/rtc_tools/event_log_visualizer/main.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h" -#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" -#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "rtc_base/flags.h" +#include "rtc_tools/event_log_visualizer/analyzer.h" +#include "rtc_tools/event_log_visualizer/plot_base.h" +#include "rtc_tools/event_log_visualizer/plot_python.h" +#include "test/field_trial.h" +#include "test/testsupport/fileutils.h" DEFINE_string(plot_profile, "default", diff --git a/rtc_tools/event_log_visualizer/plot_base.cc b/rtc_tools/event_log_visualizer/plot_base.cc index 783f2b87ac..7ff4ef9c2c 100644 --- a/rtc_tools/event_log_visualizer/plot_base.cc +++ b/rtc_tools/event_log_visualizer/plot_base.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" +#include "rtc_tools/event_log_visualizer/plot_base.h" #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace plotting { diff --git a/rtc_tools/event_log_visualizer/plot_base.h b/rtc_tools/event_log_visualizer/plot_base.h index 347fca4cf8..318d425d41 100644 --- a/rtc_tools/event_log_visualizer/plot_base.h +++ b/rtc_tools/event_log_visualizer/plot_base.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ -#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ +#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ +#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ #include #include @@ -164,4 +164,4 @@ class PlotCollection { } // namespace plotting } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ +#endif // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_ diff --git a/rtc_tools/event_log_visualizer/plot_protobuf.cc b/rtc_tools/event_log_visualizer/plot_protobuf.cc index f176414aa2..1316f63662 100644 --- a/rtc_tools/event_log_visualizer/plot_protobuf.cc +++ b/rtc_tools/event_log_visualizer/plot_protobuf.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h" +#include "rtc_tools/event_log_visualizer/plot_protobuf.h" #include diff --git a/rtc_tools/event_log_visualizer/plot_protobuf.h b/rtc_tools/event_log_visualizer/plot_protobuf.h index e4670db131..5c5cce1242 100644 --- a/rtc_tools/event_log_visualizer/plot_protobuf.h +++ b/rtc_tools/event_log_visualizer/plot_protobuf.h @@ -7,14 +7,14 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ -#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ +#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ +#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h" +#include "rtc_tools/event_log_visualizer/chart.pb.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" +#include "rtc_tools/event_log_visualizer/plot_base.h" namespace webrtc { namespace plotting { @@ -39,4 +39,4 @@ class ProtobufPlotCollection final : public PlotCollection { } // namespace plotting } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ +#endif // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ diff --git a/rtc_tools/event_log_visualizer/plot_python.cc b/rtc_tools/event_log_visualizer/plot_python.cc index dae285526e..f8643caa99 100644 --- a/rtc_tools/event_log_visualizer/plot_python.cc +++ b/rtc_tools/event_log_visualizer/plot_python.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h" +#include "rtc_tools/event_log_visualizer/plot_python.h" #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace plotting { diff --git a/rtc_tools/event_log_visualizer/plot_python.h b/rtc_tools/event_log_visualizer/plot_python.h index cad2f45ea4..2a5a66c31c 100644 --- a/rtc_tools/event_log_visualizer/plot_python.h +++ b/rtc_tools/event_log_visualizer/plot_python.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ -#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ +#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ +#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ -#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" +#include "rtc_tools/event_log_visualizer/plot_base.h" namespace webrtc { namespace plotting { @@ -33,4 +33,4 @@ class PythonPlotCollection final : public PlotCollection { } // namespace plotting } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ +#endif // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ diff --git a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc index 0a2347d5ba..697f8e3670 100644 --- a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc +++ b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device.h" using webrtc::AudioDeviceModule; diff --git a/rtc_tools/frame_analyzer/frame_analyzer.cc b/rtc_tools/frame_analyzer/frame_analyzer.cc index 4af3389422..98f4743043 100644 --- a/rtc_tools/frame_analyzer/frame_analyzer.cc +++ b/rtc_tools/frame_analyzer/frame_analyzer.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/frame_analyzer/video_quality_analysis.h" +#include "rtc_tools/simple_command_line_parser.h" /* * A command line tool running PSNR and SSIM on a reference video and a test diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis.cc index 6170da01f3..d75b3af731 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis.cc +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" +#include "rtc_tools/simple_command_line_parser.h" int main(int argc, char** argv) { // This captures the freezing metrics for reference less video analysis. diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc index 0f5c012d1d..78d10cecf9 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" -#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h" +#include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" +#include "rtc_tools/frame_analyzer/video_quality_analysis.h" #define STATS_LINE_LENGTH 28 #define PSNR_FREEZE_THRESHOLD 47 @@ -90,7 +90,7 @@ void print_freezing_metrics(const std::vector& psnr_per_frame, * 5) Total different identical frames found. * * Sample output: - * Printing metrics for file: /src/webrtc/rtc_tools/test_3.y4m + * Printing metrics for file: /src/rtc_tools/test_3.y4m ============================= Total number of frames received: 74 Total identical frames: 5 diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h index b50aa09250..1a7b1b1bd5 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ -#define WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ +#ifndef RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ +#define RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ #include #include @@ -47,4 +47,4 @@ bool check_file_extension(const std::string& video_file_name); // for a list of video files. int run_analysis(const std::string& video_file); -#endif // WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ +#endif // RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc index 8d9e2578e1..13ccb85422 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" class ReferenceLessVideoAnalysisTest : public ::testing::Test { public: diff --git a/rtc_tools/frame_analyzer/video_quality_analysis.cc b/rtc_tools/frame_analyzer/video_quality_analysis.cc index 2d8376c26f..7dce734498 100644 --- a/rtc_tools/frame_analyzer/video_quality_analysis.cc +++ b/rtc_tools/frame_analyzer/video_quality_analysis.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h" +#include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include #include diff --git a/rtc_tools/frame_analyzer/video_quality_analysis.h b/rtc_tools/frame_analyzer/video_quality_analysis.h index 8d03faecab..c7a179cc26 100644 --- a/rtc_tools/frame_analyzer/video_quality_analysis.h +++ b/rtc_tools/frame_analyzer/video_quality_analysis.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ -#define WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ +#ifndef RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ +#define RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ #include #include @@ -147,4 +147,4 @@ bool ExtractFrameFromY4mFile(const char* i420_file_name, } // namespace test } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ +#endif // RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ diff --git a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc index bbaf5712f2..0b1258a23e 100644 --- a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc +++ b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_tools/frame_analyzer/video_quality_analysis.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/frame_editing/frame_editing.cc b/rtc_tools/frame_editing/frame_editing.cc index 9030674c01..45af7fed41 100644 --- a/rtc_tools/frame_editing/frame_editing.cc +++ b/rtc_tools/frame_editing/frame_editing.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h" +#include "rtc_tools/frame_editing/frame_editing_lib.h" #include #include #include -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/simple_command_line_parser.h" // A command-line tool to edit a YUV-video (I420 sub-sampled). int main(int argc, char** argv) { diff --git a/rtc_tools/frame_editing/frame_editing_lib.cc b/rtc_tools/frame_editing/frame_editing_lib.cc index a20d8bbbeb..52565bf406 100644 --- a/rtc_tools/frame_editing/frame_editing_lib.cc +++ b/rtc_tools/frame_editing/frame_editing_lib.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h" -#include "webrtc/typedefs.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_tools/frame_editing/frame_editing_lib.h" +#include "typedefs.h" namespace webrtc { diff --git a/rtc_tools/frame_editing/frame_editing_lib.h b/rtc_tools/frame_editing/frame_editing_lib.h index 26435a34dd..a805a117ed 100644 --- a/rtc_tools/frame_editing/frame_editing_lib.h +++ b/rtc_tools/frame_editing/frame_editing_lib.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ -#define WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ +#ifndef RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ +#define RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ #include @@ -36,4 +36,4 @@ int EditFrames(const std::string& in_path, int width, int height, int last_frame_to_process, const std::string& out_path); } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ +#endif // RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_ diff --git a/rtc_tools/frame_editing/frame_editing_unittest.cc b/rtc_tools/frame_editing/frame_editing_unittest.cc index 12d2d6c021..2cca308638 100644 --- a/rtc_tools/frame_editing/frame_editing_unittest.cc +++ b/rtc_tools/frame_editing/frame_editing_unittest.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_tools/frame_editing/frame_editing_lib.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index cff453d808..bb6f86c1a1 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -14,14 +14,14 @@ if (rtc_enable_protobuf) { sources = [ "network_tester_config.proto", ] - proto_out_dir = "webrtc/rtc_tools/network_tester" + proto_out_dir = "rtc_tools/network_tester" } proto_library("network_tester_packet_proto") { sources = [ "network_tester_packet.proto", ] - proto_out_dir = "webrtc/rtc_tools/network_tester" + proto_out_dir = "rtc_tools/network_tester" } rtc_static_library("network_tester") { @@ -56,8 +56,8 @@ if (rtc_enable_protobuf) { } network_tester_unittests_resources = [ - "../../../resources/network_tester/client_config.dat", - "../../../resources/network_tester/server_config.dat", + "../../resources/network_tester/client_config.dat", + "../../resources/network_tester/server_config.dat", ] if (is_ios) { diff --git a/rtc_tools/network_tester/config_reader.cc b/rtc_tools/network_tester/config_reader.cc index ccc4153404..7e01a6577e 100644 --- a/rtc_tools/network_tester/config_reader.cc +++ b/rtc_tools/network_tester/config_reader.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/network_tester/config_reader.h" +#include "rtc_tools/network_tester/config_reader.h" #include #include diff --git a/rtc_tools/network_tester/config_reader.h b/rtc_tools/network_tester/config_reader.h index ae4348f483..e03317fe43 100644 --- a/rtc_tools/network_tester/config_reader.h +++ b/rtc_tools/network_tester/config_reader.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ -#define WEBRTC_RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ +#ifndef RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ +#define RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "api/optional.h" +#include "rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/network_tester/network_tester_config.pb.h" +#include "rtc_tools/network_tester/network_tester_config.pb.h" RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::config::NetworkTesterAllConfigs; #else @@ -50,4 +50,4 @@ class ConfigReader { } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ +#endif // RTC_TOOLS_NETWORK_TESTER_CONFIG_READER_H_ diff --git a/rtc_tools/network_tester/jni.cpp b/rtc_tools/network_tester/jni.cpp index b849afbbb8..818dd7ce80 100644 --- a/rtc_tools/network_tester/jni.cpp +++ b/rtc_tools/network_tester/jni.cpp @@ -13,7 +13,7 @@ #define JNIEXPORT __attribute__((visibility("default"))) #include -#include "webrtc/rtc_tools/network_tester/test_controller.h" +#include "rtc_tools/network_tester/test_controller.h" extern "C" JNIEXPORT jlong JNICALL Java_com_google_media_networktester_NetworkTester_CreateTestController( diff --git a/rtc_tools/network_tester/network_tester_unittest.cc b/rtc_tools/network_tester/network_tester_unittest.cc index d3958be32b..b60a712746 100644 --- a/rtc_tools/network_tester/network_tester_unittest.cc +++ b/rtc_tools/network_tester/network_tester_unittest.cc @@ -11,11 +11,11 @@ #ifdef WEBRTC_NETWORK_TESTER_TEST_ENABLED -#include "webrtc/rtc_tools/network_tester/test_controller.h" +#include "rtc_tools/network_tester/test_controller.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/gunit.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/rtc_tools/network_tester/packet_logger.cc b/rtc_tools/network_tester/packet_logger.cc index ad93e71008..e62f2fbb90 100644 --- a/rtc_tools/network_tester/packet_logger.cc +++ b/rtc_tools/network_tester/packet_logger.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/network_tester/packet_logger.h" +#include "rtc_tools/network_tester/packet_logger.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/protobuf_utils.h" +#include "rtc_base/checks.h" +#include "rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/rtc_tools/network_tester/packet_logger.h b/rtc_tools/network_tester/packet_logger.h index 79923b682e..6659d6c176 100644 --- a/rtc_tools/network_tester/packet_logger.h +++ b/rtc_tools/network_tester/packet_logger.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ -#define WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ +#ifndef RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ +#define RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h" +#include "rtc_tools/network_tester/network_tester_packet.pb.h" RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else @@ -43,4 +43,4 @@ class PacketLogger { } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ +#endif // RTC_TOOLS_NETWORK_TESTER_PACKET_LOGGER_H_ diff --git a/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc index 6568ba0297..3b252524dd 100644 --- a/rtc_tools/network_tester/packet_sender.cc +++ b/rtc_tools/network_tester/packet_sender.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/network_tester/packet_sender.h" +#include "rtc_tools/network_tester/packet_sender.h" #include #include #include -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_tools/network_tester/config_reader.h" -#include "webrtc/rtc_tools/network_tester/test_controller.h" +#include "rtc_base/timeutils.h" +#include "rtc_tools/network_tester/config_reader.h" +#include "rtc_tools/network_tester/test_controller.h" namespace webrtc { diff --git a/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h index 78c3ab8b80..b2f3901e1e 100644 --- a/rtc_tools/network_tester/packet_sender.h +++ b/rtc_tools/network_tester/packet_sender.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ -#define WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ +#ifndef RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ +#define RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h" +#include "rtc_tools/network_tester/network_tester_packet.pb.h" RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else @@ -62,4 +62,4 @@ class PacketSender { } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ +#endif // RTC_TOOLS_NETWORK_TESTER_PACKET_SENDER_H_ diff --git a/rtc_tools/network_tester/server.cc b/rtc_tools/network_tester/server.cc index c358f39e49..6edd9f958f 100644 --- a/rtc_tools/network_tester/server.cc +++ b/rtc_tools/network_tester/server.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/network_tester/test_controller.h" +#include "rtc_tools/network_tester/test_controller.h" int main() { webrtc::TestController server(9090, 9090, "server_config.dat", diff --git a/rtc_tools/network_tester/test_controller.cc b/rtc_tools/network_tester/test_controller.cc index 45b1de236e..908e6954ce 100644 --- a/rtc_tools/network_tester/test_controller.cc +++ b/rtc_tools/network_tester/test_controller.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/network_tester/test_controller.h" +#include "rtc_tools/network_tester/test_controller.h" namespace webrtc { diff --git a/rtc_tools/network_tester/test_controller.h b/rtc_tools/network_tester/test_controller.h index 870ca47548..4c9ede18ae 100644 --- a/rtc_tools/network_tester/test_controller.h +++ b/rtc_tools/network_tester/test_controller.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ -#define WEBRTC_RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ +#ifndef RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ +#define RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ #include #include @@ -17,16 +17,16 @@ #include #include -#include "webrtc/p2p/base/basicpacketsocketfactory.h" -#include "webrtc/p2p/base/udptransport.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/ignore_wundef.h" -#include "webrtc/rtc_tools/network_tester/packet_logger.h" -#include "webrtc/rtc_tools/network_tester/packet_sender.h" +#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/udptransport.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/ignore_wundef.h" +#include "rtc_tools/network_tester/packet_logger.h" +#include "rtc_tools/network_tester/packet_sender.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() -#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h" +#include "rtc_tools/network_tester/network_tester_packet.pb.h" RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else @@ -78,4 +78,4 @@ class TestController : public sigslot::has_slots<> { } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ +#endif // RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ diff --git a/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc index b20875ad51..ac1c8d997a 100644 --- a/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc +++ b/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc @@ -16,8 +16,8 @@ #include #include -#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/frame_analyzer/video_quality_analysis.h" +#include "rtc_tools/simple_command_line_parser.h" #define MAX_NUM_FRAMES_PER_FILE INT_MAX diff --git a/rtc_tools/sanitizers_unittest.cc b/rtc_tools/sanitizers_unittest.cc index 74cb081efa..4cdf5fd56f 100644 --- a/rtc_tools/sanitizers_unittest.cc +++ b/rtc_tools/sanitizers_unittest.cc @@ -12,11 +12,11 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/nullsocketserver.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/checks.h" +#include "rtc_base/nullsocketserver.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/thread.h" +#include "test/gtest.h" namespace rtc { diff --git a/rtc_tools/simple_command_line_parser.cc b/rtc_tools/simple_command_line_parser.cc index fae02ae246..b20ba6481f 100644 --- a/rtc_tools/simple_command_line_parser.cc +++ b/rtc_tools/simple_command_line_parser.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "rtc_tools/simple_command_line_parser.h" #include #include diff --git a/rtc_tools/simple_command_line_parser.h b/rtc_tools/simple_command_line_parser.h index 1137a74fed..0acaf9eb87 100644 --- a/rtc_tools/simple_command_line_parser.h +++ b/rtc_tools/simple_command_line_parser.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ -#define WEBRTC_RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ +#ifndef RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ +#define RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ #include #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/gtest_prod_util.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/gtest_prod_util.h" // This is a very basic command line parsing class. We pass the command line // arguments and their number and the class forms a vector out of these. Than we @@ -97,4 +97,4 @@ class CommandLineParser { } // namespace test } // namespace webrtc -#endif // WEBRTC_RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ +#endif // RTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_ diff --git a/rtc_tools/simple_command_line_parser_unittest.cc b/rtc_tools/simple_command_line_parser_unittest.cc index c71b472492..d98868aa2e 100644 --- a/rtc_tools/simple_command_line_parser_unittest.cc +++ b/rtc_tools/simple_command_line_parser_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/rtc_tools/simple_command_line_parser.h" +#include "test/gtest.h" +#include "rtc_tools/simple_command_line_parser.h" namespace webrtc { namespace test { diff --git a/rtc_tools/testing/README.md b/rtc_tools/testing/README.md index 7d5c774cf0..528b870345 100644 --- a/rtc_tools/testing/README.md +++ b/rtc_tools/testing/README.md @@ -20,7 +20,7 @@ Updating prebuilt_apprtc.zip: - Remove unneeded files: - `rm -rf .git node_modules browsers` - `zip -r prebuilt_apprtc.zip apprtc/` -- `mv prebuilt_apprtc.zip webrtc/src/webrtc/rtc_tools/testing/prebuilt_apprtc.zip` +- `mv prebuilt_apprtc.zip webrtc/src/rtc_tools/testing/prebuilt_apprtc.zip` Updating golang/*: @@ -32,7 +32,7 @@ Updating golang/*: After updating the archives: -- `cd webrtc/src/webrtc/rtc_tools/testing` +- `cd webrtc/src/rtc_tools/testing` - For each updated archive: - `upload_to_google_storage.py file.zip --bucket=chromium-webrtc-resources` - `git commit -a && git cl upload` diff --git a/rtc_tools/video_analysis.py b/rtc_tools/video_analysis.py index 1a7bb48a47..a5d267b0b2 100755 --- a/rtc_tools/video_analysis.py +++ b/rtc_tools/video_analysis.py @@ -408,7 +408,7 @@ def FlipAndCropRecordings(options, test_file_name, test_file_location, def CompareVideos(options, cropped_ref_file, cropped_test_file): - """Runs the compare_video.py script from src/webrtc/rtc_tools using path. + """Runs the compare_video.py script from src/rtc_tools using path. Uses the path from recording_result and writes the output to a file named in the reference video diff --git a/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java index 8127f8f48c..fd8f3b4102 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java @@ -86,7 +86,7 @@ public class FileVideoCapturerTest { final int FRAME_HEIGHT = 4; final FileVideoCapturer fileVideoCapturer = new FileVideoCapturer(Environment.getExternalStorageDirectory().getPath() - + "/chromium_tests_root/webrtc/sdk/android/instrumentationtests/src/org/webrtc/" + + "/chromium_tests_root/sdk/android/instrumentationtests/src/org/webrtc/" + "capturetestvideo.y4m"); final MockCapturerObserver capturerObserver = new MockCapturerObserver(); fileVideoCapturer.initialize(null, null, capturerObserver); diff --git a/sdk/android/src/jni/DEPS b/sdk/android/src/jni/DEPS index 382b4049d2..4ac0aac23d 100644 --- a/sdk/android/src/jni/DEPS +++ b/sdk/android/src/jni/DEPS @@ -1,15 +1,15 @@ include_rules = [ "+third_party/libyuv", - "+webrtc/call/callfactoryinterface.h", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h", - "+webrtc/media/base", - "+webrtc/media/engine", - "+webrtc/modules/audio_processing/include/audio_processing.h", - "+webrtc/modules/include", - "+webrtc/modules/utility/include/jvm_android.h", - "+webrtc/modules/video_coding", - "+webrtc/pc", - "+webrtc/system_wrappers/include", - "+webrtc/voice_engine/include/voe_base.h", + "+call/callfactoryinterface.h", + "+common_video", + "+logging/rtc_event_log/rtc_event_log_factory_interface.h", + "+media/base", + "+media/engine", + "+modules/audio_processing/include/audio_processing.h", + "+modules/include", + "+modules/utility/include/jvm_android.h", + "+modules/video_coding", + "+pc", + "+system_wrappers/include", + "+voice_engine/include/voe_base.h", ] diff --git a/sdk/android/src/jni/androidhistogram_jni.cc b/sdk/android/src/jni/androidhistogram_jni.cc index c21b346ba6..2b05d8d7b5 100644 --- a/sdk/android/src/jni/androidhistogram_jni.cc +++ b/sdk/android/src/jni/androidhistogram_jni.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "system_wrappers/include/metrics.h" // Enables collection of native histograms and creating them. namespace webrtc { diff --git a/sdk/android/src/jni/androidmediacodeccommon.h b/sdk/android/src/jni/androidmediacodeccommon.h index 08224ee029..62d4862615 100644 --- a/sdk/android/src/jni/androidmediacodeccommon.h +++ b/sdk/android/src/jni/androidmediacodeccommon.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ +#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ +#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ #include #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -86,4 +86,4 @@ static inline bool CheckException(JNIEnv* jni) { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ +#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ diff --git a/sdk/android/src/jni/androidmediadecoder_jni.cc b/sdk/android/src/jni/androidmediadecoder_jni.cc index dec35ec94e..4c14e32be4 100644 --- a/sdk/android/src/jni/androidmediadecoder_jni.cc +++ b/sdk/android/src/jni/androidmediadecoder_jni.cc @@ -15,25 +15,25 @@ // NOTICE: androidmediadecoder_jni.h must be included before // androidmediacodeccommon.h to avoid build errors. -#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" +#include "sdk/android/src/jni/androidmediadecoder_jni.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" -#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "common_video/include/i420_buffer_pool.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "sdk/android/src/jni/androidmediacodeccommon.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/native_handle_impl.h" +#include "sdk/android/src/jni/surfacetexturehelper_jni.h" using rtc::Bind; using rtc::Thread; diff --git a/sdk/android/src/jni/androidmediadecoder_jni.h b/sdk/android/src/jni/androidmediadecoder_jni.h index b971647c6c..bcdf9cc0cd 100644 --- a/sdk/android/src/jni/androidmediadecoder_jni.h +++ b/sdk/android/src/jni/androidmediadecoder_jni.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "media/engine/webrtcvideodecoderfactory.h" namespace webrtc { namespace jni { @@ -39,4 +39,4 @@ class MediaCodecVideoDecoderFactory } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_ diff --git a/sdk/android/src/jni/androidmediaencoder_jni.cc b/sdk/android/src/jni/androidmediaencoder_jni.cc index 7c40dac53d..db96366ce9 100644 --- a/sdk/android/src/jni/androidmediaencoder_jni.cc +++ b/sdk/android/src/jni/androidmediaencoder_jni.cc @@ -10,7 +10,7 @@ // NOTICE: androidmediaencoder_jni.h must be included before // androidmediacodeccommon.h to avoid build errors. -#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" +#include "sdk/android/src/jni/androidmediaencoder_jni.h" #include #include @@ -21,30 +21,30 @@ #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/common_video/h264/profile_level_id.h" -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/weak_ptr.h" -#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "common_video/h264/h264_common.h" +#include "common_video/h264/profile_level_id.h" +#include "media/engine/internalencoderfactory.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/quality_scaler.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/random.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/weak_ptr.h" +#include "sdk/android/src/jni/androidmediacodeccommon.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" +#include "system_wrappers/include/field_trial.h" using rtc::Bind; using rtc::Thread; diff --git a/sdk/android/src/jni/androidmediaencoder_jni.h b/sdk/android/src/jni/androidmediaencoder_jni.h index 4b3be4e598..06d1fb4884 100644 --- a/sdk/android/src/jni/androidmediaencoder_jni.h +++ b/sdk/android/src/jni/androidmediaencoder_jni.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ #include -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "media/engine/webrtcvideoencoderfactory.h" namespace webrtc { namespace jni { @@ -44,4 +44,4 @@ class MediaCodecVideoEncoderFactory } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ diff --git a/sdk/android/src/jni/androidmetrics_jni.cc b/sdk/android/src/jni/androidmetrics_jni.cc index a4eb33b363..cdcc2941bb 100644 --- a/sdk/android/src/jni/androidmetrics_jni.cc +++ b/sdk/android/src/jni/androidmetrics_jni.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" // Enables collection of native histograms and creating them. namespace webrtc { diff --git a/sdk/android/src/jni/androidnetworkmonitor_jni.h b/sdk/android/src/jni/androidnetworkmonitor_jni.h index c72b9d0ec6..d8a11aafb1 100644 --- a/sdk/android/src/jni/androidnetworkmonitor_jni.h +++ b/sdk/android/src/jni/androidnetworkmonitor_jni.h @@ -11,4 +11,4 @@ // TODO(deadbeef): Remove this file when clients are updated to new include // path. -#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" +#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" diff --git a/sdk/android/src/jni/androidvideotracksource.cc b/sdk/android/src/jni/androidvideotracksource.cc index 4c4e87e7b4..e5bfcafb77 100644 --- a/sdk/android/src/jni/androidvideotracksource.cc +++ b/sdk/android/src/jni/androidvideotracksource.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/androidvideotracksource.h" +#include "sdk/android/src/jni/androidvideotracksource.h" #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace { // MediaCodec wants resolution to be divisible by 2. diff --git a/sdk/android/src/jni/androidvideotracksource.h b/sdk/android/src/jni/androidvideotracksource.h index 3608d02747..fca4148148 100644 --- a/sdk/android/src/jni/androidvideotracksource.h +++ b/sdk/android/src/jni/androidvideotracksource.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ -#define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ +#ifndef API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ +#define API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ #include -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/media/base/adaptedvideotracksource.h" -#include "webrtc/rtc_base/asyncinvoker.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/timestampaligner.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" -#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" +#include "common_video/include/i420_buffer_pool.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "media/base/adaptedvideotracksource.h" +#include "rtc_base/asyncinvoker.h" +#include "rtc_base/checks.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timestampaligner.h" +#include "sdk/android/src/jni/native_handle_impl.h" +#include "sdk/android/src/jni/surfacetexturehelper_jni.h" namespace webrtc { namespace jni { @@ -93,4 +93,4 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource { } // namespace jni } // namespace webrtc -#endif // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ +#endif // API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ diff --git a/sdk/android/src/jni/androidvideotracksource_jni.cc b/sdk/android/src/jni/androidvideotracksource_jni.cc index fc9f3b2bff..ae49e89d7e 100644 --- a/sdk/android/src/jni/androidvideotracksource_jni.cc +++ b/sdk/android/src/jni/androidvideotracksource_jni.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/androidvideotracksource.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "api/video/video_rotation.h" +#include "api/videosourceproxy.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/androidvideotracksource.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { diff --git a/sdk/android/src/jni/classreferenceholder.cc b/sdk/android/src/jni/classreferenceholder.cc index 7648798f0d..1319f4cc2b 100644 --- a/sdk/android/src/jni/classreferenceholder.cc +++ b/sdk/android/src/jni/classreferenceholder.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/classreferenceholder.h b/sdk/android/src/jni/classreferenceholder.h index 646725ac39..7d8658b611 100644 --- a/sdk/android/src/jni/classreferenceholder.h +++ b/sdk/android/src/jni/classreferenceholder.h @@ -13,8 +13,8 @@ // stack. Consequently, we only look up all classes once in app/webrtc. // http://developer.android.com/training/articles/perf-jni.html#faq_FindClass -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ +#ifndef SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ +#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ #include #include @@ -43,4 +43,4 @@ using webrtc::jni::FreeGlobalClassReferenceHolder; } // namespace webrtc_jni -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ +#endif // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_ diff --git a/sdk/android/src/jni/filevideocapturer_jni.cc b/sdk/android/src/jni/filevideocapturer_jni.cc index 059dbeffc6..b5b5c552c2 100644 --- a/sdk/android/src/jni/filevideocapturer_jni.cc +++ b/sdk/android/src/jni/filevideocapturer_jni.cc @@ -11,8 +11,8 @@ #include #include "third_party/libyuv/include/libyuv/convert_from.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc index 3a34ba3728..ffab3331f2 100644 --- a/sdk/android/src/jni/jni_common.cc +++ b/sdk/android/src/jni/jni_common.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/refcount.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc_jni { diff --git a/sdk/android/src/jni/jni_helpers.cc b/sdk/android/src/jni/jni_helpers.cc index 03847666da..5628bfaa2d 100644 --- a/sdk/android/src/jni/jni_helpers.cc +++ b/sdk/android/src/jni/jni_helpers.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/jni_helpers.h" #include #include @@ -15,7 +15,7 @@ #include #include -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/jni_helpers.h b/sdk/android/src/jni/jni_helpers.h index 83f2155c70..252cfd099a 100644 --- a/sdk/android/src/jni/jni_helpers.h +++ b/sdk/android/src/jni/jni_helpers.h @@ -11,17 +11,17 @@ // This file contain convenience functions and classes for JNI. // Before using any of the methods, InitGlobalJniVariables must be called. -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ +#ifndef SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ +#define SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ #include #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/thread_checker.h" // Abort the process if |jni| has a Java exception pending. // This macros uses the comma operator to execute ExceptionDescribe @@ -226,4 +226,4 @@ using webrtc::jni::InitGlobalJniVariables; } // namespace webrtc_jni -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ +#endif // SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_ diff --git a/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc index 8794c12658..81cc4889c2 100644 --- a/sdk/android/src/jni/jni_onload.cc +++ b/sdk/android/src/jni/jni_onload.cc @@ -12,9 +12,9 @@ #undef JNIEXPORT #define JNIEXPORT __attribute__((visibility("default"))) -#include "webrtc/rtc_base/ssladapter.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/ssladapter.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/native_handle_impl.cc b/sdk/android/src/jni/native_handle_impl.cc index 910235cf07..30d107cb30 100644 --- a/sdk/android/src/jni/native_handle_impl.cc +++ b/sdk/android/src/jni/native_handle_impl.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "sdk/android/src/jni/native_handle_impl.h" #include -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "common_video/include/video_frame_buffer.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/wrapped_native_i420_buffer.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/native_handle_impl.h b/sdk/android/src/jni/native_handle_impl.h index 3ad1b6a0fa..10c0d19727 100644 --- a/sdk/android/src/jni/native_handle_impl.h +++ b/sdk/android/src/jni/native_handle_impl.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ +#ifndef SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ +#define SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/rtc_base/callback.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "rtc_base/callback.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -194,4 +194,4 @@ class JavaVideoFrameFactory { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ +#endif // SDK_ANDROID_SRC_JNI_NATIVE_HANDLE_IMPL_H_ diff --git a/sdk/android/src/jni/nv12buffer_jni.cc b/sdk/android/src/jni/nv12buffer_jni.cc index 37eb335785..bc11b9390c 100644 --- a/sdk/android/src/jni/nv12buffer_jni.cc +++ b/sdk/android/src/jni/nv12buffer_jni.cc @@ -14,7 +14,7 @@ #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/nv21buffer_jni.cc b/sdk/android/src/jni/nv21buffer_jni.cc index f8ab903f7b..2e107d7cbc 100644 --- a/sdk/android/src/jni/nv21buffer_jni.cc +++ b/sdk/android/src/jni/nv21buffer_jni.cc @@ -14,8 +14,8 @@ #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc index c0f6bd5ce7..662f6cb9c5 100644 --- a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc +++ b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" +#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" #include // This was added in Lollipop to dlfcn.h #define RTLD_NOLOAD 4 -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ipaddress.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/ipaddress.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h index 71f2528d76..70e3acd17b 100644 --- a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h +++ b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ #include #include #include #include -#include "webrtc/rtc_base/networkmonitor.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/thread_checker.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -104,4 +104,4 @@ using webrtc::jni::AndroidNetworkMonitorFactory; } // namespace webrtc_jni -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_ diff --git a/sdk/android/src/jni/pc/audio_jni.cc b/sdk/android/src/jni/pc/audio_jni.cc index 6bd7df5240..cc73ea2a21 100644 --- a/sdk/android/src/jni/pc/audio_jni.cc +++ b/sdk/android/src/jni/pc/audio_jni.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/audio_jni.h" +#include "sdk/android/src/jni/pc/audio_jni.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/audio_jni.h b/sdk/android/src/jni/pc/audio_jni.h index 477054ebde..06d2c3dca9 100644 --- a/sdk/android/src/jni/pc/audio_jni.h +++ b/sdk/android/src/jni/pc/audio_jni.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ // Adding 'nogncheck' to disable the gn include headers check. // We don't want this target depend on audio related targets -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" // nogncheck -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" // nogncheck -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_decoder_factory.h" // nogncheck +#include "api/audio_codecs/audio_encoder_factory.h" // nogncheck +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace jni { @@ -27,4 +27,4 @@ rtc::scoped_refptr CreateAudioEncoderFactory(); } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_AUDIO_JNI_H_ diff --git a/sdk/android/src/jni/pc/audiotrack_jni.cc b/sdk/android/src/jni/pc/audiotrack_jni.cc index 99a272be8f..9662a6872c 100644 --- a/sdk/android/src/jni/pc/audiotrack_jni.cc +++ b/sdk/android/src/jni/pc/audiotrack_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/mediastreaminterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc b/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc index 739dcaa031..868e4a8a95 100644 --- a/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc +++ b/sdk/android/src/jni/pc/callsessionfilerotatinglogsink_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/logsinks.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/logsinks.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/datachannel_jni.cc b/sdk/android/src/jni/pc/datachannel_jni.cc index ba28f9bc00..a4e3cb631a 100644 --- a/sdk/android/src/jni/pc/datachannel_jni.cc +++ b/sdk/android/src/jni/pc/datachannel_jni.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h" +#include "api/datachannelinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/datachannelobserver_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/datachannelobserver_jni.cc b/sdk/android/src/jni/pc/datachannelobserver_jni.cc index 32bbab0138..1ca8932e0e 100644 --- a/sdk/android/src/jni/pc/datachannelobserver_jni.cc +++ b/sdk/android/src/jni/pc/datachannelobserver_jni.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h" +#include "sdk/android/src/jni/pc/datachannelobserver_jni.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/datachannelobserver_jni.h b/sdk/android/src/jni/pc/datachannelobserver_jni.h index a9106a2838..dcea9dec55 100644 --- a/sdk/android/src/jni/pc/datachannelobserver_jni.h +++ b/sdk/android/src/jni/pc/datachannelobserver_jni.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/datachannelinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -41,4 +41,4 @@ class DataChannelObserverJni : public DataChannelObserver { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_DATACHANNELOBSERVER_JNI_H_ diff --git a/sdk/android/src/jni/pc/dtmfsender_jni.cc b/sdk/android/src/jni/pc/dtmfsender_jni.cc index 20c0ea78f5..a21314a112 100644 --- a/sdk/android/src/jni/pc/dtmfsender_jni.cc +++ b/sdk/android/src/jni/pc/dtmfsender_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/dtmfsenderinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/dtmfsenderinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/java_native_conversion.cc b/sdk/android/src/jni/pc/java_native_conversion.cc index 1d1a2e5c07..e500f342d2 100644 --- a/sdk/android/src/jni/pc/java_native_conversion.cc +++ b/sdk/android/src/jni/pc/java_native_conversion.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" #include -#include "webrtc/pc/webrtcsdp.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "pc/webrtcsdp.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/java_native_conversion.h b/sdk/android/src/jni/pc/java_native_conversion.h index dc91c135ae..73e1eef79e 100644 --- a/sdk/android/src/jni/pc/java_native_conversion.h +++ b/sdk/android/src/jni/pc/java_native_conversion.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ +#define SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ #include -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/api/jsep.h" -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/api/mediatypes.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/rtpparameters.h" -#include "webrtc/rtc_base/sslidentity.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/datachannelinterface.h" +#include "api/jsep.h" +#include "api/jsepicecandidate.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/peerconnectioninterface.h" +#include "api/rtpparameters.h" +#include "rtc_base/sslidentity.h" +#include "sdk/android/src/jni/jni_helpers.h" // This file contains helper methods for converting between simple C++ and Java // PeerConnection-related structures. Similar to some methods in jni_helpers.h, @@ -108,4 +108,4 @@ jobject NativeToJavaRtpParameters(JNIEnv* jni, const RtpParameters& parameters); } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_JAVA_NATIVE_CONVERSION_H_ diff --git a/sdk/android/src/jni/pc/logging_jni.cc b/sdk/android/src/jni/pc/logging_jni.cc index e71670a10c..2b3d9d62c9 100644 --- a/sdk/android/src/jni/pc/logging_jni.cc +++ b/sdk/android/src/jni/pc/logging_jni.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/system_wrappers/include/logcat_trace_context.h" -#include "webrtc/system_wrappers/include/trace.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "system_wrappers/include/logcat_trace_context.h" +#include "system_wrappers/include/trace.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/media_jni.cc b/sdk/android/src/jni/pc/media_jni.cc index 8d8b6b9fdb..ec8ab4927d 100644 --- a/sdk/android/src/jni/pc/media_jni.cc +++ b/sdk/android/src/jni/pc/media_jni.cc @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/media_jni.h" +#include "sdk/android/src/jni/pc/media_jni.h" -#include "webrtc/call/callfactoryinterface.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "webrtc/media/engine/webrtcmediaengine.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "call/callfactoryinterface.h" +#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "media/engine/webrtcmediaengine.h" +#include "modules/audio_processing/include/audio_processing.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/media_jni.h b/sdk/android/src/jni/pc/media_jni.h index 02c3a80a28..64afac440b 100644 --- a/sdk/android/src/jni/pc/media_jni.h +++ b/sdk/android/src/jni/pc/media_jni.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { class AudioDeviceModule; @@ -45,4 +45,4 @@ cricket::MediaEngineInterface* CreateMediaEngine( } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_ diff --git a/sdk/android/src/jni/pc/mediaconstraints_jni.cc b/sdk/android/src/jni/pc/mediaconstraints_jni.cc index f36401dd0e..5f0b1d54cb 100644 --- a/sdk/android/src/jni/pc/mediaconstraints_jni.cc +++ b/sdk/android/src/jni/pc/mediaconstraints_jni.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h" +#include "sdk/android/src/jni/pc/mediaconstraints_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/mediaconstraints_jni.h b/sdk/android/src/jni/pc/mediaconstraints_jni.h index 98282344e2..ec21f43df7 100644 --- a/sdk/android/src/jni/pc/mediaconstraints_jni.h +++ b/sdk/android/src/jni/pc/mediaconstraints_jni.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/mediaconstraintsinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -42,4 +42,4 @@ class MediaConstraintsJni : public MediaConstraintsInterface { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_JNI_H_ diff --git a/sdk/android/src/jni/pc/mediasource_jni.cc b/sdk/android/src/jni/pc/mediasource_jni.cc index 6c3c230d1c..e753223778 100644 --- a/sdk/android/src/jni/pc/mediasource_jni.cc +++ b/sdk/android/src/jni/pc/mediasource_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/mediastreaminterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/mediastream_jni.cc b/sdk/android/src/jni/pc/mediastream_jni.cc index 74dc2c5f41..a56802ada8 100644 --- a/sdk/android/src/jni/pc/mediastream_jni.cc +++ b/sdk/android/src/jni/pc/mediastream_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/mediastreaminterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/mediastreamtrack_jni.cc b/sdk/android/src/jni/pc/mediastreamtrack_jni.cc index e5af8659df..f570881001 100644 --- a/sdk/android/src/jni/pc/mediastreamtrack_jni.cc +++ b/sdk/android/src/jni/pc/mediastreamtrack_jni.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/mediastreaminterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/null_audio_jni.cc b/sdk/android/src/jni/pc/null_audio_jni.cc index 85c97980cf..7c508f5ceb 100644 --- a/sdk/android/src/jni/pc/null_audio_jni.cc +++ b/sdk/android/src/jni/pc/null_audio_jni.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/audio_jni.h" +#include "sdk/android/src/jni/pc/audio_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/null_media_jni.cc b/sdk/android/src/jni/pc/null_media_jni.cc index 2f2ff6d4af..1c44db065e 100644 --- a/sdk/android/src/jni/pc/null_media_jni.cc +++ b/sdk/android/src/jni/pc/null_media_jni.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/media_jni.h" +#include "sdk/android/src/jni/pc/media_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/null_video_jni.cc b/sdk/android/src/jni/pc/null_video_jni.cc index b9bf8de92f..818cc9cd32 100644 --- a/sdk/android/src/jni/pc/null_video_jni.cc +++ b/sdk/android/src/jni/pc/null_video_jni.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/video_jni.h" +#include "sdk/android/src/jni/pc/video_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/ownedfactoryandthreads.cc b/sdk/android/src/jni/pc/ownedfactoryandthreads.cc index 062270cd99..39e2bd920b 100644 --- a/sdk/android/src/jni/pc/ownedfactoryandthreads.cc +++ b/sdk/android/src/jni/pc/ownedfactoryandthreads.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h" +#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/ownedfactoryandthreads.h b/sdk/android/src/jni/pc/ownedfactoryandthreads.h index ce69c121d5..c73d7d7fd8 100644 --- a/sdk/android/src/jni/pc/ownedfactoryandthreads.h +++ b/sdk/android/src/jni/pc/ownedfactoryandthreads.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ +#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/rtc_base/thread.h" +#include "api/peerconnectioninterface.h" +#include "rtc_base/thread.h" using cricket::WebRtcVideoDecoderFactory; using cricket::WebRtcVideoEncoderFactory; @@ -78,4 +78,4 @@ class OwnedFactoryAndThreads { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_ diff --git a/sdk/android/src/jni/pc/peerconnection_jni.cc b/sdk/android/src/jni/pc/peerconnection_jni.cc index 1e83435acc..7cb693eae1 100644 --- a/sdk/android/src/jni/pc/peerconnection_jni.cc +++ b/sdk/android/src/jni/pc/peerconnection_jni.cc @@ -29,21 +29,21 @@ #include #include -#include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" -#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h" -#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h" -#include "webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h" -#include "webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h" -#include "webrtc/sdk/android/src/jni/pc/statsobserver_jni.h" -#include "webrtc/system_wrappers/include/trace.h" +#include "api/mediaconstraintsinterface.h" +#include "api/peerconnectioninterface.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/pc/mediaconstraints_jni.h" +#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h" +#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h" +#include "sdk/android/src/jni/pc/sdpobserver_jni.h" +#include "sdk/android/src/jni/pc/statsobserver_jni.h" +#include "system_wrappers/include/trace.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc index e9e8020248..d1aea833fb 100644 --- a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc +++ b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc @@ -11,26 +11,26 @@ #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/media/base/mediaengine.h" -#include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/rtc_base/event_tracer.h" -#include "webrtc/rtc_base/stringutils.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" -#include "webrtc/sdk/android/src/jni/pc/audio_jni.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" -#include "webrtc/sdk/android/src/jni/pc/media_jni.h" -#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h" -#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h" -#include "webrtc/sdk/android/src/jni/pc/video_jni.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/peerconnectioninterface.h" +#include "media/base/mediaengine.h" +#include "modules/utility/include/jvm_android.h" +#include "rtc_base/event_tracer.h" +#include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/androidnetworkmonitor_jni.h" +#include "sdk/android/src/jni/pc/audio_jni.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/pc/media_jni.h" +#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h" +#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h" +#include "sdk/android/src/jni/pc/video_jni.h" +#include "system_wrappers/include/field_trial.h" // Adding 'nogncheck' to disable the gn include headers check. // We don't want to depend on 'system_wrappers:field_trial_default' because // clients should be able to provide their own implementation. -#include "webrtc/system_wrappers/include/field_trial_default.h" // nogncheck -#include "webrtc/system_wrappers/include/trace.h" +#include "system_wrappers/include/field_trial_default.h" // nogncheck +#include "system_wrappers/include/trace.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc b/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc index d65c95c2c5..a2f979169e 100644 --- a/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc +++ b/sdk/android/src/jni/pc/peerconnectionobserver_jni.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h" +#include "sdk/android/src/jni/pc/peerconnectionobserver_jni.h" #include -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/peerconnectionobserver_jni.h b/sdk/android/src/jni/pc/peerconnectionobserver_jni.h index d543b35e15..eaf7f435cf 100644 --- a/sdk/android/src/jni/pc/peerconnectionobserver_jni.h +++ b/sdk/android/src/jni/pc/peerconnectionobserver_jni.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ #include #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h" +#include "api/peerconnectioninterface.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/mediaconstraints_jni.h" namespace webrtc { namespace jni { @@ -92,4 +92,4 @@ class PeerConnectionObserverJni : public PeerConnectionObserver { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ diff --git a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc index 5be96f575b..f383b4d154 100644 --- a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc +++ b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h" +#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h" #include #include -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h index 57270745e1..3a86f98fe2 100644 --- a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h +++ b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ +#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/peerconnectioninterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -61,4 +61,4 @@ class RTCStatsCollectorCallbackWrapper : public RTCStatsCollectorCallback { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_ diff --git a/sdk/android/src/jni/pc/rtpreceiver_jni.cc b/sdk/android/src/jni/pc/rtpreceiver_jni.cc index 2a4ed951c9..521ea60007 100644 --- a/sdk/android/src/jni/pc/rtpreceiver_jni.cc +++ b/sdk/android/src/jni/pc/rtpreceiver_jni.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" -#include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h" +#include "api/rtpreceiverinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/pc/rtpreceiverobserver_jni.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc index 89a348f4c1..8e900631da 100644 --- a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc +++ b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h" +#include "sdk/android/src/jni/pc/rtpreceiverobserver_jni.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h index ef58f9728f..c6455338e8 100644 --- a/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h +++ b/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/rtpreceiverinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -36,4 +36,4 @@ class RtpReceiverObserverJni : public RtpReceiverObserverInterface { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVEROBSERVER_JNI_H_ diff --git a/sdk/android/src/jni/pc/rtpsender_jni.cc b/sdk/android/src/jni/pc/rtpsender_jni.cc index 8cd1dcc7fe..e307480e49 100644 --- a/sdk/android/src/jni/pc/rtpsender_jni.cc +++ b/sdk/android/src/jni/pc/rtpsender_jni.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" +#include "api/rtpsenderinterface.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/java_native_conversion.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/sdpobserver_jni.h b/sdk/android/src/jni/pc/sdpobserver_jni.h index 14b9575e5f..b330b69fc8 100644 --- a/sdk/android/src/jni/pc/sdpobserver_jni.h +++ b/sdk/android/src/jni/pc/sdpobserver_jni.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ #include #include -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h" +#include "api/peerconnectioninterface.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/pc/mediaconstraints_jni.h" namespace webrtc { namespace jni { @@ -106,4 +106,4 @@ class SetSdpObserverJni : public SdpObserverJni { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_ diff --git a/sdk/android/src/jni/pc/statsobserver_jni.cc b/sdk/android/src/jni/pc/statsobserver_jni.cc index f72d1ae901..1c7f873690 100644 --- a/sdk/android/src/jni/pc/statsobserver_jni.cc +++ b/sdk/android/src/jni/pc/statsobserver_jni.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/pc/statsobserver_jni.h" +#include "sdk/android/src/jni/pc/statsobserver_jni.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/statsobserver_jni.h b/sdk/android/src/jni/pc/statsobserver_jni.h index 15430407ea..d1e2224567 100644 --- a/sdk/android/src/jni/pc/statsobserver_jni.h +++ b/sdk/android/src/jni/pc/statsobserver_jni.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "api/peerconnectioninterface.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -41,4 +41,4 @@ class StatsObserverJni : public StatsObserver { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_JNI_H_ diff --git a/sdk/android/src/jni/pc/video_jni.cc b/sdk/android/src/jni/pc/video_jni.cc index 3172b132ce..c7eb35295d 100644 --- a/sdk/android/src/jni/pc/video_jni.cc +++ b/sdk/android/src/jni/pc/video_jni.cc @@ -10,18 +10,18 @@ #include -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" -#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" -#include "webrtc/sdk/android/src/jni/androidvideotracksource.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h" -#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" -#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h" -#include "webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h" +#include "api/videosourceproxy.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/androidmediadecoder_jni.h" +#include "sdk/android/src/jni/androidmediaencoder_jni.h" +#include "sdk/android/src/jni/androidvideotracksource.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h" +#include "sdk/android/src/jni/surfacetexturehelper_jni.h" +#include "sdk/android/src/jni/videodecoderfactorywrapper.h" +#include "sdk/android/src/jni/videoencoderfactorywrapper.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/pc/video_jni.h b/sdk/android/src/jni/pc/video_jni.h index 016ce0a11a..0c2ccdae09 100644 --- a/sdk/android/src/jni/pc/video_jni.h +++ b/sdk/android/src/jni/pc/video_jni.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ +#define SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ #include -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/scoped_ref_ptr.h" namespace cricket { class WebRtcVideoEncoderFactory; @@ -39,4 +39,4 @@ jobject GetJavaSurfaceTextureHelper( } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_PC_VIDEO_JNI_H_ diff --git a/sdk/android/src/jni/surfacetexturehelper_jni.cc b/sdk/android/src/jni/surfacetexturehelper_jni.cc index cfc2904b16..9a97adcdc2 100644 --- a/sdk/android/src/jni/surfacetexturehelper_jni.cc +++ b/sdk/android/src/jni/surfacetexturehelper_jni.cc @@ -9,12 +9,12 @@ */ -#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" +#include "sdk/android/src/jni/surfacetexturehelper_jni.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/surfacetexturehelper_jni.h b/sdk/android/src/jni/surfacetexturehelper_jni.h index 82e36cfb5f..f96c893392 100644 --- a/sdk/android/src/jni/surfacetexturehelper_jni.h +++ b/sdk/android/src/jni/surfacetexturehelper_jni.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ +#ifndef SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ +#define SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ #include -#include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/rtc_base/refcount.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "api/video/video_frame_buffer.h" +#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" namespace webrtc { namespace jni { @@ -67,4 +67,4 @@ class SurfaceTextureHelper : public rtc::RefCountInterface { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ +#endif // SDK_ANDROID_SRC_JNI_SURFACETEXTUREHELPER_JNI_H_ diff --git a/sdk/android/src/jni/video_renderer_jni.cc b/sdk/android/src/jni/video_renderer_jni.cc index 07244bc6a8..4bd51593d8 100644 --- a/sdk/android/src/jni/video_renderer_jni.cc +++ b/sdk/android/src/jni/video_renderer_jni.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "api/video/video_frame.h" +#include "media/base/videosinkinterface.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videodecoderfactorywrapper.cc b/sdk/android/src/jni/videodecoderfactorywrapper.cc index dba8fe2b5b..dc2e954359 100644 --- a/sdk/android/src/jni/videodecoderfactorywrapper.cc +++ b/sdk/android/src/jni/videodecoderfactorywrapper.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h" +#include "sdk/android/src/jni/videodecoderfactorywrapper.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h" +#include "api/video_codecs/video_decoder.h" +#include "common_types.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/videodecoderwrapper.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videodecoderfactorywrapper.h b/sdk/android/src/jni/videodecoderfactorywrapper.h index 43c86cbd29..99f495d22c 100644 --- a/sdk/android/src/jni/videodecoderfactorywrapper.h +++ b/sdk/android/src/jni/videodecoderfactorywrapper.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ +#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ +#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ #include -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "media/engine/webrtcvideodecoderfactory.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -38,4 +38,4 @@ class VideoDecoderFactoryWrapper : public cricket::WebRtcVideoDecoderFactory { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ +#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_ diff --git a/sdk/android/src/jni/videodecoderwrapper.cc b/sdk/android/src/jni/videodecoderwrapper.cc index 23a83141b3..4dfbf93db9 100644 --- a/sdk/android/src/jni/videodecoderwrapper.cc +++ b/sdk/android/src/jni/videodecoderwrapper.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h" +#include "sdk/android/src/jni/videodecoderwrapper.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "api/video/video_frame.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videodecoderwrapper.h b/sdk/android/src/jni/videodecoderwrapper.h index c737456a0d..2da6892525 100644 --- a/sdk/android/src/jni/videodecoderwrapper.h +++ b/sdk/android/src/jni/videodecoderwrapper.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ +#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ +#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ #include #include -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "api/video_codecs/video_decoder.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" namespace webrtc { namespace jni { @@ -118,4 +118,4 @@ class VideoDecoderWrapper : public VideoDecoder { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ +#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_ diff --git a/sdk/android/src/jni/videoencoderfactorywrapper.cc b/sdk/android/src/jni/videoencoderfactorywrapper.cc index 138d8630f5..c33edbb8f0 100644 --- a/sdk/android/src/jni/videoencoderfactorywrapper.cc +++ b/sdk/android/src/jni/videoencoderfactorywrapper.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h" +#include "sdk/android/src/jni/videoencoderfactorywrapper.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/videoencoderwrapper.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/videoencoderwrapper.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videoencoderfactorywrapper.h b/sdk/android/src/jni/videoencoderfactorywrapper.h index 03d054dbb8..509f51b7b3 100644 --- a/sdk/android/src/jni/videoencoderfactorywrapper.h +++ b/sdk/android/src/jni/videoencoderfactorywrapper.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ +#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ +#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ #include #include -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { @@ -62,4 +62,4 @@ class VideoEncoderFactoryWrapper : public cricket::WebRtcVideoEncoderFactory { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ +#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_ diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc index 2b87d67c0b..ceecda2bf2 100644 --- a/sdk/android/src/jni/videoencoderwrapper.cc +++ b/sdk/android/src/jni/videoencoderwrapper.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/videoencoderwrapper.h" +#include "sdk/android/src/jni/videoencoderwrapper.h" #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" +#include "common_video/h264/h264_common.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "rtc_base/logging.h" +#include "rtc_base/random.h" +#include "rtc_base/timeutils.h" +#include "sdk/android/src/jni/classreferenceholder.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videoencoderwrapper.h b/sdk/android/src/jni/videoencoderwrapper.h index afda8d2731..4468fcb22f 100644 --- a/sdk/android/src/jni/videoencoderwrapper.h +++ b/sdk/android/src/jni/videoencoderwrapper.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ +#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ +#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ #include #include #include #include -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "api/video_codecs/video_encoder.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" +#include "rtc_base/task_queue.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" namespace webrtc { namespace jni { @@ -145,4 +145,4 @@ class VideoEncoderWrapper : public VideoEncoder { } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ +#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_ diff --git a/sdk/android/src/jni/videofilerenderer_jni.cc b/sdk/android/src/jni/videofilerenderer_jni.cc index 638994da24..8effd9d13f 100644 --- a/sdk/android/src/jni/videofilerenderer_jni.cc +++ b/sdk/android/src/jni/videofilerenderer_jni.cc @@ -11,8 +11,8 @@ #include #include "third_party/libyuv/include/libyuv/scale.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videoframe_jni.cc b/sdk/android/src/jni/videoframe_jni.cc index f6ba46fb3d..7533f9c6b2 100644 --- a/sdk/android/src/jni/videoframe_jni.cc +++ b/sdk/android/src/jni/videoframe_jni.cc @@ -12,7 +12,7 @@ #include "libyuv/scale.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/videotrack_jni.cc b/sdk/android/src/jni/videotrack_jni.cc index ed22c54e45..0da609f290 100644 --- a/sdk/android/src/jni/videotrack_jni.cc +++ b/sdk/android/src/jni/videotrack_jni.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/api/mediastreaminterface.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "api/mediastreaminterface.h" +#include "rtc_base/logging.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/native_handle_impl.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/wrapped_native_i420_buffer.cc b/sdk/android/src/jni/wrapped_native_i420_buffer.cc index 1f26a83091..2a09bafa4b 100644 --- a/sdk/android/src/jni/wrapped_native_i420_buffer.cc +++ b/sdk/android/src/jni/wrapped_native_i420_buffer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/android/src/jni/wrapped_native_i420_buffer.h" +#include "sdk/android/src/jni/wrapped_native_i420_buffer.h" -#include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/sdk/android/src/jni/jni_helpers.h" +#include "sdk/android/src/jni/classreferenceholder.h" +#include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { namespace jni { diff --git a/sdk/android/src/jni/wrapped_native_i420_buffer.h b/sdk/android/src/jni/wrapped_native_i420_buffer.h index 024287799e..5de98d81cc 100644 --- a/sdk/android/src/jni/wrapped_native_i420_buffer.h +++ b/sdk/android/src/jni/wrapped_native_i420_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ -#define WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ +#ifndef SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ +#define SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ #include -#include "webrtc/api/video/video_frame_buffer.h" +#include "api/video/video_frame_buffer.h" namespace webrtc { namespace jni { @@ -27,4 +27,4 @@ jobject WrapI420Buffer( } // namespace jni } // namespace webrtc -#endif // WEBRTC_SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ +#endif // SDK_ANDROID_SRC_JNI_WRAPPED_NATIVE_I420_BUFFER_H_ diff --git a/sdk/objc/DEPS b/sdk/objc/DEPS index eea7e4ffc9..634cabeee0 100644 --- a/sdk/objc/DEPS +++ b/sdk/objc/DEPS @@ -7,12 +7,12 @@ include_rules = [ "+PeerConnection", "+VideoToolbox", "+Metal", - "+webrtc/api", - "+webrtc/common_video/h264", - "+webrtc/common_video/include", - "+webrtc/common_video/libyuv/include", - "+webrtc/media", - "+webrtc/modules/video_coding", - "+webrtc/pc", - "+webrtc/system_wrappers", + "+api", + "+common_video/h264", + "+common_video/include", + "+common_video/libyuv/include", + "+media", + "+modules/video_coding", + "+pc", + "+system_wrappers", ] \ No newline at end of file diff --git a/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h b/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h index 4c2727001d..8be8aadb0d 100644 --- a/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h +++ b/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" #include diff --git a/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm b/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm index 906f62725f..43575b9652 100644 --- a/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm +++ b/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm @@ -12,9 +12,9 @@ #import -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" #import "WebRTC/RTCAudioSessionConfiguration.h" #import "WebRTC/RTCLogging.h" diff --git a/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm index 854bc7caaf..c95bcb4a40 100644 --- a/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +++ b/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm @@ -17,7 +17,7 @@ // Adding 'nogncheck' to disable the gn include headers check. // We don't want to depend on 'system_wrappers:field_trial_default' because // clients should be able to provide their own implementation. -#include "webrtc/system_wrappers/include/field_trial_default.h" // nogncheck +#include "system_wrappers/include/field_trial_default.h" // nogncheck NSString * const kRTCFieldTrialAudioSendSideBweKey = @"WebRTC-Audio-SendSideBwe"; NSString * const kRTCFieldTrialSendSideBweWithOverheadKey = @"WebRTC-SendSideBwe-WithOverhead"; diff --git a/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm b/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm index 75d0621413..afe61a8327 100644 --- a/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm +++ b/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm @@ -12,10 +12,10 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/filerotatingstream.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/logsinks.h" +#include "rtc_base/checks.h" +#include "rtc_base/filerotatingstream.h" +#include "rtc_base/logging.h" +#include "rtc_base/logsinks.h" NSString *const kDefaultLogDirName = @"webrtc_logs"; NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB. diff --git a/sdk/objc/Framework/Classes/Common/RTCLogging.mm b/sdk/objc/Framework/Classes/Common/RTCLogging.mm index 7b8ca0a845..cdb6b18500 100644 --- a/sdk/objc/Framework/Classes/Common/RTCLogging.mm +++ b/sdk/objc/Framework/Classes/Common/RTCLogging.mm @@ -10,7 +10,7 @@ #import "WebRTC/RTCLogging.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" rtc::LoggingSeverity RTCGetNativeLoggingSeverity(RTCLoggingSeverity severity) { switch (severity) { diff --git a/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m index 7134773610..37554e719f 100644 --- a/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m +++ b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m @@ -14,7 +14,7 @@ #import -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @interface RTCUIApplicationStatusObserver () diff --git a/sdk/objc/Framework/Classes/Common/helpers.h b/sdk/objc/Framework/Classes/Common/helpers.h index fdcd9ccb56..ca56d51801 100644 --- a/sdk/objc/Framework/Classes/Common/helpers.h +++ b/sdk/objc/Framework/Classes/Common/helpers.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ #include @@ -73,4 +73,4 @@ bool GetLowPowerModeEnabled(); } // namespace ios } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_COMMON_HELPERS_H_ diff --git a/sdk/objc/Framework/Classes/Common/helpers.mm b/sdk/objc/Framework/Classes/Common/helpers.mm index 6b44c596a7..4afa15d11d 100644 --- a/sdk/objc/Framework/Classes/Common/helpers.mm +++ b/sdk/objc/Framework/Classes/Common/helpers.mm @@ -17,9 +17,9 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "sdk/objc/Framework/Classes/Common/helpers.h" namespace webrtc { namespace ios { diff --git a/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm b/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm index 1c60ecc31a..7fcba49a31 100644 --- a/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm +++ b/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm @@ -16,8 +16,8 @@ #import "WebRTC/RTCLogging.h" #import "WebRTC/RTCVideoFrame.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/rtc_base/checks.h" +#include "api/video/video_rotation.h" +#include "rtc_base/checks.h" // As defined in shaderSource. static NSString *const vertexFunctionName = @"vertexPassthrough"; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm index 07b1cb5cd4..310171d76b 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm @@ -10,7 +10,7 @@ #import "RTCAudioSource+Private.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCAudioSource { } diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h index ea14fb35ba..176d03faaa 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCAudioTrack.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm index d8a0d51f89..fffbd7cfe5 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm @@ -15,7 +15,7 @@ #import "RTCMediaStreamTrack+Private.h" #import "RTCPeerConnectionFactory+Private.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCAudioTrack diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h index 059651eff1..bf00d1870f 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCConfiguration.h" -#include "webrtc/api/peerconnectioninterface.h" +#include "api/peerconnectioninterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm index a71c571eee..b9a9e4b137 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm @@ -16,8 +16,8 @@ #import "RTCIntervalRange+Private.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/rtc_base/rtccertificategenerator.h" -#include "webrtc/rtc_base/sslidentity.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/sslidentity.h" @implementation RTCConfiguration diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h index 5017c2f1d6..ca806cafb9 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h @@ -10,8 +10,8 @@ #import "WebRTC/RTCDataChannel.h" -#include "webrtc/api/datachannelinterface.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/datachannelinterface.h" +#include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h index e9ea74705d..68d202280e 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCDataChannelConfiguration.h" -#include "webrtc/api/datachannelinterface.h" +#include "api/datachannelinterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm index 1c8a27bf43..fc76921ba3 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm @@ -12,7 +12,7 @@ #import "RTCVideoCodec+Private.h" -#include "webrtc/rtc_base/safe_conversions.h" +#include "rtc_base/safe_conversions.h" @implementation RTCEncodedImage diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h index b00c8da3a3..6c47a39853 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h @@ -12,7 +12,7 @@ #include -#include "webrtc/api/jsep.h" +#include "api/jsep.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h index 7efeda412f..19a845b3fe 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCIceServer.h" -#include "webrtc/api/peerconnectioninterface.h" +#include "api/peerconnectioninterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h index b95841393d..a80c99a1ae 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCIntervalRange.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/timeutils.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm index 40f5eb5c2e..0a861ea0d1 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm @@ -10,7 +10,7 @@ #import "RTCIntervalRange+Private.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCIntervalRange diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h index 67eb318830..111fc2b45e 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCLegacyStatsReport.h" -#include "webrtc/api/statstypes.h" +#include "api/statstypes.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm index 82b43f867f..89b205bf1c 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm @@ -13,7 +13,7 @@ #import "NSString+StdString.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCLegacyStatsReport diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h index 606a132da6..1955c8c265 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h @@ -12,7 +12,7 @@ #include -#include "webrtc/api/mediaconstraintsinterface.h" +#include "api/mediaconstraintsinterface.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h index 55d268a495..1656d16d75 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCMediaSource.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm index 956da1691c..0f8cadc07d 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm @@ -10,7 +10,7 @@ #import "RTCMediaSource+Private.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCMediaSource { RTCMediaSourceType _type; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h index 7f8707228d..1d0847c12c 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCMediaStream.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h index d5261266b8..cb93f116f0 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCMediaStreamTrack.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) { RTCMediaStreamTrackTypeAudio, diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h index 609fc74fe8..48451df46a 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h @@ -13,7 +13,7 @@ // Adding 'nogncheck' to disable the gn include headers check. // We don't want to depend on 'system_wrappers:metrics_default' because // clients should be able to provide their own implementation. -#include "webrtc/system_wrappers/include/metrics_default.h" // nogncheck +#include "system_wrappers/include/metrics_default.h" // nogncheck NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h index 60ab868a7c..e1017f5e8f 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCPeerConnection.h" -#include "webrtc/api/peerconnectioninterface.h" +#include "api/peerconnectioninterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm index 8e564653e2..fb16a31b3b 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm @@ -14,7 +14,7 @@ #import "RTCMediaStreamTrack+Private.h" #import "RTCLegacyStatsReport+Private.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm index c08503e1cb..e443e850da 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm @@ -25,8 +25,8 @@ #include -#include "webrtc/api/jsepicecandidate.h" -#include "webrtc/rtc_base/checks.h" +#include "api/jsepicecandidate.h" +#include "rtc_base/checks.h" NSString * const kRTCPeerConnectionErrorDomain = @"org.webrtc.RTCPeerConnection"; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h index fb3068aa8c..a4122de96f 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCPeerConnectionFactory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h index 1c53e643fa..1e5d1795f4 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h @@ -10,8 +10,8 @@ #import "WebRTC/RTCPeerConnectionFactory.h" -#include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/peerconnectioninterface.h" +#include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm index 48d788f192..a42d76044f 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm @@ -28,18 +28,18 @@ #import "WebRTC/RTCVideoCodecH264.h" // The no-media version PeerConnectionFactory doesn't depend on these files, but the gn check tool // is not smart enough to take the #ifdef into account. -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck +#include "api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck +#include "api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck #endif #include "Video/objcvideotracksource.h" -#include "webrtc/api/videosourceproxy.h" +#include "api/videosourceproxy.h" // Adding the nogncheck to disable the including header check. // The no-media version PeerConnectionFactory doesn't depend on media related // C++ target. // TODO(zhihuang): Remove nogncheck once MediaEngineInterface is moved to C++ // API layer. -#include "webrtc/media/engine/webrtcmediaengine.h" // nogncheck +#include "media/engine/webrtcmediaengine.h" // nogncheck @implementation RTCPeerConnectionFactory { std::unique_ptr _networkThread; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h index fe33e9e963..f33a8cf1be 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCRtpCodecParameters.h" -#include "webrtc/api/rtpparameters.h" +#include "api/rtpparameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm index 3e137b88ee..1a3bcf4dac 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm @@ -13,8 +13,8 @@ #import "NSString+StdString.h" #import "WebRTC/RTCMediaStreamTrack.h" // For "kind" strings. -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/rtc_base/checks.h" +#include "media/base/mediaconstants.h" +#include "rtc_base/checks.h" const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName); const NSString * const kRTCRedCodecName = @(cricket::kRedCodecName); diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h index 1d75268478..673a485689 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCRtpEncodingParameters.h" -#include "webrtc/api/rtpparameters.h" +#include "api/rtpparameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm index 541fd45bb6..87c88a49ec 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm @@ -10,7 +10,7 @@ #import "WebRTC/RTCVideoCodec.h" -#include "webrtc/modules/include/module_common_types.h" +#include "modules/include/module_common_types.h" @implementation RTCRtpFragmentationHeader diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h index 0cb1ffed81..4a0daaf88e 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCRtpParameters.h" -#include "webrtc/api/rtpparameters.h" +#include "api/rtpparameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h index 3dc0285d6b..98738114f3 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCRtpReceiver.h" -#include "webrtc/api/rtpreceiverinterface.h" +#include "api/rtpreceiverinterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm index ee10005f8b..0888f24b0a 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm @@ -15,7 +15,7 @@ #import "RTCRtpParameters+Private.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h index e372c52332..e70be8349e 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCRtpSender.h" -#include "webrtc/api/rtpsenderinterface.h" +#include "api/rtpsenderinterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm index 9ecf0ae5ae..e2195def70 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm @@ -15,7 +15,7 @@ #import "RTCRtpParameters+Private.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" @implementation RTCRtpSender { rtc::scoped_refptr _nativeRtpSender; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm index 4a14670e75..a64ff49c56 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm @@ -10,8 +10,8 @@ #import "WebRTC/RTCSSLAdapter.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ssladapter.h" +#include "rtc_base/checks.h" +#include "rtc_base/ssladapter.h" BOOL RTCInitializeSSL() { BOOL initialized = rtc::InitializeSSL(); diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h index 04b6fbe864..5811a5abc5 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCSessionDescription.h" -#include "webrtc/api/jsep.h" +#include "api/jsep.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm index 66a1186c44..5748b65450 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm @@ -13,7 +13,7 @@ #import "NSString+StdString.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" @implementation RTCSessionDescription diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm index f742e47ce0..f29c161d96 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm @@ -10,7 +10,7 @@ #import "WebRTC/RTCTracing.h" -#include "webrtc/rtc_base/event_tracer.h" +#include "rtc_base/event_tracer.h" void RTCSetupInternalTracer() { rtc::tracing::SetupInternalTracer(); diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h index e783126d89..1edaf15a9c 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h @@ -12,9 +12,9 @@ #import "WebRTC/RTCVideoCodecH264.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "common_video/include/video_frame.h" +#include "media/base/codec.h" +#include "modules/video_coding/include/video_codec_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm index 341363e942..1a09fe158b 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm @@ -15,9 +15,9 @@ #import "RTCVideoCodec+Private.h" #import "WebRTC/RTCVideoCodec.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "system_wrappers/include/field_trial.h" const char kHighProfileExperiment[] = "WebRTC-H264HighProfile"; static NSString *kLevel31ConstrainedHigh = @"640c1f"; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h index 0c6f0657e4..bdec24d5b7 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h @@ -12,7 +12,7 @@ #import "WebRTC/RTCVideoRenderer.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h index f6e202cd9b..1f34e047c2 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h @@ -12,7 +12,7 @@ #import "RTCMediaSource+Private.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm index 341a522868..fccf92e2e2 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm @@ -10,9 +10,9 @@ #import "RTCVideoSource+Private.h" -#include "webrtc/api/videosourceproxy.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h" +#include "api/videosourceproxy.h" +#include "rtc_base/checks.h" +#include "sdk/objc/Framework/Classes/Video/objcvideotracksource.h" static webrtc::ObjcVideoTrackSource *getObjcVideoSource( const rtc::scoped_refptr nativeSource) { diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h index 5199be3b26..2cb6a13f25 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCVideoTrack.h" -#include "webrtc/api/mediastreaminterface.h" +#include "api/mediastreaminterface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm b/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm index 7d3669f33d..17f14e35d5 100644 --- a/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm +++ b/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm @@ -10,9 +10,9 @@ #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" @implementation RTCCVPixelBuffer { int _width; diff --git a/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm b/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm index 14301ba3d5..3caf144262 100644 --- a/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm +++ b/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm @@ -20,7 +20,7 @@ #import "RTCShader.h" #import "WebRTC/RTCLogging.h" -#include "webrtc/api/optional.h" +#include "api/optional.h" static const int kYTextureUnit = 0; static const int kUTextureUnit = 1; diff --git a/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h b/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h index 7883c414b5..6c942ce390 100644 --- a/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h +++ b/sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h @@ -10,7 +10,7 @@ #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/api/video/i420_buffer.h" +#include "api/video/i420_buffer.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm b/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm index 042fcc06ba..a428a8d6cb 100644 --- a/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm +++ b/sdk/objc/Framework/Classes/Video/RTCI420Buffer.mm @@ -10,7 +10,7 @@ #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/api/video/i420_buffer.h" +#include "api/video/i420_buffer.h" @implementation RTCI420Buffer { @protected diff --git a/sdk/objc/Framework/Classes/Video/RTCShader.mm b/sdk/objc/Framework/Classes/Video/RTCShader.mm index 351f241c14..e8fecda1c8 100644 --- a/sdk/objc/Framework/Classes/Video/RTCShader.mm +++ b/sdk/objc/Framework/Classes/Video/RTCShader.mm @@ -22,8 +22,8 @@ #import "RTCOpenGLDefines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" // Vertex shader doesn't do anything except pass coordinates through. const char kRTCVertexShaderSource[] = diff --git a/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h b/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h index 0f357a0660..23ed701126 100644 --- a/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h +++ b/sdk/objc/Framework/Classes/Video/avfoundationformatmapper.h @@ -13,7 +13,7 @@ #import #import -#include "webrtc/media/base/videocapturer.h" +#include "media/base/videocapturer.h" namespace webrtc { // Mapping from AVCaptureDeviceFormat to cricket::VideoFormat for given input diff --git a/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h index 45161b6d83..459a047ec1 100644 --- a/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h +++ b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ #import -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/media/base/videocapturer.h" +#include "api/video/video_frame.h" +#include "common_video/include/i420_buffer_pool.h" +#include "media/base/videocapturer.h" @class RTCAVFoundationVideoCapturerInternal; @@ -69,4 +69,4 @@ class AVFoundationVideoCapturer : public cricket::VideoCapturer { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_AVFOUNDATIONVIDEOCAPTURER_H_ diff --git a/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm index 1c8403e47d..74cb61e1fc 100644 --- a/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm +++ b/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm @@ -19,12 +19,12 @@ #include "avfoundationformatmapper.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/thread.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/thread.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc index daebb2c530..24b9868220 100644 --- a/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc +++ b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h" +#include "sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h" #include "libyuv/convert.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "api/video/i420_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h index 603cbc01c4..f0b094b984 100644 --- a/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h +++ b/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ #include #include -#include "webrtc/common_video/include/video_frame_buffer.h" +#include "common_video/include/video_frame_buffer.h" namespace webrtc { @@ -63,4 +63,4 @@ class CoreVideoFrameBuffer : public VideoFrameBuffer { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_COREVIDEO_FRAME_BUFFER_H_ diff --git a/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h index 71099e446b..85a89e6dd9 100644 --- a/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h +++ b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ #import -#include "webrtc/common_video/include/video_frame_buffer.h" +#include "common_video/include/video_frame_buffer.h" @protocol RTCVideoFrameBuffer; @@ -41,4 +41,4 @@ class ObjCFrameBuffer : public VideoFrameBuffer { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJC_FRAME_BUFFER_H_ diff --git a/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm index 74e9c13477..3658562eb2 100644 --- a/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm +++ b/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" #import "WebRTC/RTCVideoFrameBuffer.h" diff --git a/sdk/objc/Framework/Classes/Video/objcvideotracksource.h b/sdk/objc/Framework/Classes/Video/objcvideotracksource.h index b28c00194f..27c7295dda 100644 --- a/sdk/objc/Framework/Classes/Video/objcvideotracksource.h +++ b/sdk/objc/Framework/Classes/Video/objcvideotracksource.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ #include "WebRTC/RTCMacros.h" -#include "webrtc/media/base/adaptedvideotracksource.h" -#include "webrtc/rtc_base/timestampaligner.h" +#include "media/base/adaptedvideotracksource.h" +#include "rtc_base/timestampaligner.h" RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame); @@ -49,4 +49,4 @@ class ObjcVideoTrackSource : public rtc::AdaptedVideoTrackSource { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ diff --git a/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm b/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm index d3ec3bd12c..eca8852c0f 100644 --- a/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm +++ b/sdk/objc/Framework/Classes/Video/objcvideotracksource.mm @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h" +#include "sdk/objc/Framework/Classes/Video/objcvideotracksource.h" #import "WebRTC/RTCVideoFrame.h" #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "api/video/i420_buffer.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm index b19cb43bd1..6e000ab747 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm @@ -13,11 +13,11 @@ #import -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" #import "WebRTC/RTCVideoFrame.h" #import "WebRTC/RTCVideoFrameBuffer.h" diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm index 6e2b568273..a42cc97f2b 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm @@ -24,16 +24,16 @@ #import "WebRTC/RTCVideoFrameBuffer.h" #import "helpers.h" #include "libyuv/convert_from.h" -#include "webrtc/common_video/h264/h264_bitstream_parser.h" -#include "webrtc/common_video/h264/profile_level_id.h" -#include "webrtc/common_video/include/bitrate_adjuster.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "common_video/h264/h264_bitstream_parser.h" +#include "common_video/h264/profile_level_id.h" +#include "common_video/include/bitrate_adjuster.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/buffer.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" +#include "system_wrappers/include/clock.h" @interface RTCVideoEncoderH264 () diff --git a/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc b/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc index bd0619028b..1e4a53fae7 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc +++ b/sdk/objc/Framework/Classes/VideoToolbox/helpers.cc @@ -13,8 +13,8 @@ #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" // Copies characters from a CFStringRef into a std::string. std::string CFStringToString(const CFStringRef cf_string) { diff --git a/sdk/objc/Framework/Classes/VideoToolbox/helpers.h b/sdk/objc/Framework/Classes/VideoToolbox/helpers.h index 11c19ad7b4..0683ea79e5 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/helpers.h +++ b/sdk/objc/Framework/Classes/VideoToolbox/helpers.h @@ -9,8 +9,8 @@ * */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ #include #include @@ -44,4 +44,4 @@ void SetVTSessionProperty(VTSessionRef session, CFStringRef key, CFStringRef value); -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_HELPERS_H_ diff --git a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc index 2804254be8..1ba18e8e35 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc +++ b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc @@ -9,14 +9,14 @@ * */ -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h index 3d7a88ffc5..fed83eb883 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h +++ b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h @@ -9,17 +9,17 @@ * */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/h264/include/h264.h" #include #include -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/buffer.h" +#include "common_video/h264/h264_common.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/buffer.h" using webrtc::H264::NaluIndex; @@ -109,4 +109,4 @@ class AvccBufferWriter final { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_ diff --git a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc index 0a680fc2b1..f5d5406e7b 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc +++ b/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc @@ -11,9 +11,9 @@ #include -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/arraysize.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" +#include "test/gtest.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h index 8fd8c48cc0..93510e755d 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h +++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ -#include "webrtc/media/base/codec.h" -#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "media/base/codec.h" +#include "media/engine/webrtcvideodecoderfactory.h" @protocol RTCVideoDecoderFactory; @@ -38,4 +38,4 @@ class ObjCVideoDecoderFactory : public cricket::WebRtcVideoDecoderFactory { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_DECODER_FACTORY_H_ diff --git a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm index d126f8442c..e20f1ae5c0 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" #import "NSString+StdString.h" #import "RTCVideoCodec+Private.h" @@ -18,13 +18,13 @@ #import "WebRTC/RTCVideoFrame.h" #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "api/video_codecs/video_decoder.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h index b0c45887f0..cb8dda6a0a 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h +++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ +#ifndef SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ +#define SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ #import -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtcvideoencoderfactory.h" @protocol RTCVideoEncoderFactory; @@ -38,4 +38,4 @@ class ObjCVideoEncoderFactory : public cricket::WebRtcVideoEncoderFactory { } // namespace webrtc -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ +#endif // SDK_OBJC_FRAMEWORK_CLASSES_PEERCONNECTION_OBJC_VIDEO_ENCODER_FACTORY_H_ diff --git a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm index 75b4a34a3a..230719ec6d 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" #include @@ -21,15 +21,15 @@ #import "WebRTC/RTCVideoFrame.h" #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_encoder.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "sdk/objc/Framework/Classes/Common/helpers.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h index 751734a644..d9547d69ea 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h @@ -11,7 +11,7 @@ #import #import -#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h" +#import "sdk/objc/Framework/Headers/WebRTC/RTCMacros.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h index a9890745d8..08cb93829a 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ -#define WEBRTC_SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ +#ifndef SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ +#define SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ #define RTC_EXPORT __attribute__((visibility("default"))) @@ -25,4 +25,4 @@ #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname #endif -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ +#endif // SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_ diff --git a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm index 41618c39cf..d94c63535b 100644 --- a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm @@ -11,7 +11,7 @@ #import #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "RTCAudioSession+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm b/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm index 66ac117bd2..f543069c5f 100644 --- a/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm +++ b/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm @@ -14,7 +14,7 @@ #import #endif -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import #import diff --git a/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm index 4b44fb190c..90de644c09 100644 --- a/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCConfiguration+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm index ec8ecaa83b..fa9f131fdf 100644 --- a/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm @@ -10,7 +10,7 @@ #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCDataChannelConfiguration+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm b/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm index 9f0eb599d4..0c4c51cb90 100644 --- a/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCIceCandidate+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm b/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm index 669ede6908..497aedb39a 100644 --- a/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCIceServer+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm b/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm index b9952219da..1c44b2d8dc 100644 --- a/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm +++ b/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm @@ -10,7 +10,7 @@ #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "RTCIntervalRange+Private.h" #import "WebRTC/RTCIntervalRange.h" diff --git a/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm b/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm index a97849819d..eaaa71bd9e 100644 --- a/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm +++ b/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm @@ -11,7 +11,7 @@ #import #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #include #include diff --git a/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm b/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm index 095e0317b3..5f9026c29d 100644 --- a/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCMediaConstraints+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm b/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm index bf3fc33439..65bedde704 100644 --- a/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCConfiguration+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm b/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm index a6b9f8a338..442815385e 100644 --- a/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm @@ -10,7 +10,7 @@ #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "RTCSessionDescription+Private.h" diff --git a/sdk/objc/Framework/UnitTests/RTCTracingTest.mm b/sdk/objc/Framework/UnitTests/RTCTracingTest.mm index 49cc812b81..e21ba99a96 100644 --- a/sdk/objc/Framework/UnitTests/RTCTracingTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCTracingTest.mm @@ -12,7 +12,7 @@ #include -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #import "NSString+StdString.h" #import "WebRTC/RTCTracing.h" diff --git a/sdk/objc/Framework/UnitTests/avformatmappertests.mm b/sdk/objc/Framework/UnitTests/avformatmappertests.mm index eb0d951ef1..ba1935b294 100644 --- a/sdk/objc/Framework/UnitTests/avformatmappertests.mm +++ b/sdk/objc/Framework/UnitTests/avformatmappertests.mm @@ -11,7 +11,7 @@ #import #import -#include "webrtc/rtc_base/gunit.h" +#include "rtc_base/gunit.h" #include "Video/avfoundationformatmapper.h" diff --git a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm index 6fcc42296e..d98b12a085 100644 --- a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm +++ b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm @@ -11,15 +11,15 @@ #import #import -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h" #import "WebRTC/RTCVideoCodec.h" #import "WebRTC/RTCVideoCodecFactory.h" -#include "webrtc/media/base/codec.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/gunit.h" +#include "media/base/codec.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/gunit.h" id CreateDecoderFactoryReturning(int return_code) { id decoderMock = OCMProtocolMock(@protocol(RTCVideoDecoder)); diff --git a/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm index ed29bc2658..1a3588cd54 100644 --- a/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm +++ b/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm @@ -11,16 +11,16 @@ #import #import -#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" +#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h" #import "WebRTC/RTCVideoCodec.h" #import "WebRTC/RTCVideoCodecFactory.h" #import "WebRTC/RTCVideoFrameBuffer.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_error_codes.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/gunit.h" +#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h" id CreateEncoderFactoryReturning(int return_code) { id encoderMock = OCMProtocolMock(@protocol(RTCVideoEncoder)); diff --git a/stats/DEPS b/stats/DEPS index 276073f77f..1475196e73 100644 --- a/stats/DEPS +++ b/stats/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+webrtc/api", - "+webrtc/media", + "+api", + "+media", ] diff --git a/stats/rtcstats.cc b/stats/rtcstats.cc index 0ef49c1a5e..e4460bd90c 100644 --- a/stats/rtcstats.cc +++ b/stats/rtcstats.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/stats/rtcstats.h" +#include "api/stats/rtcstats.h" #include #include -#include "webrtc/rtc_base/stringencode.h" +#include "rtc_base/stringencode.h" namespace webrtc { diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 284dfe0b76..f407c0600b 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/stats/rtcstats_objects.h" +#include "api/stats/rtcstats_objects.h" namespace webrtc { diff --git a/stats/rtcstats_unittest.cc b/stats/rtcstats_unittest.cc index b4f82a7095..7148c9fc2f 100644 --- a/stats/rtcstats_unittest.cc +++ b/stats/rtcstats_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/stats/rtcstats.h" +#include "api/stats/rtcstats.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" -#include "webrtc/rtc_base/json.h" -#include "webrtc/stats/test/rtcteststats.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" +#include "rtc_base/json.h" +#include "stats/test/rtcteststats.h" namespace webrtc { diff --git a/stats/rtcstatsreport.cc b/stats/rtcstatsreport.cc index 322d5369a7..90025f7120 100644 --- a/stats/rtcstatsreport.cc +++ b/stats/rtcstatsreport.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/stats/rtcstatsreport.h" +#include "api/stats/rtcstatsreport.h" #include diff --git a/stats/rtcstatsreport_unittest.cc b/stats/rtcstatsreport_unittest.cc index 25ac3a2d17..5483ee3083 100644 --- a/stats/rtcstatsreport_unittest.cc +++ b/stats/rtcstatsreport_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/stats/rtcstatsreport.h" +#include "api/stats/rtcstatsreport.h" -#include "webrtc/api/stats/rtcstats.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/gunit.h" +#include "api/stats/rtcstats.h" +#include "rtc_base/checks.h" +#include "rtc_base/gunit.h" namespace webrtc { diff --git a/stats/test/rtcteststats.cc b/stats/test/rtcteststats.cc index f60bd0f8f0..5b6dffa5b8 100644 --- a/stats/test/rtcteststats.cc +++ b/stats/test/rtcteststats.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/stats/test/rtcteststats.h" +#include "stats/test/rtcteststats.h" namespace webrtc { diff --git a/stats/test/rtcteststats.h b/stats/test/rtcteststats.h index a0ac8a1726..7c8e1051ff 100644 --- a/stats/test/rtcteststats.h +++ b/stats/test/rtcteststats.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_STATS_TEST_RTCTESTSTATS_H_ -#define WEBRTC_STATS_TEST_RTCTESTSTATS_H_ +#ifndef STATS_TEST_RTCTESTSTATS_H_ +#define STATS_TEST_RTCTESTSTATS_H_ #include #include -#include "webrtc/api/stats/rtcstats.h" +#include "api/stats/rtcstats.h" namespace webrtc { @@ -44,4 +44,4 @@ class RTCTestStats : public RTCStats { } // namespace webrtc -#endif // WEBRTC_STATS_TEST_RTCTESTSTATS_H_ +#endif // STATS_TEST_RTCTESTSTATS_H_ diff --git a/system_wrappers/include/aligned_array.h b/system_wrappers/include/aligned_array.h index 7cc1c021e9..88b5269902 100644 --- a/system_wrappers/include/aligned_array.h +++ b/system_wrappers/include/aligned_array.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/system_wrappers/include/aligned_malloc.h b/system_wrappers/include/aligned_malloc.h index bdd82ccfd8..ac049b0ea7 100644 --- a/system_wrappers/include/aligned_malloc.h +++ b/system_wrappers/include/aligned_malloc.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ +#define SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ // The functions declared here // 1) Allocates block of aligned memory. @@ -56,4 +56,4 @@ struct AlignedFreeDeleter { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_ALIGNED_MALLOC_H_ diff --git a/system_wrappers/include/asm_defines.h b/system_wrappers/include/asm_defines.h index fe4c05effc..7f4c80ef2c 100644 --- a/system_wrappers/include/asm_defines.h +++ b/system_wrappers/include/asm_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ +#define SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits @@ -63,4 +63,4 @@ strheq \reg1, \reg2, \num .text -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_ diff --git a/system_wrappers/include/atomic32.h b/system_wrappers/include/atomic32.h index ef3d57649c..fb94a9d07d 100644 --- a/system_wrappers/include/atomic32.h +++ b/system_wrappers/include/atomic32.h @@ -12,13 +12,13 @@ // doing, use locks instead! :-) // // Note: assumes 32-bit (or higher) system -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ +#define SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" namespace webrtc { @@ -63,4 +63,4 @@ class Atomic32 { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_ diff --git a/system_wrappers/include/clock.h b/system_wrappers/include/clock.h index 36721fa3aa..ac2dba5972 100644 --- a/system_wrappers/include/clock.h +++ b/system_wrappers/include/clock.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ +#define SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ #include -#include "webrtc/system_wrappers/include/ntp_time.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/ntp_time.h" +#include "system_wrappers/include/rw_lock_wrapper.h" +#include "typedefs.h" namespace webrtc { @@ -85,4 +85,4 @@ class SimulatedClock : public Clock { }; // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ diff --git a/system_wrappers/include/cpu_features_wrapper.h b/system_wrappers/include/cpu_features_wrapper.h index 9838d94e58..a6cc734e84 100644 --- a/system_wrappers/include/cpu_features_wrapper.h +++ b/system_wrappers/include/cpu_features_wrapper.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ +#define SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" // List of features in x86. typedef enum { @@ -48,4 +48,4 @@ extern uint64_t WebRtc_GetCPUFeaturesARM(void); } // extern "C" #endif -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ diff --git a/system_wrappers/include/cpu_info.h b/system_wrappers/include/cpu_info.h index 3c00d33ed3..d346e1d459 100644 --- a/system_wrappers/include/cpu_info.h +++ b/system_wrappers/include/cpu_info.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ +#define SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -25,4 +25,4 @@ class CpuInfo { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ diff --git a/system_wrappers/include/event_wrapper.h b/system_wrappers/include/event_wrapper.h index cc3722bd6b..b8dab2c341 100644 --- a/system_wrappers/include/event_wrapper.h +++ b/system_wrappers/include/event_wrapper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ +#define SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ namespace webrtc { enum EventTypeWrapper { @@ -67,4 +67,4 @@ class EventTimerWrapper : public EventWrapper { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_ diff --git a/system_wrappers/include/field_trial.h b/system_wrappers/include/field_trial.h index b94be2cf11..399dcbc0a6 100644 --- a/system_wrappers/include/field_trial.h +++ b/system_wrappers/include/field_trial.h @@ -8,8 +8,8 @@ // be found in the AUTHORS file in the root of the source tree. // -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ +#define SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ #include @@ -72,4 +72,4 @@ inline bool IsEnabled(const char* name) { } // namespace field_trial } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_ diff --git a/system_wrappers/include/field_trial_default.h b/system_wrappers/include/field_trial_default.h index 7417ced39d..1774c2d416 100644 --- a/system_wrappers/include/field_trial_default.h +++ b/system_wrappers/include/field_trial_default.h @@ -8,8 +8,8 @@ // be found in the AUTHORS file in the root of the source tree. // -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ +#define SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ namespace webrtc { namespace field_trial { @@ -25,4 +25,4 @@ const char* GetFieldTrialString(); } // namespace field_trial } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_ diff --git a/system_wrappers/include/file_wrapper.h b/system_wrappers/include/file_wrapper.h index 4fe5899c87..a7b061cb34 100644 --- a/system_wrappers/include/file_wrapper.h +++ b/system_wrappers/include/file_wrapper.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ +#define SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" // Implementation of an InStream and OutStream that can read (exclusive) or // write from/to a file. @@ -85,4 +85,4 @@ class FileWrapper : public InStream, public OutStream { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_FILE_WRAPPER_H_ diff --git a/system_wrappers/include/fix_interlocked_exchange_pointer_win.h b/system_wrappers/include/fix_interlocked_exchange_pointer_win.h index 8fb32efac9..a83fb4a4ad 100644 --- a/system_wrappers/include/fix_interlocked_exchange_pointer_win.h +++ b/system_wrappers/include/fix_interlocked_exchange_pointer_win.h @@ -14,8 +14,8 @@ // The original code can be found here: // http://src.chromium.org/svn/trunk/src/base/fix_wp64.h -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ +#define SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ #include @@ -36,4 +36,4 @@ inline void* InterlockedExchangePointer(void* volatile* target, void* value) { #endif // #if !defined(_WIN64) && defined(_Wp64) -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_FIX_INTERLOCKED_EXCHANGE_POINTER_WINDOWS_H_ diff --git a/system_wrappers/include/logcat_trace_context.h b/system_wrappers/include/logcat_trace_context.h index fc36386c70..8eb688dc8b 100644 --- a/system_wrappers/include/logcat_trace_context.h +++ b/system_wrappers/include/logcat_trace_context.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ +#define SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ -#include "webrtc/system_wrappers/include/trace.h" +#include "system_wrappers/include/trace.h" #ifndef ANDROID #error This file only makes sense to include on Android! @@ -32,4 +32,4 @@ class LogcatTraceContext : public webrtc::TraceCallback { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_LOGCAT_TRACE_CONTEXT_H_ diff --git a/system_wrappers/include/metrics.h b/system_wrappers/include/metrics.h index a10ee33d98..78f55e3848 100644 --- a/system_wrappers/include/metrics.h +++ b/system_wrappers/include/metrics.h @@ -8,14 +8,14 @@ // be found in the AUTHORS file in the root of the source tree. // -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ +#define SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/checks.h" +#include "common_types.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" // Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate // statistics. @@ -271,4 +271,4 @@ void HistogramAdd(Histogram* histogram_pointer, int sample); } // namespace metrics } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ diff --git a/system_wrappers/include/metrics_default.h b/system_wrappers/include/metrics_default.h index e262198e57..5ce3582204 100644 --- a/system_wrappers/include/metrics_default.h +++ b/system_wrappers/include/metrics_default.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ +#define SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ #include #include @@ -58,4 +58,4 @@ int MinSample(const std::string& name); } // namespace metrics } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_ diff --git a/system_wrappers/include/ntp_time.h b/system_wrappers/include/ntp_time.h index 5e53064b46..43ef161a69 100644 --- a/system_wrappers/include/ntp_time.h +++ b/system_wrappers/include/ntp_time.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ +#define SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ #include @@ -55,4 +55,4 @@ inline bool operator!=(const NtpTime& n1, const NtpTime& n2) { } } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ diff --git a/system_wrappers/include/rtp_to_ntp_estimator.h b/system_wrappers/include/rtp_to_ntp_estimator.h index 9d6da051d5..52a15053a4 100644 --- a/system_wrappers/include/rtp_to_ntp_estimator.h +++ b/system_wrappers/include/rtp_to_ntp_estimator.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ +#define SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ #include -#include "webrtc/system_wrappers/include/ntp_time.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/ntp_time.h" +#include "typedefs.h" namespace webrtc { // Class for converting an RTP timestamp to the NTP domain in milliseconds. @@ -72,4 +72,4 @@ int CheckForWrapArounds(uint32_t new_timestamp, uint32_t old_timestamp); } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ diff --git a/system_wrappers/include/rw_lock_wrapper.h b/system_wrappers/include/rw_lock_wrapper.h index 62e75b4547..a22b6ab9b9 100644 --- a/system_wrappers/include/rw_lock_wrapper.h +++ b/system_wrappers/include/rw_lock_wrapper.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ +#define SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ -#include "webrtc/rtc_base/thread_annotations.h" +#include "rtc_base/thread_annotations.h" // Note, Windows pre-Vista version of RW locks are not supported natively. For // these OSs regular critical sections have been used to approximate RW lock @@ -61,4 +61,4 @@ class RTC_SCOPED_LOCKABLE WriteLockScoped { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ diff --git a/system_wrappers/include/sleep.h b/system_wrappers/include/sleep.h index e7ed8b32b8..3bf8df219f 100644 --- a/system_wrappers/include/sleep.h +++ b/system_wrappers/include/sleep.h @@ -9,8 +9,8 @@ */ // An OS-independent sleep function. -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ +#define SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ namespace webrtc { @@ -21,4 +21,4 @@ void SleepMs(int msecs); } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_SLEEP_H_ diff --git a/system_wrappers/include/static_instance.h b/system_wrappers/include/static_instance.h index f85a9121c4..f773d5bc2a 100644 --- a/system_wrappers/include/static_instance.h +++ b/system_wrappers/include/static_instance.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ +#define SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ #include -#include "webrtc/rtc_base/criticalsection.h" +#include "rtc_base/criticalsection.h" #ifdef _WIN32 -#include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h" +#include "system_wrappers/include/fix_interlocked_exchange_pointer_win.h" #endif namespace webrtc { @@ -144,4 +144,4 @@ static T* GetStaticInstance(CountOperation count_operation) { } // namspace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_STATIC_INSTANCE_H_ diff --git a/system_wrappers/include/timestamp_extrapolator.h b/system_wrappers/include/timestamp_extrapolator.h index d9c5c6fb37..b21826b1d5 100644 --- a/system_wrappers/include/timestamp_extrapolator.h +++ b/system_wrappers/include/timestamp_extrapolator.h @@ -11,8 +11,8 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_TIMESTAMP_EXTRAPOLATOR_H_ #define SYSTEM_WRAPPERS_INCLUDE_TIMESTAMP_EXTRAPOLATOR_H_ -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/rw_lock_wrapper.h" +#include "typedefs.h" namespace webrtc { diff --git a/system_wrappers/include/trace.h b/system_wrappers/include/trace.h index e3ca3c6840..e5c154c88c 100644 --- a/system_wrappers/include/trace.h +++ b/system_wrappers/include/trace.h @@ -13,11 +13,11 @@ * messages. Apply filtering to avoid that. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ +#ifndef SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ +#define SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ -#include "webrtc/common_types.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "typedefs.h" namespace webrtc { @@ -86,4 +86,4 @@ class Trace { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ +#endif // SYSTEM_WRAPPERS_INCLUDE_TRACE_H_ diff --git a/system_wrappers/source/aligned_array_unittest.cc b/system_wrappers/source/aligned_array_unittest.cc index 5f3cdf7427..e5a3c18fcc 100644 --- a/system_wrappers/source/aligned_array_unittest.cc +++ b/system_wrappers/source/aligned_array_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/aligned_array.h" +#include "system_wrappers/include/aligned_array.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace { diff --git a/system_wrappers/source/aligned_malloc.cc b/system_wrappers/source/aligned_malloc.cc index f700f8b1f1..b7f1dfa8c7 100644 --- a/system_wrappers/source/aligned_malloc.cc +++ b/system_wrappers/source/aligned_malloc.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "system_wrappers/include/aligned_malloc.h" #include #include @@ -19,7 +19,7 @@ #include #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" // Reference on memory alignment: // http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me diff --git a/system_wrappers/source/aligned_malloc_unittest.cc b/system_wrappers/source/aligned_malloc_unittest.cc index fbd5d6e1f6..f9a8d5aaa9 100644 --- a/system_wrappers/source/aligned_malloc_unittest.cc +++ b/system_wrappers/source/aligned_malloc_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "system_wrappers/include/aligned_malloc.h" #include @@ -18,8 +18,8 @@ #include #endif -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" +#include "test/gtest.h" +#include "typedefs.h" namespace webrtc { diff --git a/system_wrappers/source/atomic32_darwin.cc b/system_wrappers/source/atomic32_darwin.cc index 7c77d092b5..b745af5899 100644 --- a/system_wrappers/source/atomic32_darwin.cc +++ b/system_wrappers/source/atomic32_darwin.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/atomic32.h" +#include "system_wrappers/include/atomic32.h" #include #include #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { diff --git a/system_wrappers/source/atomic32_non_darwin_unix.cc b/system_wrappers/source/atomic32_non_darwin_unix.cc index fbc9c2910e..5424ab06d2 100644 --- a/system_wrappers/source/atomic32_non_darwin_unix.cc +++ b/system_wrappers/source/atomic32_non_darwin_unix.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/atomic32.h" +#include "system_wrappers/include/atomic32.h" #include #include #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { diff --git a/system_wrappers/source/atomic32_win.cc b/system_wrappers/source/atomic32_win.cc index cd4ce08580..cce5dcd6d5 100644 --- a/system_wrappers/source/atomic32_win.cc +++ b/system_wrappers/source/atomic32_win.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/atomic32.h" +#include "system_wrappers/include/atomic32.h" #include #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index f4533fb168..184b35ee75 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/clock.h" +#include "system_wrappers/include/clock.h" #if defined(_WIN32) // Windows needs to be included before mmsystem.h -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #include #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) #include #include #endif -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/system_wrappers/source/clock_unittest.cc b/system_wrappers/source/clock_unittest.cc index dcd932774e..f7b0ed7a47 100644 --- a/system_wrappers/source/clock_unittest.cc +++ b/system_wrappers/source/clock_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/clock.h" +#include "system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/system_wrappers/source/cpu_features.cc b/system_wrappers/source/cpu_features.cc index 49840eb90d..2fc97f8303 100644 --- a/system_wrappers/source/cpu_features.cc +++ b/system_wrappers/source/cpu_features.cc @@ -10,13 +10,13 @@ // Parts of this file derived from Chromium's base/cpu.cc. -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER) #include #endif -#include "webrtc/typedefs.h" +#include "typedefs.h" // No CPU feature is available => straight C path. int GetCPUInfoNoASM(CPUFeature feature) { diff --git a/system_wrappers/source/cpu_features_linux.c b/system_wrappers/source/cpu_features_linux.c index 112ad038ae..9c5645068a 100644 --- a/system_wrappers/source/cpu_features_linux.c +++ b/system_wrappers/source/cpu_features_linux.c @@ -22,7 +22,7 @@ #include #include #endif -#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_ARCH_ARM_FAMILY) #include diff --git a/system_wrappers/source/cpu_info.cc b/system_wrappers/source/cpu_info.cc index 590d2d975c..b96369d7cd 100644 --- a/system_wrappers/source/cpu_info.cc +++ b/system_wrappers/source/cpu_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/cpu_info.h" +#include "system_wrappers/include/cpu_info.h" #if defined(WEBRTC_WIN) #include @@ -23,7 +23,7 @@ #include #endif -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace internal { static int DetectNumberOfCores() { diff --git a/system_wrappers/source/event.cc b/system_wrappers/source/event.cc index 2f08a1ad99..1bbd01ffac 100644 --- a/system_wrappers/source/event.cc +++ b/system_wrappers/source/event.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/event_wrapper.h" #if defined(_WIN32) #include -#include "webrtc/system_wrappers/source/event_timer_win.h" +#include "system_wrappers/source/event_timer_win.h" #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include #include -#include "webrtc/system_wrappers/source/event_timer_posix.h" +#include "system_wrappers/source/event_timer_posix.h" #else #include -#include "webrtc/system_wrappers/source/event_timer_posix.h" +#include "system_wrappers/source/event_timer_posix.h" #endif -#include "webrtc/rtc_base/event.h" +#include "rtc_base/event.h" namespace webrtc { diff --git a/system_wrappers/source/event_timer_posix.cc b/system_wrappers/source/event_timer_posix.cc index dead7c9b80..bc663ad2c3 100644 --- a/system_wrappers/source/event_timer_posix.cc +++ b/system_wrappers/source/event_timer_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/event_timer_posix.h" +#include "system_wrappers/source/event_timer_posix.h" #include #include @@ -18,7 +18,7 @@ #include #include -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/system_wrappers/source/event_timer_posix.h b/system_wrappers/source/event_timer_posix.h index 1b01e4b142..4de7422950 100644 --- a/system_wrappers/source/event_timer_posix.h +++ b/system_wrappers/source/event_timer_posix.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ +#define SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/event_wrapper.h" #include #include #include -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/platform_thread.h" namespace webrtc { @@ -64,4 +64,4 @@ class EventTimerPosix : public EventTimerWrapper { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ diff --git a/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc index 5feac80a35..e0c5cbc477 100644 --- a/system_wrappers/source/event_timer_posix_unittest.cc +++ b/system_wrappers/source/event_timer_posix_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/event_timer_posix.h" +#include "system_wrappers/source/event_timer_posix.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "test/gtest.h" namespace webrtc { diff --git a/system_wrappers/source/event_timer_win.cc b/system_wrappers/source/event_timer_win.cc index 4c586988df..19ed3fa6e9 100644 --- a/system_wrappers/source/event_timer_win.cc +++ b/system_wrappers/source/event_timer_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/event_timer_win.h" +#include "system_wrappers/source/event_timer_win.h" #include "Mmsystem.h" diff --git a/system_wrappers/source/event_timer_win.h b/system_wrappers/source/event_timer_win.h index 163cddeda9..732dec7fd9 100644 --- a/system_wrappers/source/event_timer_win.h +++ b/system_wrappers/source/event_timer_win.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ +#define SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ #include -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/event_wrapper.h" -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -37,4 +37,4 @@ class EventTimerWin : public EventTimerWrapper { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ diff --git a/system_wrappers/source/field_trial_default.cc b/system_wrappers/source/field_trial_default.cc index 0e2c286117..94e56b5bc4 100644 --- a/system_wrappers/source/field_trial_default.cc +++ b/system_wrappers/source/field_trial_default.cc @@ -7,8 +7,8 @@ // be found in the AUTHORS file in the root of the source tree. // -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/field_trial_default.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/field_trial_default.h" #include diff --git a/system_wrappers/source/file_impl.cc b/system_wrappers/source/file_impl.cc index f62e7124f7..350aaeb15b 100644 --- a/system_wrappers/source/file_impl.cc +++ b/system_wrappers/source/file_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/file_wrapper.h" #ifdef _WIN32 #include @@ -17,7 +17,7 @@ #include #endif -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/system_wrappers/source/logcat_trace_context.cc b/system_wrappers/source/logcat_trace_context.cc index 7ad1b1dedd..cb43dddd5b 100644 --- a/system_wrappers/source/logcat_trace_context.cc +++ b/system_wrappers/source/logcat_trace_context.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/logcat_trace_context.h" +#include "system_wrappers/include/logcat_trace_context.h" #include #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/system_wrappers/source/metrics_default.cc b/system_wrappers/source/metrics_default.cc index 6e5715ea23..3263ec0ec8 100644 --- a/system_wrappers/source/metrics_default.cc +++ b/system_wrappers/source/metrics_default.cc @@ -7,13 +7,13 @@ // be found in the AUTHORS file in the root of the source tree. // -#include "webrtc/system_wrappers/include/metrics_default.h" +#include "system_wrappers/include/metrics_default.h" #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/metrics.h" // Default implementation of histogram methods for WebRTC clients that do not // want to provide their own implementation. diff --git a/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc index 0414bc78f4..dfac863a98 100644 --- a/system_wrappers/source/metrics_default_unittest.cc +++ b/system_wrappers/source/metrics_default_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" namespace webrtc { diff --git a/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc index d7be2297f8..0eeda0da2a 100644 --- a/system_wrappers/source/metrics_unittest.cc +++ b/system_wrappers/source/metrics_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/system_wrappers/source/ntp_time_unittest.cc b/system_wrappers/source/ntp_time_unittest.cc index 9a2a9266e1..3fb174316c 100644 --- a/system_wrappers/source/ntp_time_unittest.cc +++ b/system_wrappers/source/ntp_time_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/ntp_time.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/ntp_time.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/system_wrappers/source/rtp_to_ntp_estimator.cc b/system_wrappers/source/rtp_to_ntp_estimator.cc index 422759939a..3496fc0724 100644 --- a/system_wrappers/source/rtp_to_ntp_estimator.cc +++ b/system_wrappers/source/rtp_to_ntp_estimator.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" +#include "system_wrappers/include/rtp_to_ntp_estimator.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace { diff --git a/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc b/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc index cfcb13bf8d..4084620bfc 100644 --- a/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc +++ b/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/rtp_to_ntp_estimator.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/system_wrappers/source/rw_lock.cc b/system_wrappers/source/rw_lock.cc index ff53e8d7a6..c38c44ad75 100644 --- a/system_wrappers/source/rw_lock.cc +++ b/system_wrappers/source/rw_lock.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "system_wrappers/include/rw_lock_wrapper.h" #include #if defined(_WIN32) -#include "webrtc/system_wrappers/source/rw_lock_win.h" +#include "system_wrappers/source/rw_lock_win.h" #else -#include "webrtc/system_wrappers/source/rw_lock_posix.h" +#include "system_wrappers/source/rw_lock_posix.h" #endif namespace webrtc { diff --git a/system_wrappers/source/rw_lock_posix.cc b/system_wrappers/source/rw_lock_posix.cc index cdcb7fb5bd..f1b743b723 100644 --- a/system_wrappers/source/rw_lock_posix.cc +++ b/system_wrappers/source/rw_lock_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/rw_lock_posix.h" +#include "system_wrappers/source/rw_lock_posix.h" namespace webrtc { diff --git a/system_wrappers/source/rw_lock_posix.h b/system_wrappers/source/rw_lock_posix.h index 0ce7305b60..eec7cb7a68 100644 --- a/system_wrappers/source/rw_lock_posix.h +++ b/system_wrappers/source/rw_lock_posix.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ +#define SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/rw_lock_wrapper.h" +#include "typedefs.h" #include @@ -38,4 +38,4 @@ class RWLockPosix : public RWLockWrapper { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ diff --git a/system_wrappers/source/rw_lock_win.cc b/system_wrappers/source/rw_lock_win.cc index 2372b9b503..1d222d23d0 100644 --- a/system_wrappers/source/rw_lock_win.cc +++ b/system_wrappers/source/rw_lock_win.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/rw_lock_win.h" +#include "system_wrappers/source/rw_lock_win.h" -#include "webrtc/system_wrappers/include/trace.h" +#include "system_wrappers/include/trace.h" namespace webrtc { diff --git a/system_wrappers/source/rw_lock_win.h b/system_wrappers/source/rw_lock_win.h index c279eaba44..41537ba10b 100644 --- a/system_wrappers/source/rw_lock_win.h +++ b/system_wrappers/source/rw_lock_win.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ +#define SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ -#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "system_wrappers/include/rw_lock_wrapper.h" #include @@ -37,4 +37,4 @@ class RWLockWin : public RWLockWrapper { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ diff --git a/system_wrappers/source/sleep.cc b/system_wrappers/source/sleep.cc index 181381fd53..e2fa486118 100644 --- a/system_wrappers/source/sleep.cc +++ b/system_wrappers/source/sleep.cc @@ -9,7 +9,7 @@ */ // An OS-independent sleep function. -#include "webrtc/system_wrappers/include/sleep.h" +#include "system_wrappers/include/sleep.h" #ifdef _WIN32 // For Sleep() diff --git a/system_wrappers/source/timestamp_extrapolator.cc b/system_wrappers/source/timestamp_extrapolator.cc index b9243ca80c..98f6a7bd34 100644 --- a/system_wrappers/source/timestamp_extrapolator.cc +++ b/system_wrappers/source/timestamp_extrapolator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" +#include "system_wrappers/include/timestamp_extrapolator.h" #include diff --git a/system_wrappers/source/trace_impl.cc b/system_wrappers/source/trace_impl.cc index 513327e0aa..c1ec984f6d 100644 --- a/system_wrappers/source/trace_impl.cc +++ b/system_wrappers/source/trace_impl.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/trace_impl.h" +#include "system_wrappers/source/trace_impl.h" #include #include #include #include -#include "webrtc/rtc_base/atomicops.h" -#include "webrtc/rtc_base/platform_thread.h" +#include "rtc_base/atomicops.h" +#include "rtc_base/platform_thread.h" #ifdef _WIN32 -#include "webrtc/system_wrappers/source/trace_win.h" +#include "system_wrappers/source/trace_win.h" #else -#include "webrtc/system_wrappers/source/trace_posix.h" +#include "system_wrappers/source/trace_posix.h" #endif // _WIN32 #define KEY_LEN_CHARS 31 diff --git a/system_wrappers/source/trace_impl.h b/system_wrappers/source/trace_impl.h index 0e36aff4c9..3e730f6818 100644 --- a/system_wrappers/source/trace_impl.h +++ b/system_wrappers/source/trace_impl.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ +#define SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/static_instance.h" -#include "webrtc/system_wrappers/include/trace.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/static_instance.h" +#include "system_wrappers/include/trace.h" namespace webrtc { @@ -102,4 +102,4 @@ class TraceImpl : public Trace { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_ diff --git a/system_wrappers/source/trace_posix.cc b/system_wrappers/source/trace_posix.cc index f181ad2177..a01733325e 100644 --- a/system_wrappers/source/trace_posix.cc +++ b/system_wrappers/source/trace_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/trace_posix.h" +#include "system_wrappers/source/trace_posix.h" #include #include diff --git a/system_wrappers/source/trace_posix.h b/system_wrappers/source/trace_posix.h index 4387895bc2..357d226a3c 100644 --- a/system_wrappers/source/trace_posix.h +++ b/system_wrappers/source/trace_posix.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ +#define SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/system_wrappers/source/trace_impl.h" +#include "rtc_base/criticalsection.h" +#include "system_wrappers/source/trace_impl.h" namespace webrtc { @@ -36,4 +36,4 @@ class TracePosix : public TraceImpl { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ diff --git a/system_wrappers/source/trace_win.cc b/system_wrappers/source/trace_win.cc index 4caedfce77..2becb78291 100644 --- a/system_wrappers/source/trace_win.cc +++ b/system_wrappers/source/trace_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/source/trace_win.h" +#include "system_wrappers/source/trace_win.h" #include #include diff --git a/system_wrappers/source/trace_win.h b/system_wrappers/source/trace_win.h index 1311b23c57..b1a41f296b 100644 --- a/system_wrappers/source/trace_win.h +++ b/system_wrappers/source/trace_win.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ -#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ +#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ +#define SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ #include #include -#include "webrtc/system_wrappers/source/trace_impl.h" +#include "system_wrappers/source/trace_impl.h" namespace webrtc { @@ -33,4 +33,4 @@ class TraceWindows : public TraceImpl { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ +#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_ diff --git a/test/BUILD.gn b/test/BUILD.gn index dc696c43c4..f60373375a 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -265,13 +265,13 @@ if (!build_with_chromium) { } test_support_unittests_resources = [ - "../../resources/foreman_cif_short.yuv", - "../../resources/video_coding/frame-ethernet-ii.pcap", - "../../resources/video_coding/frame-loopback.pcap", - "../../resources/video_coding/pltype103.rtp", - "../../resources/video_coding/pltype103_header_only.rtp", - "../../resources/video_coding/ssrcs-2.pcap", - "../../resources/video_coding/ssrcs-3.pcap", + "../resources/foreman_cif_short.yuv", + "../resources/video_coding/frame-ethernet-ii.pcap", + "../resources/video_coding/frame-loopback.pcap", + "../resources/video_coding/pltype103.rtp", + "../resources/video_coding/pltype103_header_only.rtp", + "../resources/video_coding/ssrcs-2.pcap", + "../resources/video_coding/ssrcs-3.pcap", ] if (is_ios) { diff --git a/test/DEPS b/test/DEPS index 5aaae768b3..39f107b9b2 100644 --- a/test/DEPS +++ b/test/DEPS @@ -1,22 +1,22 @@ include_rules = [ "+third_party/libjpeg", "+third_party/libjpeg_turbo", - "+webrtc/call", - "+webrtc/common_audio", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log", - "+webrtc/media/base", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_mixer", - "+webrtc/modules/audio_processing", - "+webrtc/modules/media_file", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/video_capture", - "+webrtc/modules/video_coding", - "+webrtc/sdk", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", + "+call", + "+common_audio", + "+common_video", + "+logging/rtc_event_log", + "+media/base", + "+modules/audio_coding", + "+modules/audio_device", + "+modules/audio_mixer", + "+modules/audio_processing", + "+modules/media_file", + "+modules/rtp_rtcp", + "+modules/video_capture", + "+modules/video_coding", + "+sdk", + "+system_wrappers", + "+voice_engine", ] specific_include_rules = { @@ -27,17 +27,17 @@ specific_include_rules = { "+testing/gtest/include/gtest", ], ".*congestion_controller_feedback_fuzzer\.cc": [ - "+webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h", - "+webrtc/modules/pacing/packet_router.h", - "+webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h", + "+modules/congestion_controller/include/receive_side_congestion_controller.h", + "+modules/pacing/packet_router.h", + "+modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h", ], ".*pseudotcp_parser_fuzzer\.cc": [ - "+webrtc/p2p/base/pseudotcp.h", + "+p2p/base/pseudotcp.h", ], ".*stun_parser_fuzzer\.cc": [ - "+webrtc/p2p/base/stun.h", + "+p2p/base/stun.h", ], ".*stun_validator_fuzzer\.cc": [ - "+webrtc/p2p/base/stun.h", + "+p2p/base/stun.h", ], } diff --git a/test/call_test.cc b/test/call_test.cc index d4084d52a9..3c9540ae19 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/call_test.h" +#include "test/call_test.h" #include -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/call/rtp_transport_controller_send.h" -#include "webrtc/call/video_config.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "call/rtp_transport_controller_send.h" +#include "call/video_config.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/ptr_util.h" +#include "test/testsupport/fileutils.h" +#include "voice_engine/include/voe_base.h" namespace webrtc { namespace test { diff --git a/test/call_test.h b/test/call_test.h index 3372015b53..cf15aacf11 100644 --- a/test/call_test.h +++ b/test/call_test.h @@ -7,23 +7,23 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_CALL_TEST_H_ -#define WEBRTC_TEST_CALL_TEST_H_ +#ifndef TEST_CALL_TEST_H_ +#define TEST_CALL_TEST_H_ #include #include -#include "webrtc/call/call.h" -#include "webrtc/call/rtp_transport_controller_send.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_audio_device.h" -#include "webrtc/test/fake_decoder.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/fake_videorenderer.h" -#include "webrtc/test/frame_generator_capturer.h" -#include "webrtc/test/rtp_rtcp_observer.h" -#include "webrtc/test/single_threaded_task_queue.h" +#include "call/call.h" +#include "call/rtp_transport_controller_send.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "test/encoder_settings.h" +#include "test/fake_audio_device.h" +#include "test/fake_decoder.h" +#include "test/fake_encoder.h" +#include "test/fake_videorenderer.h" +#include "test/frame_generator_capturer.h" +#include "test/rtp_rtcp_observer.h" +#include "test/single_threaded_task_queue.h" namespace webrtc { @@ -246,4 +246,4 @@ class EndToEndTest : public BaseTest { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_CALL_TEST_H_ +#endif // TEST_CALL_TEST_H_ diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc index c81833f683..cbfb35bf33 100644 --- a/test/configurable_frame_size_encoder.cc +++ b/test/configurable_frame_size_encoder.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/configurable_frame_size_encoder.h" +#include "test/configurable_frame_size_encoder.h" #include -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gtest.h" +#include "common_video/include/video_frame.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h index 886c546685..8d3cbc65af 100644 --- a/test/configurable_frame_size_encoder.h +++ b/test/configurable_frame_size_encoder.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ -#define WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ +#ifndef TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ +#define TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ #include #include -#include "webrtc/api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder.h" namespace webrtc { namespace test { @@ -56,4 +56,4 @@ class ConfigurableFrameSizeEncoder : public VideoEncoder { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ +#endif // TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ diff --git a/test/constants.cc b/test/constants.cc index 3faa83a2ee..1a010c5245 100644 --- a/test/constants.cc +++ b/test/constants.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/constants.h" +#include "test/constants.h" namespace webrtc { namespace test { diff --git a/test/direct_transport.cc b/test/direct_transport.cc index 35f3f92bfc..44f7532bf2 100644 --- a/test/direct_transport.cc +++ b/test/direct_transport.cc @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/direct_transport.h" +#include "test/direct_transport.h" -#include "webrtc/call/call.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/single_threaded_task_queue.h" +#include "call/call.h" +#include "rtc_base/ptr_util.h" +#include "system_wrappers/include/clock.h" +#include "test/single_threaded_task_queue.h" namespace webrtc { namespace test { diff --git a/test/direct_transport.h b/test/direct_transport.h index c60157dc22..68a19683e6 100644 --- a/test/direct_transport.h +++ b/test/direct_transport.h @@ -7,19 +7,19 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_DIRECT_TRANSPORT_H_ -#define WEBRTC_TEST_DIRECT_TRANSPORT_H_ +#ifndef TEST_DIRECT_TRANSPORT_H_ +#define TEST_DIRECT_TRANSPORT_H_ #include #include -#include "webrtc/api/call/transport.h" -#include "webrtc/call/call.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/test/fake_network_pipe.h" -#include "webrtc/test/single_threaded_task_queue.h" +#include "api/call/transport.h" +#include "call/call.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_annotations.h" +#include "test/fake_network_pipe.h" +#include "test/single_threaded_task_queue.h" namespace webrtc { @@ -79,4 +79,4 @@ class DirectTransport : public Transport { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_DIRECT_TRANSPORT_H_ +#endif // TEST_DIRECT_TRANSPORT_H_ diff --git a/test/drifting_clock.cc b/test/drifting_clock.cc index c1539fd46f..5333e1de15 100644 --- a/test/drifting_clock.cc +++ b/test/drifting_clock.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/drifting_clock.h" -#include "webrtc/rtc_base/checks.h" +#include "test/drifting_clock.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/test/drifting_clock.h b/test/drifting_clock.h index 43708da9d3..a0ba93edf0 100644 --- a/test/drifting_clock.h +++ b/test/drifting_clock.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_DRIFTING_CLOCK_H_ -#define WEBRTC_TEST_DRIFTING_CLOCK_H_ +#ifndef TEST_DRIFTING_CLOCK_H_ +#define TEST_DRIFTING_CLOCK_H_ -#include "webrtc/system_wrappers/include/clock.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { @@ -42,4 +42,4 @@ class DriftingClock : public Clock { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_DRIFTING_CLOCK_H_ +#endif // TEST_DRIFTING_CLOCK_H_ diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc index 570fff5ed5..a2549ab4d8 100644 --- a/test/encoder_settings.cc +++ b/test/encoder_settings.cc @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/encoder_settings.h" +#include "test/encoder_settings.h" #include #include -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/test/fake_decoder.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "test/fake_decoder.h" namespace webrtc { namespace test { diff --git a/test/encoder_settings.h b/test/encoder_settings.h index 4c4fa4e65e..25cfa29897 100644 --- a/test/encoder_settings.h +++ b/test/encoder_settings.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_ENCODER_SETTINGS_H_ -#define WEBRTC_TEST_ENCODER_SETTINGS_H_ +#ifndef TEST_ENCODER_SETTINGS_H_ +#define TEST_ENCODER_SETTINGS_H_ #include -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" namespace webrtc { namespace test { @@ -53,4 +53,4 @@ VideoReceiveStream::Decoder CreateMatchingDecoder( } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_ENCODER_SETTINGS_H_ +#endif // TEST_ENCODER_SETTINGS_H_ diff --git a/test/fake_audio_device.cc b/test/fake_audio_device.cc index 97299e1bdb..eef8bfd015 100644 --- a/test/fake_audio_device.cc +++ b/test/fake_audio_device.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fake_audio_device.h" +#include "test/fake_audio_device.h" #include #include -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "common_audio/wav_file.h" +#include "rtc_base/checks.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/test/fake_audio_device.h b/test/fake_audio_device.h index 939d16a411..4847275fe3 100644 --- a/test/fake_audio_device.h +++ b/test/fake_audio_device.h @@ -7,20 +7,20 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_ -#define WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_ +#ifndef TEST_FAKE_AUDIO_DEVICE_H_ +#define TEST_FAKE_AUDIO_DEVICE_H_ #include #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_device/include/fake_audio_device.h" -#include "webrtc/rtc_base/buffer.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/typedefs.h" +#include "api/array_view.h" +#include "modules/audio_device/include/fake_audio_device.h" +#include "rtc_base/buffer.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/platform_thread.h" +#include "typedefs.h" namespace webrtc { @@ -141,4 +141,4 @@ class FakeAudioDevice : public FakeAudioDeviceModule { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_ +#endif // TEST_FAKE_AUDIO_DEVICE_H_ diff --git a/test/fake_audio_device_unittest.cc b/test/fake_audio_device_unittest.cc index d4f8acc8ac..02ece3cd85 100644 --- a/test/fake_audio_device_unittest.cc +++ b/test/fake_audio_device_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/common_audio/wav_file.h" -#include "webrtc/common_audio/wav_header.h" -#include "webrtc/test/fake_audio_device.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "common_audio/wav_file.h" +#include "common_audio/wav_header.h" +#include "test/fake_audio_device.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/test/fake_decoder.cc b/test/fake_decoder.cc index f2823b5e3a..fe8aef7167 100644 --- a/test/fake_decoder.cc +++ b/test/fake_decoder.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fake_decoder.h" +#include "test/fake_decoder.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/test/fake_decoder.h b/test/fake_decoder.h index b3120a027b..61dacf065f 100644 --- a/test/fake_decoder.h +++ b/test/fake_decoder.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_DECODER_H_ -#define WEBRTC_TEST_FAKE_DECODER_H_ +#ifndef TEST_FAKE_DECODER_H_ +#define TEST_FAKE_DECODER_H_ #include -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { @@ -73,4 +73,4 @@ class FakeNullDecoder : public FakeDecoder { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_DECODER_H_ +#endif // TEST_FAKE_DECODER_H_ diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc index 7c0870ec47..1dfc03a6d4 100644 --- a/test/fake_encoder.cc +++ b/test/fake_encoder.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fake_encoder.h" +#include "test/fake_encoder.h" #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/gtest.h" +#include "common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/sleep.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/test/fake_encoder.h b/test/fake_encoder.h index c8912a197d..a9f9650f42 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_ENCODER_H_ -#define WEBRTC_TEST_FAKE_ENCODER_H_ +#ifndef TEST_FAKE_ENCODER_H_ +#define TEST_FAKE_ENCODER_H_ #include #include -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { @@ -134,4 +134,4 @@ class MultithreadedFakeH264Encoder : public test::FakeH264Encoder { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_ENCODER_H_ +#endif // TEST_FAKE_ENCODER_H_ diff --git a/test/fake_network_pipe.cc b/test/fake_network_pipe.cc index 61ac91858c..66e8997ca3 100644 --- a/test/fake_network_pipe.cc +++ b/test/fake_network_pipe.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fake_network_pipe.h" +#include "test/fake_network_pipe.h" #include #include @@ -17,10 +17,10 @@ #include #include -#include "webrtc/call/call.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "call/call.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/test/fake_network_pipe.h b/test/fake_network_pipe.h index d7e0c5d9c2..5ef450908c 100644 --- a/test/fake_network_pipe.h +++ b/test/fake_network_pipe.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_NETWORK_PIPE_H_ -#define WEBRTC_TEST_FAKE_NETWORK_PIPE_H_ +#ifndef TEST_FAKE_NETWORK_PIPE_H_ +#define TEST_FAKE_NETWORK_PIPE_H_ #include #include @@ -17,11 +17,11 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/random.h" +#include "typedefs.h" namespace webrtc { @@ -183,4 +183,4 @@ class FakeNetworkPipe { } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_NETWORK_PIPE_H_ +#endif // TEST_FAKE_NETWORK_PIPE_H_ diff --git a/test/fake_network_pipe_unittest.cc b/test/fake_network_pipe_unittest.cc index 92619e1fc5..759003b294 100644 --- a/test/fake_network_pipe_unittest.cc +++ b/test/fake_network_pipe_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/call/call.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/fake_network_pipe.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" +#include "call/call.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "system_wrappers/include/clock.h" +#include "test/fake_network_pipe.h" +#include "test/gmock.h" +#include "test/gtest.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/test/fake_texture_frame.cc b/test/fake_texture_frame.cc index a73380d64c..4c4ea94fd2 100644 --- a/test/fake_texture_frame.cc +++ b/test/fake_texture_frame.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fake_texture_frame.h" +#include "test/fake_texture_frame.h" namespace webrtc { namespace test { diff --git a/test/fake_texture_frame.h b/test/fake_texture_frame.h index ce5963ea53..17261ff8ae 100644 --- a/test/fake_texture_frame.h +++ b/test/fake_texture_frame.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_ -#define WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_ +#ifndef TEST_FAKE_TEXTURE_FRAME_H_ +#define TEST_FAKE_TEXTURE_FRAME_H_ -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/rtc_base/checks.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "common_video/include/video_frame_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { @@ -45,4 +45,4 @@ class FakeNativeBuffer : public VideoFrameBuffer { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_ +#endif // TEST_FAKE_TEXTURE_FRAME_H_ diff --git a/test/fake_videorenderer.h b/test/fake_videorenderer.h index 6a4015de58..bc9c1db710 100644 --- a/test/fake_videorenderer.h +++ b/test/fake_videorenderer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FAKE_VIDEORENDERER_H_ -#define WEBRTC_TEST_FAKE_VIDEORENDERER_H_ +#ifndef TEST_FAKE_VIDEORENDERER_H_ +#define TEST_FAKE_VIDEORENDERER_H_ -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosinkinterface.h" +#include "api/video/video_frame.h" +#include "media/base/videosinkinterface.h" namespace webrtc { namespace test { @@ -25,4 +25,4 @@ class FakeVideoRenderer : public rtc::VideoSinkInterface { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FAKE_VIDEORENDERER_H_ +#endif // TEST_FAKE_VIDEORENDERER_H_ diff --git a/test/field_trial.cc b/test/field_trial.cc index c40d0783d8..57c18f7162 100644 --- a/test/field_trial.cc +++ b/test/field_trial.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/field_trial.h" +#include "test/field_trial.h" #include #include @@ -17,8 +17,8 @@ #include #include -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/field_trial_default.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/field_trial_default.h" namespace webrtc { namespace { diff --git a/test/field_trial.h b/test/field_trial.h index 735aa1f833..99ace4e864 100644 --- a/test/field_trial.h +++ b/test/field_trial.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FIELD_TRIAL_H_ -#define WEBRTC_TEST_FIELD_TRIAL_H_ +#ifndef TEST_FIELD_TRIAL_H_ +#define TEST_FIELD_TRIAL_H_ #include #include @@ -46,4 +46,4 @@ class ScopedFieldTrials { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FIELD_TRIAL_H_ +#endif // TEST_FIELD_TRIAL_H_ diff --git a/test/frame_generator.cc b/test/frame_generator.cc index eff2ec237d..d2d580a718 100644 --- a/test/frame_generator.cc +++ b/test/frame_generator.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/frame_generator.h" +#include "test/frame_generator.h" #include #include @@ -15,14 +15,14 @@ #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/include/video_frame_buffer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/keep_ref_until_done.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/frame_utils.h" +#include "api/video/i420_buffer.h" +#include "common_video/include/video_frame_buffer.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" +#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" +#include "test/frame_utils.h" namespace webrtc { namespace test { diff --git a/test/frame_generator.h b/test/frame_generator.h index d42f2268a2..58b8a2b5da 100644 --- a/test/frame_generator.h +++ b/test/frame_generator.h @@ -7,17 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FRAME_GENERATOR_H_ -#define WEBRTC_TEST_FRAME_GENERATOR_H_ +#ifndef TEST_FRAME_GENERATOR_H_ +#define TEST_FRAME_GENERATOR_H_ #include #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" namespace webrtc { class Clock; @@ -98,4 +98,4 @@ class FrameGenerator { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FRAME_GENERATOR_H_ +#endif // TEST_FRAME_GENERATOR_H_ diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc index 095a2043e5..532e907a54 100644 --- a/test/frame_generator_capturer.cc +++ b/test/frame_generator_capturer.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/frame_generator_capturer.h" +#include "test/frame_generator_capturer.h" #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/call/video_send_stream.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/clock.h" +#include "test/frame_generator.h" +#include "call/video_send_stream.h" namespace webrtc { namespace test { diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h index 8f3232c3e4..33733930ad 100644 --- a/test/frame_generator_capturer.h +++ b/test/frame_generator_capturer.h @@ -7,17 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ -#define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ +#ifndef TEST_FRAME_GENERATOR_CAPTURER_H_ +#define TEST_FRAME_GENERATOR_CAPTURER_H_ #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/test/video_capturer.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/task_queue.h" +#include "test/video_capturer.h" +#include "typedefs.h" namespace webrtc { @@ -105,4 +105,4 @@ class FrameGeneratorCapturer : public VideoCapturer { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ +#endif // TEST_FRAME_GENERATOR_CAPTURER_H_ diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc index 79e7b63abf..ba4627dc3b 100644 --- a/test/frame_generator_unittest.cc +++ b/test/frame_generator_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/frame_generator.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/test/frame_utils.cc b/test/frame_utils.cc index bc8ec4be99..1d5fe7c8f4 100644 --- a/test/frame_utils.cc +++ b/test/frame_utils.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/test/frame_utils.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "test/frame_utils.h" namespace webrtc { namespace test { diff --git a/test/frame_utils.h b/test/frame_utils.h index 4953db4478..80466e1c29 100644 --- a/test/frame_utils.h +++ b/test/frame_utils.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FRAME_UTILS_H_ -#define WEBRTC_TEST_FRAME_UTILS_H_ +#ifndef TEST_FRAME_UTILS_H_ +#define TEST_FRAME_UTILS_H_ #include -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { class I420Buffer; @@ -45,4 +45,4 @@ rtc::scoped_refptr ReadI420Buffer(int width, int height, FILE *); } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_FRAME_UTILS_H_ +#endif // TEST_FRAME_UTILS_H_ diff --git a/test/fuzzers/audio_decoder_fuzzer.cc b/test/fuzzers/audio_decoder_fuzzer.cc index 441b12b5f2..f6ac4cb0bb 100644 --- a/test/fuzzers/audio_decoder_fuzzer.cc +++ b/test/fuzzers/audio_decoder_fuzzer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" #include -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/api/optional.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/checks.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/optional.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/test/fuzzers/audio_decoder_fuzzer.h b/test/fuzzers/audio_decoder_fuzzer.h index 29179eb9f9..9079fc2633 100644 --- a/test/fuzzers/audio_decoder_fuzzer.h +++ b/test/fuzzers/audio_decoder_fuzzer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ -#define WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ +#ifndef TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ +#define TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { @@ -37,4 +37,4 @@ void FuzzAudioDecoderIncomingPacket(const uint8_t* data, AudioDecoder* decoder); } // namespace webrtc -#endif // WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ +#endif // TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ diff --git a/test/fuzzers/audio_decoder_ilbc_fuzzer.cc b/test/fuzzers/audio_decoder_ilbc_fuzzer.cc index fbc9d66e8c..a68725d6aa 100644 --- a/test/fuzzers/audio_decoder_ilbc_fuzzer.cc +++ b/test/fuzzers/audio_decoder_ilbc_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_decoder_isac_fuzzer.cc b/test/fuzzers/audio_decoder_isac_fuzzer.cc index 10227763f7..e79996e05b 100644 --- a/test/fuzzers/audio_decoder_isac_fuzzer.cc +++ b/test/fuzzers/audio_decoder_isac_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc b/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc index 9acebbbaae..5645142a03 100644 --- a/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc +++ b/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_decoder_isacfix_fuzzer.cc b/test/fuzzers/audio_decoder_isacfix_fuzzer.cc index 64cdccb2fc..444395b17d 100644 --- a/test/fuzzers/audio_decoder_isacfix_fuzzer.cc +++ b/test/fuzzers/audio_decoder_isacfix_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_decoder_opus_fuzzer.cc b/test/fuzzers/audio_decoder_opus_fuzzer.cc index 23b65a6462..a015f98b5b 100644 --- a/test/fuzzers/audio_decoder_opus_fuzzer.cc +++ b/test/fuzzers/audio_decoder_opus_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc b/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc index e623301a7a..efcba0f35d 100644 --- a/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc +++ b/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" -#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h" +#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "test/fuzzers/audio_decoder_fuzzer.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/audio_processing_fuzzer.cc b/test/fuzzers/audio_processing_fuzzer.cc index e31c05739a..9faea41fa2 100644 --- a/test/fuzzers/audio_processing_fuzzer.cc +++ b/test/fuzzers/audio_processing_fuzzer.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/fuzzers/audio_processing_fuzzer.h" +#include "test/fuzzers/audio_processing_fuzzer.h" #include #include #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/test/fuzzers/audio_processing_fuzzer.h b/test/fuzzers/audio_processing_fuzzer.h index 4a54d6936a..337d9b215d 100644 --- a/test/fuzzers/audio_processing_fuzzer.h +++ b/test/fuzzers/audio_processing_fuzzer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ -#define WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ +#ifndef TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ +#define TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ #include -#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/include/audio_processing.h" namespace webrtc { rtc::Optional ParseBool(const uint8_t** data, size_t* remaining_size); @@ -24,4 +24,4 @@ void FuzzAudioProcessing(const uint8_t* data, std::unique_ptr apm); } // namespace webrtc -#endif // WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ +#endif // TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_ diff --git a/test/fuzzers/audio_processing_fuzzer_configs.cc b/test/fuzzers/audio_processing_fuzzer_configs.cc index 21810ad83a..5c60605fa0 100644 --- a/test/fuzzers/audio_processing_fuzzer_configs.cc +++ b/test/fuzzers/audio_processing_fuzzer_configs.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/fuzzers/audio_processing_fuzzer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/fuzzers/audio_processing_fuzzer.h" -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { diff --git a/test/fuzzers/congestion_controller_feedback_fuzzer.cc b/test/fuzzers/congestion_controller_feedback_fuzzer.cc index e9dec3d688..a7b89fc891 100644 --- a/test/fuzzers/congestion_controller_feedback_fuzzer.cc +++ b/test/fuzzers/congestion_controller_feedback_fuzzer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "modules/congestion_controller/include/receive_side_congestion_controller.h" +#include "modules/pacing/packet_router.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/source/byte_io.h" namespace webrtc { diff --git a/test/fuzzers/flexfec_header_reader_fuzzer.cc b/test/fuzzers/flexfec_header_reader_fuzzer.cc index f253ca976a..a5694ea300 100644 --- a/test/fuzzers/flexfec_header_reader_fuzzer.cc +++ b/test/fuzzers/flexfec_header_reader_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/test/fuzzers/flexfec_receiver_fuzzer.cc b/test/fuzzers/flexfec_receiver_fuzzer.cc index b0da8033f1..14208bd7ec 100644 --- a/test/fuzzers/flexfec_receiver_fuzzer.cc +++ b/test/fuzzers/flexfec_receiver_fuzzer.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/rtc_base/basictypes.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/basictypes.h" namespace webrtc { diff --git a/test/fuzzers/flexfec_sender_fuzzer.cc b/test/fuzzers/flexfec_sender_fuzzer.cc index 44ac079d70..64bc3ed247 100644 --- a/test/fuzzers/flexfec_sender_fuzzer.cc +++ b/test/fuzzers/flexfec_sender_fuzzer.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/test/fuzzers/h264_bitstream_parser_fuzzer.cc b/test/fuzzers/h264_bitstream_parser_fuzzer.cc index 5661188b5d..a9384d73f3 100644 --- a/test/fuzzers/h264_bitstream_parser_fuzzer.cc +++ b/test/fuzzers/h264_bitstream_parser_fuzzer.cc @@ -9,7 +9,7 @@ */ #include -#include "webrtc/common_video/h264/h264_bitstream_parser.h" +#include "common_video/h264/h264_bitstream_parser.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/h264_depacketizer_fuzzer.cc b/test/fuzzers/h264_depacketizer_fuzzer.cc index ca73d9495f..2cefb1e1b3 100644 --- a/test/fuzzers/h264_depacketizer_fuzzer.cc +++ b/test/fuzzers/h264_depacketizer_fuzzer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_h264.h" +#include "modules/rtp_rtcp/source/rtp_format_h264.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/neteq_rtp_fuzzer.cc b/test/fuzzers/neteq_rtp_fuzzer.cc index 5eba72c221..bf3ce93378 100644 --- a/test/fuzzers/neteq_rtp_fuzzer.cc +++ b/test/fuzzers/neteq_rtp_fuzzer.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" -#include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h" -#include "webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h" -#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "api/array_view.h" +#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" +#include "modules/audio_coding/neteq/tools/audio_checksum.h" +#include "modules/audio_coding/neteq/tools/encode_neteq_input.h" +#include "modules/audio_coding/neteq/tools/neteq_test.h" +#include "modules/rtp_rtcp/source/byte_io.h" namespace webrtc { namespace test { diff --git a/test/fuzzers/packet_buffer_fuzzer.cc b/test/fuzzers/packet_buffer_fuzzer.cc index 099fe21fc2..df6baf48e5 100644 --- a/test/fuzzers/packet_buffer_fuzzer.cc +++ b/test/fuzzers/packet_buffer_fuzzer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/video_coding/packet_buffer.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/test/fuzzers/pseudotcp_parser_fuzzer.cc b/test/fuzzers/pseudotcp_parser_fuzzer.cc index ac5331b13e..90123c3206 100644 --- a/test/fuzzers/pseudotcp_parser_fuzzer.cc +++ b/test/fuzzers/pseudotcp_parser_fuzzer.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/p2p/base/pseudotcp.h" -#include "webrtc/rtc_base/thread.h" +#include "p2p/base/pseudotcp.h" +#include "rtc_base/thread.h" namespace webrtc { class FakeIPseudoTcpNotify : public cricket::IPseudoTcpNotify { diff --git a/test/fuzzers/residual_echo_detector_fuzzer.cc b/test/fuzzers/residual_echo_detector_fuzzer.cc index 8250c15d86..c3c81237c8 100644 --- a/test/fuzzers/residual_echo_detector_fuzzer.cc +++ b/test/fuzzers/residual_echo_detector_fuzzer.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/modules/audio_processing/residual_echo_detector.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/audio_processing/residual_echo_detector.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/test/fuzzers/rtcp_receiver_fuzzer.cc b/test/fuzzers/rtcp_receiver_fuzzer.cc index 9d93f838b6..8782f0c0a8 100644 --- a/test/fuzzers/rtcp_receiver_fuzzer.cc +++ b/test/fuzzers/rtcp_receiver_fuzzer.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/rtp_rtcp/source/rtcp_receiver.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace { diff --git a/test/fuzzers/rtp_header_fuzzer.cc b/test/fuzzers/rtp_header_fuzzer.cc index 9e111a80f2..09bf81197e 100644 --- a/test/fuzzers/rtp_header_fuzzer.cc +++ b/test/fuzzers/rtp_header_fuzzer.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" namespace webrtc { // We decide which header extensions to register by reading two bytes diff --git a/test/fuzzers/rtp_packet_fuzzer.cc b/test/fuzzers/rtp_packet_fuzzer.cc index 3e33699088..c89cb46dee 100644 --- a/test/fuzzers/rtp_packet_fuzzer.cc +++ b/test/fuzzers/rtp_packet_fuzzer.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" namespace webrtc { diff --git a/test/fuzzers/sdp_parser_fuzzer.cc b/test/fuzzers/sdp_parser_fuzzer.cc index f21c991a3e..e47156c571 100644 --- a/test/fuzzers/sdp_parser_fuzzer.cc +++ b/test/fuzzers/sdp_parser_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/api/jsepsessiondescription.h" +#include "api/jsepsessiondescription.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/stun_parser_fuzzer.cc b/test/fuzzers/stun_parser_fuzzer.cc index 02f10b195c..02e42bcbc8 100644 --- a/test/fuzzers/stun_parser_fuzzer.cc +++ b/test/fuzzers/stun_parser_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/p2p/base/stun.h" +#include "p2p/base/stun.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/stun_validator_fuzzer.cc b/test/fuzzers/stun_validator_fuzzer.cc index 1f919f59dc..9873ff40fb 100644 --- a/test/fuzzers/stun_validator_fuzzer.cc +++ b/test/fuzzers/stun_validator_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/p2p/base/stun.h" +#include "p2p/base/stun.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc index bfd03fa613..31bc1639e2 100644 --- a/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc +++ b/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/api/array_view.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" +#include "api/array_view.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "voice_engine/transport_feedback_packet_loss_tracker.h" namespace webrtc { diff --git a/test/fuzzers/turn_unwrap_fuzzer.cc b/test/fuzzers/turn_unwrap_fuzzer.cc index 818fbe9080..ed9f34d711 100644 --- a/test/fuzzers/turn_unwrap_fuzzer.cc +++ b/test/fuzzers/turn_unwrap_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/media/base/turnutils.h" +#include "media/base/turnutils.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/ulpfec_generator_fuzzer.cc b/test/fuzzers/ulpfec_generator_fuzzer.cc index 01729efddc..0642baa161 100644 --- a/test/fuzzers/ulpfec_generator_fuzzer.cc +++ b/test/fuzzers/ulpfec_generator_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "modules/rtp_rtcp/source/ulpfec_generator.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/test/fuzzers/ulpfec_header_reader_fuzzer.cc index e69f463203..6a6394f763 100644 --- a/test/fuzzers/ulpfec_header_reader_fuzzer.cc +++ b/test/fuzzers/ulpfec_header_reader_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" -#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/test/fuzzers/vp8_depacketizer_fuzzer.cc b/test/fuzzers/vp8_depacketizer_fuzzer.cc index d048372456..bd9ac8ffb2 100644 --- a/test/fuzzers/vp8_depacketizer_fuzzer.cc +++ b/test/fuzzers/vp8_depacketizer_fuzzer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" +#include "modules/rtp_rtcp/source/rtp_format_vp8.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/vp8_qp_parser_fuzzer.cc b/test/fuzzers/vp8_qp_parser_fuzzer.cc index 5135f1a471..2ecfd820c8 100644 --- a/test/fuzzers/vp8_qp_parser_fuzzer.cc +++ b/test/fuzzers/vp8_qp_parser_fuzzer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" +#include "modules/video_coding/utility/vp8_header_parser.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/vp9_depacketizer_fuzzer.cc b/test/fuzzers/vp9_depacketizer_fuzzer.cc index 02a7cc0f81..8f62b429ff 100644 --- a/test/fuzzers/vp9_depacketizer_fuzzer.cc +++ b/test/fuzzers/vp9_depacketizer_fuzzer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/vp9_qp_parser_fuzzer.cc b/test/fuzzers/vp9_qp_parser_fuzzer.cc index 7dbed2e93d..3cff95f5b7 100644 --- a/test/fuzzers/vp9_qp_parser_fuzzer.cc +++ b/test/fuzzers/vp9_qp_parser_fuzzer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/webrtc_fuzzer_main.cc b/test/fuzzers/webrtc_fuzzer_main.cc index a5d5ed1db7..ca4bc15c71 100644 --- a/test/fuzzers/webrtc_fuzzer_main.cc +++ b/test/fuzzers/webrtc_fuzzer_main.cc @@ -12,7 +12,7 @@ // It's intended to set sane defaults, such as removing logging for further // fuzzing efficiency. -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace { bool g_initialized = false; diff --git a/test/gl/gl_renderer.cc b/test/gl/gl_renderer.cc index c55f347af2..ef7ab9c126 100644 --- a/test/gl/gl_renderer.cc +++ b/test/gl/gl_renderer.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gl/gl_renderer.h" +#include "test/gl/gl_renderer.h" #include -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/test/gl/gl_renderer.h b/test/gl/gl_renderer.h index 01dc18db65..390e5de705 100644 --- a/test/gl/gl_renderer.h +++ b/test/gl/gl_renderer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_GL_GL_RENDERER_H_ -#define WEBRTC_TEST_GL_GL_RENDERER_H_ +#ifndef TEST_GL_GL_RENDERER_H_ +#define TEST_GL_GL_RENDERER_H_ #ifdef WEBRTC_MAC #include @@ -17,8 +17,8 @@ #include #endif -#include "webrtc/test/video_renderer.h" -#include "webrtc/typedefs.h" +#include "test/video_renderer.h" +#include "typedefs.h" namespace webrtc { @@ -47,4 +47,4 @@ class GlRenderer : public VideoRenderer { } // test } // webrtc -#endif // WEBRTC_TEST_GL_GL_RENDERER_H_ +#endif // TEST_GL_GL_RENDERER_H_ diff --git a/test/gmock.h b/test/gmock.h index 8e321a036b..f137d080a4 100644 --- a/test/gmock.h +++ b/test/gmock.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_GMOCK_H_ -#define WEBRTC_TEST_GMOCK_H_ +#ifndef TEST_GMOCK_H_ +#define TEST_GMOCK_H_ -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "testing/gmock/include/gmock/gmock.h" RTC_POP_IGNORING_WUNDEF() -#endif // WEBRTC_TEST_GMOCK_H_ +#endif // TEST_GMOCK_H_ diff --git a/test/gtest.h b/test/gtest.h index 886e7b8b63..928ec496f0 100644 --- a/test/gtest.h +++ b/test/gtest.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_GTEST_H_ -#define WEBRTC_TEST_GTEST_H_ +#ifndef TEST_GTEST_H_ +#define TEST_GTEST_H_ -#include "webrtc/rtc_base/ignore_wundef.h" +#include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "testing/gtest/include/gtest/gtest.h" @@ -24,4 +24,4 @@ RTC_POP_IGNORING_WUNDEF() #define GTEST_HAS_DEATH_TEST 0 #endif -#endif // WEBRTC_TEST_GTEST_H_ +#endif // TEST_GTEST_H_ diff --git a/test/ios/test_support.h b/test/ios/test_support.h index a9620039c1..7bc2993b9e 100644 --- a/test/ios/test_support.h +++ b/test/ios/test_support.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_IOS_TEST_SUPPORT_H_ -#define WEBRTC_TEST_IOS_TEST_SUPPORT_H_ +#ifndef TEST_IOS_TEST_SUPPORT_H_ +#define TEST_IOS_TEST_SUPPORT_H_ namespace rtc { namespace test { @@ -22,4 +22,4 @@ void InitTestSuite(int (*test_suite)(void), int argc, char* argv[]); } // namespace test } // namespace rtc -#endif // WEBRTC_TEST_IOS_TEST_SUPPORT_H_ +#endif // TEST_IOS_TEST_SUPPORT_H_ diff --git a/test/ios/test_support.mm b/test/ios/test_support.mm index a01b03c9f0..603bc8c19c 100644 --- a/test/ios/test_support.mm +++ b/test/ios/test_support.mm @@ -10,9 +10,9 @@ #import -#include "webrtc/test/ios/test_support.h" +#include "test/ios/test_support.h" -#import "webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h" +#import "sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h" // Springboard will kill any iOS app that fails to check in after launch within // a given time. Starting a UIApplication before invoking TestSuite::Run diff --git a/test/layer_filtering_transport.cc b/test/layer_filtering_transport.cc index 7d7288a0b5..3a2a97ef5a 100644 --- a/test/layer_filtering_transport.cc +++ b/test/layer_filtering_transport.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/layer_filtering_transport.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "test/layer_filtering_transport.h" namespace webrtc { namespace test { diff --git a/test/layer_filtering_transport.h b/test/layer_filtering_transport.h index 32eb4c5a30..abbc86a9ec 100644 --- a/test/layer_filtering_transport.h +++ b/test/layer_filtering_transport.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_ -#define WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_ +#ifndef TEST_LAYER_FILTERING_TRANSPORT_H_ +#define TEST_LAYER_FILTERING_TRANSPORT_H_ -#include "webrtc/call/call.h" -#include "webrtc/test/direct_transport.h" -#include "webrtc/test/fake_network_pipe.h" -#include "webrtc/test/single_threaded_task_queue.h" +#include "call/call.h" +#include "test/direct_transport.h" +#include "test/fake_network_pipe.h" +#include "test/single_threaded_task_queue.h" #include @@ -50,4 +50,4 @@ class LayerFilteringTransport : public test::DirectTransport { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_ +#endif // TEST_LAYER_FILTERING_TRANSPORT_H_ diff --git a/test/linux/glx_renderer.cc b/test/linux/glx_renderer.cc index d6979c8a58..4dbf1c97d9 100644 --- a/test/linux/glx_renderer.cc +++ b/test/linux/glx_renderer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/linux/glx_renderer.h" +#include "test/linux/glx_renderer.h" #include #include @@ -16,7 +16,7 @@ #include #include -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" namespace webrtc { namespace test { diff --git a/test/linux/glx_renderer.h b/test/linux/glx_renderer.h index 4a758db0e8..646cfc84de 100644 --- a/test/linux/glx_renderer.h +++ b/test/linux/glx_renderer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_LINUX_GLX_RENDERER_H_ -#define WEBRTC_TEST_LINUX_GLX_RENDERER_H_ +#ifndef TEST_LINUX_GLX_RENDERER_H_ +#define TEST_LINUX_GLX_RENDERER_H_ #include #include -#include "webrtc/test/gl/gl_renderer.h" -#include "webrtc/typedefs.h" +#include "test/gl/gl_renderer.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -44,4 +44,4 @@ class GlxRenderer : public GlRenderer { } // test } // webrtc -#endif // WEBRTC_TEST_LINUX_GLX_RENDERER_H_ +#endif // TEST_LINUX_GLX_RENDERER_H_ diff --git a/test/linux/video_renderer_linux.cc b/test/linux/video_renderer_linux.cc index 6f69dd7498..942848942f 100644 --- a/test/linux/video_renderer_linux.cc +++ b/test/linux/video_renderer_linux.cc @@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/video_renderer.h" +#include "test/video_renderer.h" -#include "webrtc/test/linux/glx_renderer.h" +#include "test/linux/glx_renderer.h" namespace webrtc { namespace test { diff --git a/test/mac/run_test.mm b/test/mac/run_test.mm index 7576b55763..38c6c8f8c1 100644 --- a/test/mac/run_test.mm +++ b/test/mac/run_test.mm @@ -10,7 +10,7 @@ #import -#include "webrtc/test/run_test.h" +#include "test/run_test.h" // Converting a C++ function pointer to an Objective-C block. typedef void(^TestBlock)(); diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h index 2d5516398d..19349c037a 100644 --- a/test/mac/video_renderer_mac.h +++ b/test/mac/video_renderer_mac.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_ -#define WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_ +#ifndef TEST_MAC_VIDEO_RENDERER_MAC_H_ +#define TEST_MAC_VIDEO_RENDERER_MAC_H_ -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/test/gl/gl_renderer.h" +#include "rtc_base/constructormagic.h" +#include "test/gl/gl_renderer.h" @class CocoaWindow; @@ -37,4 +37,4 @@ class MacRenderer : public GlRenderer { } // test } // webrtc -#endif // WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_ +#endif // TEST_MAC_VIDEO_RENDERER_MAC_H_ diff --git a/test/mac/video_renderer_mac.mm b/test/mac/video_renderer_mac.mm index 411a7d0614..56bf360986 100644 --- a/test/mac/video_renderer_mac.mm +++ b/test/mac/video_renderer_mac.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/mac/video_renderer_mac.h" +#include "test/mac/video_renderer_mac.h" #import diff --git a/test/mock_audio_decoder.cc b/test/mock_audio_decoder.cc index 102ba794a9..5af9f370cd 100644 --- a/test/mock_audio_decoder.cc +++ b/test/mock_audio_decoder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/mock_audio_decoder.h" +#include "test/mock_audio_decoder.h" namespace webrtc { diff --git a/test/mock_audio_decoder.h b/test/mock_audio_decoder.h index d124b0f8a1..67cd0f775c 100644 --- a/test/mock_audio_decoder.h +++ b/test/mock_audio_decoder.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_AUDIO_DECODER_H_ -#define WEBRTC_TEST_MOCK_AUDIO_DECODER_H_ +#ifndef TEST_MOCK_AUDIO_DECODER_H_ +#define TEST_MOCK_AUDIO_DECODER_H_ -#include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/test/gmock.h" +#include "api/audio_codecs/audio_decoder.h" +#include "test/gmock.h" namespace webrtc { @@ -35,4 +35,4 @@ class MockAudioDecoder : public AudioDecoder { }; } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_AUDIO_DECODER_H_ +#endif // TEST_MOCK_AUDIO_DECODER_H_ diff --git a/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h index ae7cc42bce..6104b067a5 100644 --- a/test/mock_audio_decoder_factory.h +++ b/test/mock_audio_decoder_factory.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_ -#define WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_ +#ifndef TEST_MOCK_AUDIO_DECODER_FACTORY_H_ +#define TEST_MOCK_AUDIO_DECODER_FACTORY_H_ #include #include -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/gmock.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gmock.h" namespace webrtc { @@ -80,4 +80,4 @@ class MockAudioDecoderFactory : public AudioDecoderFactory { } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_ +#endif // TEST_MOCK_AUDIO_DECODER_FACTORY_H_ diff --git a/test/mock_audio_encoder.cc b/test/mock_audio_encoder.cc index 5365ef0e9c..cd89bdd4e8 100644 --- a/test/mock_audio_encoder.cc +++ b/test/mock_audio_encoder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/mock_audio_encoder.h" +#include "test/mock_audio_encoder.h" namespace webrtc { diff --git a/test/mock_audio_encoder.h b/test/mock_audio_encoder.h index c30b35eea0..8196cf18a7 100644 --- a/test/mock_audio_encoder.h +++ b/test/mock_audio_encoder.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_ -#define WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_ +#ifndef TEST_MOCK_AUDIO_ENCODER_H_ +#define TEST_MOCK_AUDIO_ENCODER_H_ #include -#include "webrtc/api/array_view.h" -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/test/gmock.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_encoder.h" +#include "test/gmock.h" namespace webrtc { @@ -104,4 +104,4 @@ class MockAudioEncoder : public AudioEncoder { } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_ +#endif // TEST_MOCK_AUDIO_ENCODER_H_ diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h index c095197498..9b63f7d18f 100644 --- a/test/mock_audio_encoder_factory.h +++ b/test/mock_audio_encoder_factory.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ -#define WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ +#ifndef TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ +#define TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ #include #include -#include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/gmock.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gmock.h" namespace webrtc { @@ -88,4 +88,4 @@ class MockAudioEncoderFactory : public AudioEncoderFactory { } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ +#endif // TEST_MOCK_AUDIO_ENCODER_FACTORY_H_ diff --git a/test/mock_transport.h b/test/mock_transport.h index d76dc6e352..9837593f33 100644 --- a/test/mock_transport.h +++ b/test/mock_transport.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_TRANSPORT_H_ -#define WEBRTC_TEST_MOCK_TRANSPORT_H_ +#ifndef TEST_MOCK_TRANSPORT_H_ +#define TEST_MOCK_TRANSPORT_H_ -#include "webrtc/api/call/transport.h" -#include "webrtc/test/gmock.h" +#include "api/call/transport.h" +#include "test/gmock.h" namespace webrtc { @@ -25,4 +25,4 @@ class MockTransport : public Transport { MOCK_METHOD2(SendRtcp, bool(const uint8_t* data, size_t len)); }; } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_TRANSPORT_H_ +#endif // TEST_MOCK_TRANSPORT_H_ diff --git a/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h index b151aa8e0e..77fb1717dc 100644 --- a/test/mock_voe_channel_proxy.h +++ b/test/mock_voe_channel_proxy.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_ -#define WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_ +#ifndef TEST_MOCK_VOE_CHANNEL_PROXY_H_ +#define TEST_MOCK_VOE_CHANNEL_PROXY_H_ #include -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/test/gmock.h" -#include "webrtc/voice_engine/channel_proxy.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "test/gmock.h" +#include "voice_engine/channel_proxy.h" namespace webrtc { namespace test { @@ -97,4 +97,4 @@ class MockVoEChannelProxy : public voe::ChannelProxy { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_ +#endif // TEST_MOCK_VOE_CHANNEL_PROXY_H_ diff --git a/test/mock_voice_engine.h b/test/mock_voice_engine.h index 79443b99a1..d644f24861 100644 --- a/test/mock_voice_engine.h +++ b/test/mock_voice_engine.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_ -#define WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_ +#ifndef AUDIO_MOCK_VOICE_ENGINE_H_ +#define AUDIO_MOCK_VOICE_ENGINE_H_ #include -#include "webrtc/modules/audio_device/include/mock_audio_device.h" -#include "webrtc/modules/audio_device/include/mock_audio_transport.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/mock_voe_channel_proxy.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "modules/audio_device/include/mock_audio_device.h" +#include "modules/audio_device/include/mock_audio_transport.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "test/gmock.h" +#include "test/mock_voe_channel_proxy.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { namespace voe { @@ -258,4 +258,4 @@ class MockVoiceEngine : public VoiceEngineImpl { } // namespace test } // namespace webrtc -#endif // WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_ +#endif // AUDIO_MOCK_VOICE_ENGINE_H_ diff --git a/test/null_platform_renderer.cc b/test/null_platform_renderer.cc index 362f7db762..48e4cc0d8b 100644 --- a/test/null_platform_renderer.cc +++ b/test/null_platform_renderer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/video_renderer.h" +#include "test/video_renderer.h" namespace webrtc { namespace test { diff --git a/test/null_transport.cc b/test/null_transport.cc index 7fa36d1246..efbd9499d8 100644 --- a/test/null_transport.cc +++ b/test/null_transport.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/null_transport.h" +#include "test/null_transport.h" namespace webrtc { namespace test { diff --git a/test/null_transport.h b/test/null_transport.h index 41c4759b93..f264e7b45a 100644 --- a/test/null_transport.h +++ b/test/null_transport.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_NULL_TRANSPORT_H_ -#define WEBRTC_TEST_NULL_TRANSPORT_H_ +#ifndef TEST_NULL_TRANSPORT_H_ +#define TEST_NULL_TRANSPORT_H_ -#include "webrtc/api/call/transport.h" +#include "api/call/transport.h" namespace webrtc { @@ -27,4 +27,4 @@ class NullTransport : public Transport { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_NULL_TRANSPORT_H_ +#endif // TEST_NULL_TRANSPORT_H_ diff --git a/test/rtcp_packet_parser.cc b/test/rtcp_packet_parser.cc index ad90ce6072..f15660866c 100644 --- a/test/rtcp_packet_parser.cc +++ b/test/rtcp_packet_parser.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/rtcp_packet_parser.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "test/rtcp_packet_parser.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { namespace test { diff --git a/test/rtcp_packet_parser.h b/test/rtcp_packet_parser.h index 997c343ee0..96e97c107d 100644 --- a/test/rtcp_packet_parser.h +++ b/test/rtcp_packet_parser.h @@ -9,27 +9,27 @@ * */ -#ifndef WEBRTC_TEST_RTCP_PACKET_PARSER_H_ -#define WEBRTC_TEST_RTCP_PACKET_PARSER_H_ +#ifndef TEST_RTCP_PACKET_PARSER_H_ +#define TEST_RTCP_PACKET_PARSER_H_ -#include "webrtc/api/array_view.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" +#include "api/array_view.h" +#include "modules/rtp_rtcp/source/rtcp_packet/app.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { @@ -118,4 +118,4 @@ class RtcpPacketParser { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RTCP_PACKET_PARSER_H_ +#endif // TEST_RTCP_PACKET_PARSER_H_ diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc index 36ad33a608..b1fab07cfb 100644 --- a/test/rtp_file_reader.cc +++ b/test/rtp_file_reader.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/rtp_file_reader.h" +#include "test/rtp_file_reader.h" #include @@ -16,11 +16,11 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" namespace webrtc { namespace test { diff --git a/test/rtp_file_reader.h b/test/rtp_file_reader.h index c132d318fd..75b3b86ff3 100644 --- a/test/rtp_file_reader.h +++ b/test/rtp_file_reader.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_RTP_FILE_READER_H_ -#define WEBRTC_TEST_RTP_FILE_READER_H_ +#ifndef TEST_RTP_FILE_READER_H_ +#define TEST_RTP_FILE_READER_H_ #include #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { namespace test { @@ -46,4 +46,4 @@ class RtpFileReader { }; } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RTP_FILE_READER_H_ +#endif // TEST_RTP_FILE_READER_H_ diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc index a9cd09879e..b41f32fc9c 100644 --- a/test/rtp_file_reader_unittest.cc +++ b/test/rtp_file_reader_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtp_file_reader.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "test/gtest.h" +#include "test/rtp_file_reader.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc index 596c234429..132ce9a0a4 100644 --- a/test/rtp_file_writer.cc +++ b/test/rtp_file_writer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/rtp_file_writer.h" +#include "test/rtp_file_writer.h" #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/test/rtp_file_writer.h b/test/rtp_file_writer.h index 453b27762e..19659cfeae 100644 --- a/test/rtp_file_writer.h +++ b/test/rtp_file_writer.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_RTP_FILE_WRITER_H_ -#define WEBRTC_TEST_RTP_FILE_WRITER_H_ +#ifndef TEST_RTP_FILE_WRITER_H_ +#define TEST_RTP_FILE_WRITER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/test/rtp_file_reader.h" +#include "common_types.h" +#include "test/rtp_file_reader.h" namespace webrtc { namespace test { @@ -30,4 +30,4 @@ class RtpFileWriter { }; } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RTP_FILE_WRITER_H_ +#endif // TEST_RTP_FILE_WRITER_H_ diff --git a/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc index fa7d79d039..aec10f793b 100644 --- a/test/rtp_file_writer_unittest.cc +++ b/test/rtp_file_writer_unittest.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtp_file_reader.h" -#include "webrtc/test/rtp_file_writer.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/rtp_file_reader.h" +#include "test/rtp_file_writer.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h index 8d6fefdcd8..1fb2c064d3 100644 --- a/test/rtp_rtcp_observer.h +++ b/test/rtp_rtcp_observer.h @@ -7,22 +7,22 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ -#define WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ +#ifndef TEST_RTP_RTCP_OBSERVER_H_ +#define TEST_RTP_RTCP_OBSERVER_H_ #include #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/test/constants.h" -#include "webrtc/test/direct_transport.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" -#include "webrtc/call/video_send_stream.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "system_wrappers/include/field_trial.h" +#include "test/constants.h" +#include "test/direct_transport.h" +#include "test/gtest.h" +#include "typedefs.h" +#include "call/video_send_stream.h" namespace { const int kShortTimeoutMs = 500; @@ -154,4 +154,4 @@ class PacketTransport : public test::DirectTransport { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ +#endif // TEST_RTP_RTCP_OBSERVER_H_ diff --git a/test/run_loop.cc b/test/run_loop.cc index 92f85dd09d..0d00ecd5e9 100644 --- a/test/run_loop.cc +++ b/test/run_loop.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/run_loop.h" +#include "test/run_loop.h" #include diff --git a/test/run_loop.h b/test/run_loop.h index 238e2dc282..90063dc3e8 100644 --- a/test/run_loop.h +++ b/test/run_loop.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_RUN_LOOP_H_ -#define WEBRTC_TEST_RUN_LOOP_H_ +#ifndef TEST_RUN_LOOP_H_ +#define TEST_RUN_LOOP_H_ namespace webrtc { namespace test { @@ -19,4 +19,4 @@ void PressEnterToContinue(); } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RUN_LOOP_H_ +#endif // TEST_RUN_LOOP_H_ diff --git a/test/run_test.cc b/test/run_test.cc index 4daea42a1e..ba0bf34d23 100644 --- a/test/run_test.cc +++ b/test/run_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/run_test.h" +#include "test/run_test.h" #include diff --git a/test/run_test.h b/test/run_test.h index b515254685..ed908570fd 100644 --- a/test/run_test.h +++ b/test/run_test.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_RUN_TEST_H -#define WEBRTC_TEST_RUN_TEST_H +#ifndef TEST_RUN_TEST_H_ +#define TEST_RUN_TEST_H_ namespace webrtc { namespace test { @@ -19,4 +19,4 @@ void RunTest(void(*test)()); } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_RUN_TEST_H +#endif // TEST_RUN_TEST_H_ diff --git a/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc index bee59810a3..6ca57a2007 100644 --- a/test/single_threaded_task_queue.cc +++ b/test/single_threaded_task_queue.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/single_threaded_task_queue.h" +#include "test/single_threaded_task_queue.h" #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/safe_conversions.h" -#include "webrtc/rtc_base/timeutils.h" +#include "rtc_base/checks.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/safe_conversions.h" +#include "rtc_base/timeutils.h" namespace webrtc { namespace test { diff --git a/test/single_threaded_task_queue.h b/test/single_threaded_task_queue.h index c078bdd077..0721891263 100644 --- a/test/single_threaded_task_queue.h +++ b/test/single_threaded_task_queue.h @@ -7,17 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_ -#define WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_ +#ifndef TEST_SINGLE_THREADED_TASK_QUEUE_H_ +#define TEST_SINGLE_THREADED_TASK_QUEUE_H_ #include #include #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/thread_checker.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/thread_checker.h" namespace webrtc { namespace test { @@ -94,4 +94,4 @@ class SingleThreadedTaskQueueForTesting { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_ +#endif // TEST_SINGLE_THREADED_TASK_QUEUE_H_ diff --git a/test/single_threaded_task_queue_unittest.cc b/test/single_threaded_task_queue_unittest.cc index 8ad8b4f7d0..5bd40d704a 100644 --- a/test/single_threaded_task_queue_unittest.cc +++ b/test/single_threaded_task_queue_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/single_threaded_task_queue.h" +#include "test/single_threaded_task_queue.h" #include #include #include -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/event.h" +#include "rtc_base/ptr_util.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/test/statistics.cc b/test/statistics.cc index 0075d4c9a3..c43dde96fa 100644 --- a/test/statistics.cc +++ b/test/statistics.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/statistics.h" +#include "test/statistics.h" #include diff --git a/test/statistics.h b/test/statistics.h index d4a111e061..022bc9b6df 100644 --- a/test/statistics.h +++ b/test/statistics.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_STATISTICS_H_ -#define WEBRTC_TEST_STATISTICS_H_ +#ifndef TEST_STATISTICS_H_ +#define TEST_STATISTICS_H_ -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -33,4 +33,4 @@ class Statistics { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_STATISTICS_H_ +#endif // TEST_STATISTICS_H_ diff --git a/test/test_main.cc b/test/test_main.cc index 3790a68afe..8a6f26653b 100644 --- a/test/test_main.cc +++ b/test/test_main.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "rtc_base/flags.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/field_trial.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/trace_to_stderr.h" #if defined(WEBRTC_IOS) -#include "webrtc/test/ios/test_support.h" +#include "test/ios/test_support.h" DEFINE_string(NSTreatUnknownArgumentsAsOpen, "", "Intentionally ignored flag intended for iOS simulator."); diff --git a/test/testsupport/always_passing_unittest.cc b/test/testsupport/always_passing_unittest.cc index 79a4869918..e6318f7e0b 100644 --- a/test/testsupport/always_passing_unittest.cc +++ b/test/testsupport/always_passing_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc index deb9cf0494..93cc5fdb51 100644 --- a/test/testsupport/fileutils.cc +++ b/test/testsupport/fileutils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" #include @@ -21,7 +21,7 @@ #include "Shlwapi.h" #include "WinDef.h" -#include "webrtc/rtc_base/win32.h" +#include "rtc_base/win32.h" #define GET_CURRENT_DIR _getcwd #else #include @@ -42,8 +42,8 @@ #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/typedefs.h" // For architecture defines +#include "rtc_base/checks.h" +#include "typedefs.h" // For architecture defines namespace webrtc { namespace test { diff --git a/test/testsupport/fileutils.h b/test/testsupport/fileutils.h index 5ea7d31705..f0560cf979 100644 --- a/test/testsupport/fileutils.h +++ b/test/testsupport/fileutils.h @@ -10,13 +10,13 @@ #include -#ifndef WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_ -#define WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_ +#ifndef TEST_TESTSUPPORT_FILEUTILS_H_ +#define TEST_TESTSUPPORT_FILEUTILS_H_ #include #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { namespace test { @@ -107,4 +107,4 @@ void SetExecutablePath(const std::string& path_to_executable); } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_ +#endif // TEST_TESTSUPPORT_FILEUTILS_H_ diff --git a/test/testsupport/fileutils_unittest.cc b/test/testsupport/fileutils_unittest.cc index fb780be56e..79988c0dd3 100644 --- a/test/testsupport/fileutils_unittest.cc +++ b/test/testsupport/fileutils_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" #include @@ -17,10 +17,10 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/gtest.h" +#include "api/optional.h" +#include "rtc_base/checks.h" +#include "rtc_base/pathutils.h" +#include "test/gtest.h" #ifdef WIN32 #define chdir _chdir diff --git a/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h index a8fe73f75d..c9fa1c266f 100644 --- a/test/testsupport/frame_reader.h +++ b/test/testsupport/frame_reader.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_ -#define WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_ +#ifndef TEST_TESTSUPPORT_FRAME_READER_H_ +#define TEST_TESTSUPPORT_FRAME_READER_H_ #include #include -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { class I420Buffer; @@ -72,4 +72,4 @@ class YuvFrameReaderImpl : public FrameReader { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_ +#endif // TEST_TESTSUPPORT_FRAME_READER_H_ diff --git a/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h index faab50edcf..6c2c9ad4a8 100644 --- a/test/testsupport/frame_writer.h +++ b/test/testsupport/frame_writer.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_ -#define WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_ +#ifndef TEST_TESTSUPPORT_FRAME_WRITER_H_ +#define TEST_TESTSUPPORT_FRAME_WRITER_H_ #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/typedefs.h" +#include "api/video/video_frame.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -102,4 +102,4 @@ class JpegFrameWriter { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_ +#endif // TEST_TESTSUPPORT_FRAME_WRITER_H_ diff --git a/test/testsupport/iosfileutils.mm b/test/testsupport/iosfileutils.mm index b3262c56de..e1e5cd6378 100644 --- a/test/testsupport/iosfileutils.mm +++ b/test/testsupport/iosfileutils.mm @@ -13,9 +13,9 @@ #import #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" -#include "webrtc/typedefs.h" +#include "rtc_base/checks.h" +#include "sdk/objc/Framework/Classes/Common/helpers.h" +#include "typedefs.h" namespace webrtc { namespace test { diff --git a/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc index 8174cc207c..c8f5c30fd7 100644 --- a/test/testsupport/jpeg_frame_writer.cc +++ b/test/testsupport/jpeg_frame_writer.cc @@ -11,11 +11,11 @@ #include -#include "webrtc/common_types.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "common_types.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "test/testsupport/frame_writer.h" extern "C" { #if defined(USE_SYSTEM_LIBJPEG) diff --git a/test/testsupport/jpeg_frame_writer_ios.cc b/test/testsupport/jpeg_frame_writer_ios.cc index 835a8adc44..b87d7d176d 100644 --- a/test/testsupport/jpeg_frame_writer_ios.cc +++ b/test/testsupport/jpeg_frame_writer_ios.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { diff --git a/test/testsupport/metrics/video_metrics.cc b/test/testsupport/metrics/video_metrics.cc index e150f369ab..ea5d3f2b5f 100644 --- a/test/testsupport/metrics/video_metrics.cc +++ b/test/testsupport/metrics/video_metrics.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/metrics/video_metrics.h" +#include "test/testsupport/metrics/video_metrics.h" #include #include @@ -16,10 +16,10 @@ #include // min_element, max_element #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/test/frame_utils.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "test/frame_utils.h" #include "libyuv/convert.h" namespace webrtc { diff --git a/test/testsupport/metrics/video_metrics.h b/test/testsupport/metrics/video_metrics.h index 8448ccfd24..f72ea9b7bb 100644 --- a/test/testsupport/metrics/video_metrics.h +++ b/test/testsupport/metrics/video_metrics.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_ -#define WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_ +#ifndef TESTSUPPORT_METRICS_VIDEO_METRICS_H_ +#define TESTSUPPORT_METRICS_VIDEO_METRICS_H_ #include #include @@ -118,4 +118,4 @@ int I420SSIMFromFiles(const char* ref_filename, } // namespace test } // namespace webrtc -#endif // WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_ +#endif // TESTSUPPORT_METRICS_VIDEO_METRICS_H_ diff --git a/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc index 83a34a3985..5b00458761 100644 --- a/test/testsupport/metrics/video_metrics_unittest.cc +++ b/test/testsupport/metrics/video_metrics_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/metrics/video_metrics.h" +#include "test/testsupport/metrics/video_metrics.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { diff --git a/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h index 5fd28737a7..4ba416fedf 100644 --- a/test/testsupport/mock/mock_frame_reader.h +++ b/test/testsupport/mock/mock_frame_reader.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ -#define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ +#ifndef TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ +#define TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ -#include "webrtc/test/testsupport/frame_reader.h" +#include "test/testsupport/frame_reader.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -30,4 +30,4 @@ class MockFrameReader : public FrameReader { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ +#endif // TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_ diff --git a/test/testsupport/mock/mock_frame_writer.h b/test/testsupport/mock/mock_frame_writer.h index 8ba96bcf08..2f6602dd3f 100644 --- a/test/testsupport/mock/mock_frame_writer.h +++ b/test/testsupport/mock/mock_frame_writer.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ -#define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ +#ifndef TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ +#define TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ -#include "webrtc/test/testsupport/frame_writer.h" +#include "test/testsupport/frame_writer.h" -#include "webrtc/test/gmock.h" +#include "test/gmock.h" namespace webrtc { namespace test { @@ -29,4 +29,4 @@ class MockFrameWriter : public FrameWriter { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ +#endif // TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_ diff --git a/test/testsupport/packet_reader.cc b/test/testsupport/packet_reader.cc index e27ec22f16..ba52f94e57 100644 --- a/test/testsupport/packet_reader.cc +++ b/test/testsupport/packet_reader.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/packet_reader.h" +#include "test/testsupport/packet_reader.h" #include #include diff --git a/test/testsupport/packet_reader.h b/test/testsupport/packet_reader.h index b58db4d093..23255fef65 100644 --- a/test/testsupport/packet_reader.h +++ b/test/testsupport/packet_reader.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_ -#define WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_ +#ifndef TEST_TESTSUPPORT_PACKET_READER_H_ +#define TEST_TESTSUPPORT_PACKET_READER_H_ #include -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -51,4 +51,4 @@ class PacketReader { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_ +#endif // TEST_TESTSUPPORT_PACKET_READER_H_ diff --git a/test/testsupport/packet_reader_unittest.cc b/test/testsupport/packet_reader_unittest.cc index ded1db39dd..3255151d05 100644 --- a/test/testsupport/packet_reader_unittest.cc +++ b/test/testsupport/packet_reader_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/packet_reader.h" +#include "test/testsupport/packet_reader.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/unittest_utils.h" +#include "test/gtest.h" +#include "test/testsupport/unittest_utils.h" namespace webrtc { namespace test { diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index 3266bb7945..d79b4ec643 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -12,7 +12,7 @@ // ResultsToString(), PrintResult(size_t value) and AppendResult(size_t value) // have been modified. The remainder are identical to the Chromium version. -#include "webrtc/test/testsupport/perf_test.h" +#include "test/testsupport/perf_test.h" #include #include diff --git a/test/testsupport/perf_test.h b/test/testsupport/perf_test.h index 6e49ac90e0..e94f891fc1 100644 --- a/test/testsupport/perf_test.h +++ b/test/testsupport/perf_test.h @@ -12,8 +12,8 @@ // Several functions have been removed; the prototypes of the remainder have // not been changed. -#ifndef WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_ -#define WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_ +#ifndef TEST_TESTSUPPORT_PERF_TEST_H_ +#define TEST_TESTSUPPORT_PERF_TEST_H_ #include #include @@ -137,4 +137,4 @@ std::string ValuesToString(const Container& container) { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_ +#endif // TEST_TESTSUPPORT_PERF_TEST_H_ diff --git a/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc index 4516b99e59..3ad4197f54 100644 --- a/test/testsupport/perf_test_unittest.cc +++ b/test/testsupport/perf_test_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/perf_test.h" +#include "test/testsupport/perf_test.h" #include -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { namespace test { diff --git a/test/testsupport/test_output.cc b/test/testsupport/test_output.cc index f9d64b49cf..882e2c04d1 100644 --- a/test/testsupport/test_output.cc +++ b/test/testsupport/test_output.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/test_output.h" +#include "test/testsupport/test_output.h" #include -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/file.h" +#include "rtc_base/flags.h" +#include "rtc_base/logging.h" +#include "rtc_base/pathutils.h" +#include "test/testsupport/fileutils.h" namespace { const std::string& DefaultOutputPath() { diff --git a/test/testsupport/test_output.h b/test/testsupport/test_output.h index c502ea38d9..e20b65676b 100644 --- a/test/testsupport/test_output.h +++ b/test/testsupport/test_output.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_ -#define WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_ +#ifndef TEST_TESTSUPPORT_TEST_OUTPUT_H_ +#define TEST_TESTSUPPORT_TEST_OUTPUT_H_ #include @@ -36,4 +36,4 @@ bool WriteToTestOutput(const char* filename, const std::string& content); } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_ +#endif // TEST_TESTSUPPORT_TEST_OUTPUT_H_ diff --git a/test/testsupport/test_output_unittest.cc b/test/testsupport/test_output_unittest.cc index a082dc1ec8..82898b90ee 100644 --- a/test/testsupport/test_output_unittest.cc +++ b/test/testsupport/test_output_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/test_output.h" +#include "test/testsupport/test_output.h" #include #include -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/test/gtest.h" +#include "rtc_base/file.h" +#include "rtc_base/flags.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/platform_file.h" +#include "test/gtest.h" DECLARE_string(test_output_dir); diff --git a/test/testsupport/trace_to_stderr.cc b/test/testsupport/trace_to_stderr.cc index 7338441fa5..5b75d1bf8e 100644 --- a/test/testsupport/trace_to_stderr.cc +++ b/test/testsupport/trace_to_stderr.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "test/testsupport/trace_to_stderr.h" #include #include diff --git a/test/testsupport/trace_to_stderr.h b/test/testsupport/trace_to_stderr.h index a713b798c5..bb8a53ab8f 100644 --- a/test/testsupport/trace_to_stderr.h +++ b/test/testsupport/trace_to_stderr.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ -#define WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ +#ifndef TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ +#define TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ -#include "webrtc/system_wrappers/include/trace.h" +#include "system_wrappers/include/trace.h" namespace webrtc { namespace test { @@ -49,4 +49,4 @@ class TraceToStderr : public TraceCallback { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ +#endif // TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ diff --git a/test/testsupport/unittest_utils.h b/test/testsupport/unittest_utils.h index ba6db9883b..5fee2ca454 100644 --- a/test/testsupport/unittest_utils.h +++ b/test/testsupport/unittest_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_ -#define WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_ +#ifndef TEST_TESTSUPPORT_UNITTEST_UTILS_H_ +#define TEST_TESTSUPPORT_UNITTEST_UTILS_H_ namespace webrtc { namespace test { @@ -53,4 +53,4 @@ class PacketRelatedTest: public testing::Test { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_ +#endif // TEST_TESTSUPPORT_UNITTEST_UTILS_H_ diff --git a/test/testsupport/y4m_frame_writer.cc b/test/testsupport/y4m_frame_writer.cc index e33898243f..e0c1ed54ba 100644 --- a/test/testsupport/y4m_frame_writer.cc +++ b/test/testsupport/y4m_frame_writer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "rtc_base/checks.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { namespace test { diff --git a/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc index a4e417228f..d9ec09a2b7 100644 --- a/test/testsupport/y4m_frame_writer_unittest.cc +++ b/test/testsupport/y4m_frame_writer_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { namespace test { diff --git a/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc index 3fe481ee1e..60f9994b14 100644 --- a/test/testsupport/yuv_frame_reader.cc +++ b/test/testsupport/yuv_frame_reader.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/frame_reader.h" +#include "test/testsupport/frame_reader.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "api/video/i420_buffer.h" +#include "test/frame_utils.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace test { diff --git a/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc index 87d51c2cd0..dd4b980c71 100644 --- a/test/testsupport/yuv_frame_reader_unittest.cc +++ b/test/testsupport/yuv_frame_reader_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/frame_reader.h" +#include "api/video/i420_buffer.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_reader.h" namespace webrtc { namespace test { diff --git a/test/testsupport/yuv_frame_writer.cc b/test/testsupport/yuv_frame_writer.cc index 84fba7ef00..1bd343c513 100644 --- a/test/testsupport/yuv_frame_writer.cc +++ b/test/testsupport/yuv_frame_writer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "rtc_base/checks.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { namespace test { diff --git a/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc index 5e3cc5c9c9..49b595e1da 100644 --- a/test/testsupport/yuv_frame_writer_unittest.cc +++ b/test/testsupport/yuv_frame_writer_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/frame_writer.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_writer.h" namespace webrtc { namespace test { diff --git a/test/vcm_capturer.cc b/test/vcm_capturer.cc index 0c6ded03b4..e04dbc068e 100644 --- a/test/vcm_capturer.cc +++ b/test/vcm_capturer.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/vcm_capturer.h" +#include "test/vcm_capturer.h" -#include "webrtc/modules/video_capture/video_capture_factory.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/call/video_send_stream.h" +#include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/logging.h" +#include "call/video_send_stream.h" namespace webrtc { namespace test { diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h index 2b4323c0e5..356405c93a 100644 --- a/test/vcm_capturer.h +++ b/test/vcm_capturer.h @@ -7,17 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_VCM_CAPTURER_H_ -#define WEBRTC_TEST_VCM_CAPTURER_H_ +#ifndef TEST_VCM_CAPTURER_H_ +#define TEST_VCM_CAPTURER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/video_capturer.h" +#include "common_types.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_capture/video_capture.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/video_capturer.h" namespace webrtc { namespace test { @@ -58,4 +58,4 @@ class VcmCapturer } // test } // webrtc -#endif // WEBRTC_TEST_VCM_CAPTURER_H_ +#endif // TEST_VCM_CAPTURER_H_ diff --git a/test/video_capturer.cc b/test/video_capturer.cc index cb75fa28ce..b95936feb9 100644 --- a/test/video_capturer.cc +++ b/test/video_capturer.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/video_capturer.h" +#include "test/video_capturer.h" -#include "webrtc/rtc_base/basictypes.h" -#include "webrtc/rtc_base/constructormagic.h" +#include "rtc_base/basictypes.h" +#include "rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/test/video_capturer.h b/test/video_capturer.h index deeb5c8c2a..eba5d61111 100644 --- a/test/video_capturer.h +++ b/test/video_capturer.h @@ -7,19 +7,19 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_VIDEO_CAPTURER_H_ -#define WEBRTC_TEST_VIDEO_CAPTURER_H_ +#ifndef TEST_VIDEO_CAPTURER_H_ +#define TEST_VIDEO_CAPTURER_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/media/base/videoadapter.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/rtc_base/criticalsection.h" +#include "api/optional.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "media/base/videoadapter.h" +#include "media/base/videosourceinterface.h" +#include "rtc_base/criticalsection.h" namespace cricket { class VideoAdapter; @@ -50,4 +50,4 @@ class VideoCapturer : public rtc::VideoSourceInterface { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_VIDEO_CAPTURER_H_ +#endif // TEST_VIDEO_CAPTURER_H_ diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h index 1487393999..b52fbc7f42 100644 --- a/test/video_codec_settings.h +++ b/test/video_codec_settings.h @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_ -#define WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_ +#ifndef TEST_VIDEO_CODEC_SETTINGS_H_ +#define TEST_VIDEO_CODEC_SETTINGS_H_ -#include "webrtc/api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder.h" namespace webrtc { namespace test { @@ -108,4 +108,4 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_ +#endif // TEST_VIDEO_CODEC_SETTINGS_H_ diff --git a/test/video_renderer.cc b/test/video_renderer.cc index 7f04683e81..ade066bdb2 100644 --- a/test/video_renderer.cc +++ b/test/video_renderer.cc @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/video_renderer.h" +#include "test/video_renderer.h" // TODO(pbos): Android renderer -#include "webrtc/typedefs.h" +#include "typedefs.h" namespace webrtc { namespace test { diff --git a/test/video_renderer.h b/test/video_renderer.h index 49d2fa3dfd..6a00e8803b 100644 --- a/test/video_renderer.h +++ b/test/video_renderer.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_VIDEO_RENDERER_H_ -#define WEBRTC_TEST_VIDEO_RENDERER_H_ +#ifndef TEST_VIDEO_RENDERER_H_ +#define TEST_VIDEO_RENDERER_H_ #include -#include "webrtc/media/base/videosinkinterface.h" +#include "media/base/videosinkinterface.h" namespace webrtc { class VideoFrame; @@ -38,4 +38,4 @@ class VideoRenderer : public rtc::VideoSinkInterface { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_VIDEO_RENDERER_H_ +#endif // TEST_VIDEO_RENDERER_H_ diff --git a/test/win/d3d_renderer.cc b/test/win/d3d_renderer.cc index e73bad6d5f..1f791a91ef 100644 --- a/test/win/d3d_renderer.cc +++ b/test/win/d3d_renderer.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/win/d3d_renderer.h" +#include "test/win/d3d_renderer.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/rtc_base/checks.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/test/win/d3d_renderer.h b/test/win/d3d_renderer.h index c3e9f7d074..e20e7782a0 100644 --- a/test/win/d3d_renderer.h +++ b/test/win/d3d_renderer.h @@ -7,16 +7,16 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_TEST_WIN_D3D_RENDERER_H_ -#define WEBRTC_TEST_WIN_D3D_RENDERER_H_ +#ifndef TEST_WIN_D3D_RENDERER_H_ +#define TEST_WIN_D3D_RENDERER_H_ #include #include #pragma comment(lib, "d3d9.lib") // located in DirectX SDK -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/test/video_renderer.h" -#include "webrtc/typedefs.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/video_renderer.h" +#include "typedefs.h" namespace webrtc { namespace test { @@ -50,4 +50,4 @@ class D3dRenderer : public VideoRenderer { } // namespace test } // namespace webrtc -#endif // WEBRTC_TEST_WIN_D3D_RENDERER_H_ +#endif // TEST_WIN_D3D_RENDERER_H_ diff --git a/test/win/run_loop_win.cc b/test/win/run_loop_win.cc index ec29cc5a67..494adc47d6 100644 --- a/test/win/run_loop_win.cc +++ b/test/win/run_loop_win.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/run_loop.h" +#include "test/run_loop.h" #include diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 16cecaf7b0..296565881d 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -24,7 +24,7 @@ import urllib DONT_AUTOROLL_THESE = [ 'src/third_party/gflags/src', 'src/third_party/winsdk_samples', - 'src/webrtc/examples/androidtests/third_party/gradle', + 'src/examples/androidtests/third_party/gradle', ] # Run these CQ trybots in addition to the default ones in infra/config/cq.cfg. diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py index d78384ae76..d63f5d91d8 100755 --- a/tools_webrtc/ios/build_ios_libs.py +++ b/tools_webrtc/ios/build_ios_libs.py @@ -229,7 +229,7 @@ def main(): # Generate the license file. ninja_dirs = [os.path.join(args.output_dir, arch + '_libs') for arch in architectures] - gn_target_full_name = '//webrtc/sdk:' + gn_target_name + gn_target_full_name = '//sdk:' + gn_target_name builder = LicenseBuilder(ninja_dirs, [gn_target_full_name]) builder.GenerateLicenseText( os.path.join(args.output_dir, SDK_FRAMEWORK_NAME)) diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl index e75e72756e..abe3dbf9f8 100644 --- a/tools_webrtc/mb/gn_isolate_map.pyl +++ b/tools_webrtc/mb/gn_isolate_map.pyl @@ -20,106 +20,106 @@ "type": "additional_compile_target", }, "AppRTCMobileTest": { - "label": "//webrtc/examples:AppRTCMobileTest", + "label": "//examples:AppRTCMobileTest", "type": "additional_compile_target", }, "AppRTCMobileTestStubbedVideoIO": { - "label": "//webrtc/examples:AppRTCMobileTestStubbedVideoIO", + "label": "//examples:AppRTCMobileTestStubbedVideoIO", "type": "additional_compile_target", }, "android_junit_tests": { - "label": "//webrtc:android_junit_tests", + "label": "//:android_junit_tests", "type": "junit_test", }, "audio_decoder_unittests": { - "label": "//webrtc/modules/audio_coding:audio_decoder_unittests", + "label": "//modules/audio_coding:audio_decoder_unittests", "type": "console_test_launcher", }, "common_audio_unittests": { - "label": "//webrtc/common_audio:common_audio_unittests", + "label": "//common_audio:common_audio_unittests", "type": "console_test_launcher", }, "common_video_unittests": { - "label": "//webrtc/common_video:common_video_unittests", + "label": "//common_video:common_video_unittests", "type": "console_test_launcher", }, "isac_fix_test": { - "label": "//webrtc/modules/audio_coding:isac_fix_test", + "label": "//modules/audio_coding:isac_fix_test", "type": "console_test_launcher", "args": [ - "32000", "../../resources/speech_and_misc_wb.pcm", + "32000", "../resources/speech_and_misc_wb.pcm", "isac_speech_and_misc_wb.pcm", ] }, "libjingle_peerconnection_android_unittest": { - "label": "//webrtc/sdk/android:libjingle_peerconnection_android_unittest", + "label": "//sdk/android:libjingle_peerconnection_android_unittest", "type": "additional_compile_target", }, "low_bandwidth_audio_test": { - "label": "//webrtc/audio:low_bandwidth_audio_test", + "label": "//audio:low_bandwidth_audio_test", "type": "console_test_launcher", "args": [ "--quick", ], }, "modules_tests": { - "label": "//webrtc/modules:modules_tests", + "label": "//modules:modules_tests", "type": "console_test_launcher", }, "modules_unittests": { - "label": "//webrtc/modules:modules_unittests", + "label": "//modules:modules_unittests", "type": "windowed_test_launcher", }, "ortc_unittests": { - "label": "//webrtc/ortc:ortc_unittests", + "label": "//ortc:ortc_unittests", "type": "console_test_launcher", }, "peerconnection_unittests": { - "label": "//webrtc/pc:peerconnection_unittests", + "label": "//pc:peerconnection_unittests", "type": "console_test_launcher", }, "rtc_media_unittests": { - "label": "//webrtc/media:rtc_media_unittests", + "label": "//media:rtc_media_unittests", "type": "console_test_launcher", }, "rtc_pc_unittests": { - "label": "//webrtc/pc:rtc_pc_unittests", + "label": "//pc:rtc_pc_unittests", "type": "console_test_launcher", }, "rtc_stats_unittests": { - "label": "//webrtc/stats:rtc_stats_unittests", + "label": "//stats:rtc_stats_unittests", "type": "console_test_launcher", }, "rtc_unittests": { - "label": "//webrtc:rtc_unittests", + "label": "//:rtc_unittests", "type": "console_test_launcher", }, "system_wrappers_unittests": { - "label": "//webrtc/system_wrappers:system_wrappers_unittests", + "label": "//system_wrappers:system_wrappers_unittests", "type": "console_test_launcher", }, "test_support_unittests": { - "label": "//webrtc/test:test_support_unittests", + "label": "//test:test_support_unittests", "type": "console_test_launcher", }, "tools_unittests": { - "label": "//webrtc/rtc_tools:tools_unittests", + "label": "//rtc_tools:tools_unittests", "type": "console_test_launcher", }, "video_engine_tests": { - "label": "//webrtc:video_engine_tests", + "label": "//:video_engine_tests", "type": "console_test_launcher", }, "voice_engine_unittests": { - "label": "//webrtc/voice_engine:voice_engine_unittests", + "label": "//voice_engine:voice_engine_unittests", "type": "console_test_launcher", }, "webrtc_nonparallel_tests": { - "label": "//webrtc:webrtc_nonparallel_tests", + "label": "//:webrtc_nonparallel_tests", "type": "non_parallel_console_test_launcher", }, "webrtc_perf_tests": { - "label": "//webrtc:webrtc_perf_tests", + "label": "//:webrtc_perf_tests", "type": "non_parallel_console_test_launcher", }, } diff --git a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc index 595e986738..4e176d1f90 100644 --- a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc +++ b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc @@ -44,17 +44,17 @@ char kTSanDefaultSuppressions[] = "race:rtc::MessageQueueManager::Clear\n" "race:rtc::Thread::Clear\n" // https://code.google.com/p/webrtc/issues/detail?id=2080 -"race:webrtc/rtc_base/logging.cc\n" -"race:webrtc/rtc_base/sharedexclusivelock_unittest.cc\n" -"race:webrtc/rtc_base/signalthread_unittest.cc\n" +"race:rtc_base/logging.cc\n" +"race:rtc_base/sharedexclusivelock_unittest.cc\n" +"race:rtc_base/signalthread_unittest.cc\n" // https://code.google.com/p/webrtc/issues/detail?id=4456 "deadlock:rtc::MessageQueueManager::Clear\n" "deadlock:rtc::MessageQueueManager::ClearInternal\n" // rtc_pc_unittests // https://code.google.com/p/webrtc/issues/detail?id=2079 -"race:webrtc/rtc_base/testclient.cc\n" -"race:webrtc/rtc_base/virtualsocketserver.cc\n" +"race:rtc_base/testclient.cc\n" +"race:rtc_base/virtualsocketserver.cc\n" "race:talk/p2p/base/stunserver_unittest.cc\n" // third_party/usrsctp diff --git a/tools_webrtc/valgrind/python-google.gni b/tools_webrtc/valgrind/python-google.gni index adc6a0fafb..654029bf25 100644 --- a/tools_webrtc/valgrind/python-google.gni +++ b/tools_webrtc/valgrind/python-google.gni @@ -7,21 +7,21 @@ # be found in the AUTHORS file in the root of the source tree. python_google = [ - "../../tools/python/google/__init__.py", - "../../tools/python/google/gethash_timer.py", - "../../tools/python/google/httpd_config/httpd.conf", - "../../tools/python/google/httpd_config/httpd2.conf", - "../../tools/python/google/httpd_config/httpd2.pem", - "../../tools/python/google/httpd_config/httpd2_linux.conf", - "../../tools/python/google/httpd_config/httpd2_mac.conf", - "../../tools/python/google/httpd_config/mime.types", - "../../tools/python/google/httpd_config/root_ca_cert.pem", - "../../tools/python/google/httpd_utils.py", - "../../tools/python/google/logging_utils.py", - "../../tools/python/google/path_utils.py", - "../../tools/python/google/platform_utils.py", - "../../tools/python/google/platform_utils_linux.py", - "../../tools/python/google/platform_utils_mac.py", - "../../tools/python/google/platform_utils_win.py", - "../../tools/python/google/process_utils.py", + "../tools/python/google/__init__.py", + "../tools/python/google/gethash_timer.py", + "../tools/python/google/httpd_config/httpd.conf", + "../tools/python/google/httpd_config/httpd2.conf", + "../tools/python/google/httpd_config/httpd2.pem", + "../tools/python/google/httpd_config/httpd2_linux.conf", + "../tools/python/google/httpd_config/httpd2_mac.conf", + "../tools/python/google/httpd_config/mime.types", + "../tools/python/google/httpd_config/root_ca_cert.pem", + "../tools/python/google/httpd_utils.py", + "../tools/python/google/logging_utils.py", + "../tools/python/google/path_utils.py", + "../tools/python/google/platform_utils.py", + "../tools/python/google/platform_utils_linux.py", + "../tools/python/google/platform_utils_mac.py", + "../tools/python/google/platform_utils_win.py", + "../tools/python/google/process_utils.py", ] diff --git a/tools_webrtc/valgrind/valgrind-binaries.gni b/tools_webrtc/valgrind/valgrind-binaries.gni index 26ca7e2d9c..df11b32635 100644 --- a/tools_webrtc/valgrind/valgrind-binaries.gni +++ b/tools_webrtc/valgrind/valgrind-binaries.gni @@ -10,416 +10,416 @@ valgrind_binaries = [] if (is_mac) { valgrind_binaries += [ - "../../third_party/valgrind/mac_10.6/bin/ms_print", - "../../third_party/valgrind/mac_10.6/bin/no_op_client_for_valgrind", - "../../third_party/valgrind/mac_10.6/bin/valgrind", - "../../third_party/valgrind/mac_10.6/bin/valgrind-listener", - "../../third_party/valgrind/mac_10.6/bin/vgdb", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/default.supp", - "../../third_party/valgrind/mac_10.6/lib/valgrind/i386-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/i386-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic-valgrind.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64.xml", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so", - "../../third_party/valgrind/mac_10.7/bin/valgrind", - "../../third_party/valgrind/mac_10.7/bin/valgrind-listener", - "../../third_party/valgrind/mac_10.7/bin/vgdb", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/default.supp", - "../../third_party/valgrind/mac_10.7/lib/valgrind/i386-coresse-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/i386-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic-valgrind.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s1.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s2.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64.xml", - "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist", - "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/bin/ms_print", + "../third_party/valgrind/mac_10.6/bin/no_op_client_for_valgrind", + "../third_party/valgrind/mac_10.6/bin/valgrind", + "../third_party/valgrind/mac_10.6/bin/valgrind-listener", + "../third_party/valgrind/mac_10.6/bin/vgdb", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/amd64-linux-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-core.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/default.supp", + "../third_party/valgrind/mac_10.6/lib/valgrind/i386-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/i386-linux-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-core.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-core.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic-valgrind.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s1.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s2.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64.xml", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so", + "../third_party/valgrind/mac_10.7/bin/valgrind", + "../third_party/valgrind/mac_10.7/bin/valgrind-listener", + "../third_party/valgrind/mac_10.7/bin/vgdb", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/amd64-linux-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-core.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/default.supp", + "../third_party/valgrind/mac_10.7/lib/valgrind/i386-coresse-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/i386-linux-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-core.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-core.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic-valgrind.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s1.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s2.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64.xml", + "../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist", + "../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist", ] } else if (is_linux) { if (target_cpu == "x64") { valgrind_binaries += [ - "../../third_party/valgrind/linux_x64/bin/ms_print", - "../../third_party/valgrind/linux_x64/bin/no_op_client_for_valgrind", - "../../third_party/valgrind/linux_x64/bin/valgrind", - "../../third_party/valgrind/linux_x64/bin/valgrind-listener", - "../../third_party/valgrind/linux_x64/bin/valgrind-tsan.sh", - "../../third_party/valgrind/linux_x64/bin/vgdb", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-linux-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/default.supp", - "../../third_party/valgrind/linux_x64/lib/valgrind/i386-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/i386-linux-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/memcheck-amd64-linux", - "../../third_party/valgrind/linux_x64/lib/valgrind/memcheck-x86-linux", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-linux-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/mips-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-core.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic-valgrind.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s1.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s2.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64.xml", - "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-amd64-linux.so", - "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-x86-linux.so", - "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-amd64-linux.so", - "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-x86-linux.so", + "../third_party/valgrind/linux_x64/bin/ms_print", + "../third_party/valgrind/linux_x64/bin/no_op_client_for_valgrind", + "../third_party/valgrind/linux_x64/bin/valgrind", + "../third_party/valgrind/linux_x64/bin/valgrind-listener", + "../third_party/valgrind/linux_x64/bin/valgrind-tsan.sh", + "../third_party/valgrind/linux_x64/bin/vgdb", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-core.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-core.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-coresse-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/amd64-linux-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-core.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/default.supp", + "../third_party/valgrind/linux_x64/lib/valgrind/i386-coresse-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/i386-linux-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/memcheck-amd64-linux", + "../third_party/valgrind/linux_x64/lib/valgrind/memcheck-x86-linux", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-linux-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/mips-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-altivec.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-core.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-fpu.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-core.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/power64-linux.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-acr.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic-valgrind.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s1.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s2.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64.xml", + "../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-amd64-linux.so", + "../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-x86-linux.so", + "../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-amd64-linux.so", + "../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-x86-linux.so", ] } else if (target_cpu == "x86") { valgrind_binaries += [ - "../../third_party/valgrind/linux_x86/bin/ms_print", - "../../third_party/valgrind/linux_x86/bin/no_op_client_for_valgrind", - "../../third_party/valgrind/linux_x86/bin/valgrind", - "../../third_party/valgrind/linux_x86/bin/valgrind-listener", - "../../third_party/valgrind/linux_x86/bin/valgrind-tsan.sh", - "../../third_party/valgrind/linux_x86/bin/vgdb", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-linux-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/default.supp", - "../../third_party/valgrind/linux_x86/lib/valgrind/i386-coresse-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/i386-linux-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/memcheck-x86-linux", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-linux-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/mips-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-core.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic-valgrind.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s1.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s2.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64.xml", - "../../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_core-x86-linux.so", - "../../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_memcheck-x86-linux.so", + "../third_party/valgrind/linux_x86/bin/ms_print", + "../third_party/valgrind/linux_x86/bin/no_op_client_for_valgrind", + "../third_party/valgrind/linux_x86/bin/valgrind", + "../third_party/valgrind/linux_x86/bin/valgrind-listener", + "../third_party/valgrind/linux_x86/bin/valgrind-tsan.sh", + "../third_party/valgrind/linux_x86/bin/vgdb", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-core.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-core.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-coresse-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/amd64-linux-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-core.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/default.supp", + "../third_party/valgrind/linux_x86/lib/valgrind/i386-coresse-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/i386-linux-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/memcheck-x86-linux", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-linux-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/mips-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-altivec.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-core.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-fpu.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-core.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/power64-linux.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-acr.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic-valgrind.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s1.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s2.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64.xml", + "../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_core-x86-linux.so", + "../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_memcheck-x86-linux.so", ] } } diff --git a/tools_webrtc/valgrind/valgrind-webrtc.gni b/tools_webrtc/valgrind/valgrind-webrtc.gni index 217fa18d6a..b0f45d35dd 100644 --- a/tools_webrtc/valgrind/valgrind-webrtc.gni +++ b/tools_webrtc/valgrind/valgrind-webrtc.gni @@ -15,29 +15,29 @@ import("valgrind-binaries.gni") import("valgrind.gni") valgrind_webrtc_dependencies = [ - "../../tools_webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt", - "../../tools_webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt", - "../../tools_webrtc/valgrind/memcheck/suppressions.txt", - "../../tools_webrtc/valgrind/memcheck/suppressions_mac.txt", - "../../tools_webrtc/valgrind/memcheck/suppressions_win32.txt", - "../../tools_webrtc/valgrind/chrome_tests.bat", - "../../tools_webrtc/valgrind/chrome_tests.py", - "../../tools_webrtc/valgrind/chrome_tests.sh", - "../../tools_webrtc/valgrind/common.py", - "../../tools_webrtc/valgrind/gdb_helper.py", - "../../tools_webrtc/valgrind/locate_valgrind.sh", - "../../tools_webrtc/valgrind/memcheck_analyze.py", - "../../tools_webrtc/valgrind/valgrind.sh", - "../../tools_webrtc/valgrind/valgrind_test.py", - "../../tools_webrtc/valgrind/webrtc_tests.py", - "../../tools_webrtc/valgrind/webrtc_tests.sh", + "../tools_webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt", + "../tools_webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt", + "../tools_webrtc/valgrind/memcheck/suppressions.txt", + "../tools_webrtc/valgrind/memcheck/suppressions_mac.txt", + "../tools_webrtc/valgrind/memcheck/suppressions_win32.txt", + "../tools_webrtc/valgrind/chrome_tests.bat", + "../tools_webrtc/valgrind/chrome_tests.py", + "../tools_webrtc/valgrind/chrome_tests.sh", + "../tools_webrtc/valgrind/common.py", + "../tools_webrtc/valgrind/gdb_helper.py", + "../tools_webrtc/valgrind/locate_valgrind.sh", + "../tools_webrtc/valgrind/memcheck_analyze.py", + "../tools_webrtc/valgrind/valgrind.sh", + "../tools_webrtc/valgrind/valgrind_test.py", + "../tools_webrtc/valgrind/webrtc_tests.py", + "../tools_webrtc/valgrind/webrtc_tests.sh", ] + valgrind_dependencies + valgrind_binaries + python_google diff --git a/tools_webrtc/valgrind/valgrind.gni b/tools_webrtc/valgrind/valgrind.gni index 308b934ba6..4cbc372839 100644 --- a/tools_webrtc/valgrind/valgrind.gni +++ b/tools_webrtc/valgrind/valgrind.gni @@ -9,49 +9,49 @@ import("//build_overrides/build.gni") valgrind_dependencies = [ - "../../tools/valgrind/asan/asan_symbolize.py", - "../../tools/valgrind/asan/third_party/__init__.py", - "../../tools/valgrind/asan/third_party/asan_symbolize.py", - "../../tools/valgrind/browser_wrapper_win.py", - "../../tools/valgrind/fixed_suppressions.sh", - "../../tools/valgrind/memcheck/suppressions.txt", - "../../tools/valgrind/memcheck/suppressions_linux.txt", - "../../tools/valgrind/regrind.sh", - "../../tools/valgrind/scan-build.py", - "../../tools/valgrind/suppressions.py", - "../../tools/valgrind/test_suppressions.py", - "../../tools/valgrind/unused_suppressions.py", - "../../tools/valgrind/waterfall.sh", + "../tools/valgrind/asan/asan_symbolize.py", + "../tools/valgrind/asan/third_party/__init__.py", + "../tools/valgrind/asan/third_party/asan_symbolize.py", + "../tools/valgrind/browser_wrapper_win.py", + "../tools/valgrind/fixed_suppressions.sh", + "../tools/valgrind/memcheck/suppressions.txt", + "../tools/valgrind/memcheck/suppressions_linux.txt", + "../tools/valgrind/regrind.sh", + "../tools/valgrind/scan-build.py", + "../tools/valgrind/suppressions.py", + "../tools/valgrind/test_suppressions.py", + "../tools/valgrind/unused_suppressions.py", + "../tools/valgrind/waterfall.sh", ] if (build_with_chromium) { valgrind_dependencies += [ - "../../tools/valgrind/gtest_exclude/ash_unittests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/aura_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/base_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/base_unittests.gtest_win-8.txt", - "../../tools/valgrind/gtest_exclude/base_unittests.gtest_win32.txt", - "../../tools/valgrind/gtest_exclude/blink_platform_unittests.gtest_win32.txt", - "../../tools/valgrind/gtest_exclude/browser_tests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/chromeos_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/components_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/content_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/extensions_unittests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt", - "../../tools/valgrind/gtest_exclude/ipc_tests.gtest.txt", - "../../tools/valgrind/gtest_exclude/media_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/message_center_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/net_unittests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/net_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/net_unittests.gtest_linux.txt", - "../../tools/valgrind/gtest_exclude/remoting_unittests.gtest_win-8.txt", - "../../tools/valgrind/gtest_exclude/sandbox_linux_unittests.gtest.txt", - "../../tools/valgrind/gtest_exclude/suppressions.txt", - "../../tools/valgrind/gtest_exclude/sync_unit_tests.gtest-asan.txt", - "../../tools/valgrind/gtest_exclude/ui_base_unittests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt", - "../../tools/valgrind/gtest_exclude/unit_tests.gtest-memcheck.txt", - "../../tools/valgrind/gtest_exclude/unit_tests.gtest.txt", - "../../tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt", + "../tools/valgrind/gtest_exclude/ash_unittests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/aura_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/base_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/base_unittests.gtest_win-8.txt", + "../tools/valgrind/gtest_exclude/base_unittests.gtest_win32.txt", + "../tools/valgrind/gtest_exclude/blink_platform_unittests.gtest_win32.txt", + "../tools/valgrind/gtest_exclude/browser_tests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/chromeos_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/components_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/content_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/extensions_unittests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt", + "../tools/valgrind/gtest_exclude/ipc_tests.gtest.txt", + "../tools/valgrind/gtest_exclude/media_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/message_center_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/net_unittests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/net_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/net_unittests.gtest_linux.txt", + "../tools/valgrind/gtest_exclude/remoting_unittests.gtest_win-8.txt", + "../tools/valgrind/gtest_exclude/sandbox_linux_unittests.gtest.txt", + "../tools/valgrind/gtest_exclude/suppressions.txt", + "../tools/valgrind/gtest_exclude/sync_unit_tests.gtest-asan.txt", + "../tools/valgrind/gtest_exclude/ui_base_unittests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt", + "../tools/valgrind/gtest_exclude/unit_tests.gtest-memcheck.txt", + "../tools/valgrind/gtest_exclude/unit_tests.gtest.txt", + "../tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt", ] } diff --git a/typedefs.h b/typedefs.h index bd0bee75c2..629cded1af 100644 --- a/typedefs.h +++ b/typedefs.h @@ -11,8 +11,8 @@ // This file contains platform-specific typedefs and defines. // Much of it is derived from Chromium's build/build_config.h. -#ifndef WEBRTC_TYPEDEFS_H_ -#define WEBRTC_TYPEDEFS_H_ +#ifndef TYPEDEFS_H_ +#define TYPEDEFS_H_ // Processor architecture detection. For more info on what's defined, see: // http://msdn.microsoft.com/en-us/library/b0084kay.aspx @@ -122,4 +122,4 @@ #define RTC_UNUSED(x) static_cast(x) #endif // RTC_UNUSED -#endif // WEBRTC_TYPEDEFS_H_ +#endif // TYPEDEFS_H_ diff --git a/video/DEPS b/video/DEPS index b80e1c9a9a..b94455edd0 100644 --- a/video/DEPS +++ b/video/DEPS @@ -1,19 +1,19 @@ include_rules = [ - "+webrtc/call", - "+webrtc/common_video", - "+webrtc/logging/rtc_event_log", - "+webrtc/media/base", - "+webrtc/media/engine", - "+webrtc/modules/audio_mixer", - "+webrtc/modules/bitrate_controller", - "+webrtc/modules/congestion_controller", - "+webrtc/modules/pacing", - "+webrtc/modules/remote_bitrate_estimator", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/utility", - "+webrtc/modules/video_coding", - "+webrtc/modules/video_capture", - "+webrtc/modules/video_processing", - "+webrtc/system_wrappers", - "+webrtc/voice_engine", + "+call", + "+common_video", + "+logging/rtc_event_log", + "+media/base", + "+media/engine", + "+modules/audio_mixer", + "+modules/bitrate_controller", + "+modules/congestion_controller", + "+modules/pacing", + "+modules/remote_bitrate_estimator", + "+modules/rtp_rtcp", + "+modules/utility", + "+modules/video_coding", + "+modules/video_capture", + "+modules/video_processing", + "+system_wrappers", + "+voice_engine", ] diff --git a/video/call_stats.cc b/video/call_stats.cc index 9864d4e51b..c9f019929f 100644 --- a/video/call_stats.cc +++ b/video/call_stats.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/call_stats.h" +#include "video/call_stats.h" #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/video/call_stats.h b/video/call_stats.h index efa98adcd9..af5c45c996 100644 --- a/video/call_stats.h +++ b/video/call_stats.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_CALL_STATS_H_ -#define WEBRTC_VIDEO_CALL_STATS_H_ +#ifndef VIDEO_CALL_STATS_H_ +#define VIDEO_CALL_STATS_H_ #include #include -#include "webrtc/modules/include/module.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "modules/include/module.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "system_wrappers/include/clock.h" namespace webrtc { @@ -85,4 +85,4 @@ class CallStats : public Module { } // namespace webrtc -#endif // WEBRTC_VIDEO_CALL_STATS_H_ +#endif // VIDEO_CALL_STATS_H_ diff --git a/video/call_stats_unittest.cc b/video/call_stats_unittest.cc index 8a2a89a7c6..989722d29f 100644 --- a/video/call_stats_unittest.cc +++ b/video/call_stats_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/call_stats.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "video/call_stats.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/video/encoder_rtcp_feedback.cc b/video/encoder_rtcp_feedback.cc index 1c5a31e376..5a1194f966 100644 --- a/video/encoder_rtcp_feedback.cc +++ b/video/encoder_rtcp_feedback.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/encoder_rtcp_feedback.h" +#include "video/encoder_rtcp_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/video/video_stream_encoder.h" +#include "rtc_base/checks.h" +#include "video/video_stream_encoder.h" static const int kMinKeyFrameRequestIntervalMs = 300; diff --git a/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h index 0e5b13b3e8..ae62e68ee0 100644 --- a/video/encoder_rtcp_feedback.h +++ b/video/encoder_rtcp_feedback.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_ -#define WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_ +#ifndef VIDEO_ENCODER_RTCP_FEEDBACK_H_ +#define VIDEO_ENCODER_RTCP_FEEDBACK_H_ #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/typedefs.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/criticalsection.h" +#include "system_wrappers/include/clock.h" +#include "typedefs.h" namespace webrtc { @@ -42,4 +42,4 @@ class EncoderRtcpFeedback : public RtcpIntraFrameObserver { } // namespace webrtc -#endif // WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_ +#endif // VIDEO_ENCODER_RTCP_FEEDBACK_H_ diff --git a/video/encoder_rtcp_feedback_unittest.cc b/video/encoder_rtcp_feedback_unittest.cc index 718ecac77e..f05556e4e4 100644 --- a/video/encoder_rtcp_feedback_unittest.cc +++ b/video/encoder_rtcp_feedback_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/encoder_rtcp_feedback.h" +#include "video/encoder_rtcp_feedback.h" #include -#include "webrtc/modules/utility/include/mock/mock_process_thread.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/send_statistics_proxy.h" -#include "webrtc/video/video_stream_encoder.h" +#include "modules/utility/include/mock/mock_process_thread.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "video/send_statistics_proxy.h" +#include "video/video_stream_encoder.h" using ::testing::NiceMock; diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc index e92d8fe2d4..06a7118228 100644 --- a/video/end_to_end_tests.cc +++ b/video/end_to_end_tests.cc @@ -15,52 +15,52 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/call/call.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/media/engine/simulcast_encoder_adapter.h" -#include "webrtc/media/engine/webrtcvideoencoderfactory.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/direct_transport.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_decoder.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/frame_generator_capturer.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/null_transport.h" -#include "webrtc/test/rtcp_packet_parser.h" -#include "webrtc/test/rtp_rtcp_observer.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/perf_test.h" -#include "webrtc/video/transport_adapter.h" +#include "api/optional.h" +#include "api/video_codecs/video_encoder.h" +#include "call/call.h" +#include "common_video/include/frame_callback.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/fakevideorenderer.h" +#include "media/base/mediaconstants.h" +#include "media/engine/internalencoderfactory.h" +#include "media/engine/simulcast_encoder_adapter.h" +#include "media/engine/webrtcvideoencoderfactory.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" +#include "rtc_base/file.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/random.h" +#include "rtc_base/rate_limiter.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "system_wrappers/include/sleep.h" +#include "test/call_test.h" +#include "test/direct_transport.h" +#include "test/encoder_settings.h" +#include "test/fake_decoder.h" +#include "test/fake_encoder.h" +#include "test/field_trial.h" +#include "test/frame_generator.h" +#include "test/frame_generator_capturer.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "test/null_transport.h" +#include "test/rtcp_packet_parser.h" +#include "test/rtp_rtcp_observer.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/perf_test.h" +#include "video/transport_adapter.h" // Flaky under MemorySanitizer: bugs.webrtc.org/7419 #if defined(MEMORY_SANITIZER) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 24c362572e..ddbed59b43 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -9,10 +9,10 @@ */ #include -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/video_quality_test.h" +#include "modules/pacing/alr_detector.h" +#include "test/field_trial.h" +#include "test/gtest.h" +#include "video/video_quality_test.h" namespace webrtc { diff --git a/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc index 1d8bc0b450..f110e1c9cb 100644 --- a/video/overuse_frame_detector.cc +++ b/video/overuse_frame_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/overuse_frame_detector.h" +#include "video/overuse_frame_detector.h" #include #include @@ -19,13 +19,13 @@ #include #include -#include "webrtc/api/video/video_frame.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" +#include "api/video/video_frame.h" +#include "common_video/include/frame_callback.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include diff --git a/video/overuse_frame_detector.h b/video/overuse_frame_detector.h index a4f4588b8c..3cc9262a94 100644 --- a/video/overuse_frame_detector.h +++ b/video/overuse_frame_detector.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ -#define WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ +#ifndef VIDEO_OVERUSE_FRAME_DETECTOR_H_ +#define VIDEO_OVERUSE_FRAME_DETECTOR_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "api/optional.h" +#include "modules/video_coding/utility/quality_scaler.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -161,4 +161,4 @@ class OveruseFrameDetector { } // namespace webrtc -#endif // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_ +#endif // VIDEO_OVERUSE_FRAME_DETECTOR_H_ diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc index 80faf657ee..0f3dd8643e 100644 --- a/video/overuse_frame_detector_unittest.cc +++ b/video/overuse_frame_detector_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/overuse_frame_detector.h" +#include "api/video/i420_buffer.h" +#include "common_video/include/video_frame.h" +#include "modules/video_coding/utility/quality_scaler.h" +#include "rtc_base/event.h" +#include "rtc_base/fakeclock.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "video/overuse_frame_detector.h" namespace webrtc { diff --git a/video/payload_router.cc b/video/payload_router.cc index eabde400aa..a7a20deadc 100644 --- a/video/payload_router.cc +++ b/video/payload_router.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/payload_router.h" +#include "video/payload_router.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/video/payload_router.h b/video/payload_router.h index 082ba369ff..9ddbce1988 100644 --- a/video/payload_router.h +++ b/video/payload_router.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_PAYLOAD_ROUTER_H_ -#define WEBRTC_VIDEO_PAYLOAD_ROUTER_H_ +#ifndef VIDEO_PAYLOAD_ROUTER_H_ +#define VIDEO_PAYLOAD_ROUTER_H_ #include -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -63,4 +63,4 @@ class PayloadRouter : public EncodedImageCallback { } // namespace webrtc -#endif // WEBRTC_VIDEO_PAYLOAD_ROUTER_H_ +#endif // VIDEO_PAYLOAD_ROUTER_H_ diff --git a/video/payload_router_unittest.cc b/video/payload_router_unittest.cc index 2293a24a69..5f56a20700 100644 --- a/video/payload_router_unittest.cc +++ b/video/payload_router_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/call/video_config.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/payload_router.h" +#include "call/video_config.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "video/payload_router.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc index 0c83796c7b..ba99bd3ecf 100644 --- a/video/picture_id_tests.cc +++ b/video/picture_id_tests.cc @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/engine/internalencoderfactory.h" -#include "webrtc/media/engine/simulcast_encoder_adapter.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/test/call_test.h" +#include "media/engine/internalencoderfactory.h" +#include "media/engine/simulcast_encoder_adapter.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/video_coding/sequence_number_util.h" +#include "test/call_test.h" namespace webrtc { diff --git a/video/quality_threshold.cc b/video/quality_threshold.cc index 370fe6b133..8ee9fbb1ff 100644 --- a/video/quality_threshold.cc +++ b/video/quality_threshold.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/quality_threshold.h" +#include "video/quality_threshold.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/video/quality_threshold.h b/video/quality_threshold.h index a142d4e716..519e2c33de 100644 --- a/video/quality_threshold.h +++ b/video/quality_threshold.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_QUALITY_THRESHOLD_H_ -#define WEBRTC_VIDEO_QUALITY_THRESHOLD_H_ +#ifndef VIDEO_QUALITY_THRESHOLD_H_ +#define VIDEO_QUALITY_THRESHOLD_H_ #include -#include "webrtc/api/optional.h" +#include "api/optional.h" namespace webrtc { @@ -49,4 +49,4 @@ class QualityThreshold { } // namespace webrtc -#endif // WEBRTC_VIDEO_QUALITY_THRESHOLD_H_ +#endif // VIDEO_QUALITY_THRESHOLD_H_ diff --git a/video/quality_threshold_unittest.cc b/video/quality_threshold_unittest.cc index 6aa70c57ba..c9396d7188 100644 --- a/video/quality_threshold_unittest.cc +++ b/video/quality_threshold_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/quality_threshold.h" +#include "video/quality_threshold.h" -#include "webrtc/test/gtest.h" +#include "test/gtest.h" namespace webrtc { diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc index ff4c6fef70..b19ec2075d 100644 --- a/video/receive_statistics_proxy.cc +++ b/video/receive_statistics_proxy.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/receive_statistics_proxy.h" +#include "video/receive_statistics_proxy.h" #include #include #include #include -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "modules/pacing/alr_detector.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h index 262be64d53..06bd269120 100644 --- a/video/receive_statistics_proxy.h +++ b/video/receive_statistics_proxy.h @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ -#define WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ +#ifndef VIDEO_RECEIVE_STATISTICS_PROXY_H_ +#define VIDEO_RECEIVE_STATISTICS_PROXY_H_ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/moving_max_counter.h" -#include "webrtc/rtc_base/rate_statistics.h" -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/video/quality_threshold.h" -#include "webrtc/video/report_block_stats.h" -#include "webrtc/video/stats_counter.h" -#include "webrtc/video/video_stream_decoder.h" +#include "api/optional.h" +#include "call/video_receive_stream.h" +#include "common_types.h" +#include "common_video/include/frame_callback.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/moving_max_counter.h" +#include "rtc_base/rate_statistics.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/thread_annotations.h" +#include "video/quality_threshold.h" +#include "video/report_block_stats.h" +#include "video/stats_counter.h" +#include "video/video_stream_decoder.h" namespace webrtc { @@ -185,4 +185,4 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback, }; } // namespace webrtc -#endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ +#endif // VIDEO_RECEIVE_STATISTICS_PROXY_H_ diff --git a/video/receive_statistics_proxy_unittest.cc b/video/receive_statistics_proxy_unittest.cc index 068b221f94..3903d7f6fe 100644 --- a/video/receive_statistics_proxy_unittest.cc +++ b/video/receive_statistics_proxy_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/receive_statistics_proxy.h" +#include "video/receive_statistics_proxy.h" #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/api/video/video_frame.h" -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "api/video/video_rotation.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/video/replay.cc b/video/replay.cc index c93017acd0..dab5b2ea17 100644 --- a/video/replay.cc +++ b/video/replay.cc @@ -14,28 +14,28 @@ #include #include -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/call/call.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/string_to_number.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_decoder.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/null_transport.h" -#include "webrtc/test/rtp_file_reader.h" -#include "webrtc/test/run_loop.h" -#include "webrtc/test/run_test.h" -#include "webrtc/test/testsupport/frame_writer.h" -#include "webrtc/test/video_capturer.h" -#include "webrtc/test/video_renderer.h" -#include "webrtc/typedefs.h" +#include "api/video_codecs/video_decoder.h" +#include "call/call.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "rtc_base/checks.h" +#include "rtc_base/flags.h" +#include "rtc_base/string_to_number.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/sleep.h" +#include "test/call_test.h" +#include "test/encoder_settings.h" +#include "test/fake_decoder.h" +#include "test/gtest.h" +#include "test/null_transport.h" +#include "test/rtp_file_reader.h" +#include "test/run_loop.h" +#include "test/run_test.h" +#include "test/testsupport/frame_writer.h" +#include "test/video_capturer.h" +#include "test/video_renderer.h" +#include "typedefs.h" namespace { diff --git a/video/report_block_stats.cc b/video/report_block_stats.cc index ac5041d7fb..4726a46745 100644 --- a/video/report_block_stats.cc +++ b/video/report_block_stats.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/report_block_stats.h" +#include "video/report_block_stats.h" namespace webrtc { diff --git a/video/report_block_stats.h b/video/report_block_stats.h index c54e4677f4..deb2afe526 100644 --- a/video/report_block_stats.h +++ b/video/report_block_stats.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_ -#define WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_ +#ifndef VIDEO_REPORT_BLOCK_STATS_H_ +#define VIDEO_REPORT_BLOCK_STATS_H_ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { @@ -58,5 +58,5 @@ class ReportBlockStats { } // namespace webrtc -#endif // WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_ +#endif // VIDEO_REPORT_BLOCK_STATS_H_ diff --git a/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc index 3ce49ee6db..983dcfcf34 100644 --- a/video/report_block_stats_unittest.cc +++ b/video/report_block_stats_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/video/report_block_stats.h" +#include "test/gtest.h" +#include "video/report_block_stats.h" namespace webrtc { diff --git a/video/rtp_streams_synchronizer.cc b/video/rtp_streams_synchronizer.cc index ad7cf42b68..0274849aeb 100644 --- a/video/rtp_streams_synchronizer.cc +++ b/video/rtp_streams_synchronizer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/rtp_streams_synchronizer.h" +#include "video/rtp_streams_synchronizer.h" -#include "webrtc/call/syncable.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" +#include "call/syncable.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" namespace webrtc { namespace { diff --git a/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h index c8f2d2ac1d..0d3b205b41 100644 --- a/video/rtp_streams_synchronizer.h +++ b/video/rtp_streams_synchronizer.h @@ -11,15 +11,15 @@ // RtpStreamsSynchronizer is responsible for synchronization audio and video for // a given voice engine channel and video receive stream. -#ifndef WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ -#define WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ +#ifndef VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ +#define VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ #include -#include "webrtc/modules/include/module.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/video/stream_synchronization.h" +#include "modules/include/module.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_checker.h" +#include "video/stream_synchronization.h" namespace webrtc { @@ -63,4 +63,4 @@ class RtpStreamsSynchronizer : public Module { } // namespace webrtc -#endif // WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ +#endif // VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 5aff22633b..ab33fc1f09 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -8,37 +8,37 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/rtp_video_stream_receiver.h" +#include "video/rtp_video_stream_receiver.h" #include #include #include -#include "webrtc/call/video_config.h" -#include "webrtc/common_types.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" -#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" -#include "webrtc/video/receive_statistics_proxy.h" +#include "call/video_config.h" +#include "common_types.h" +#include "media/base/mediaconstants.h" +#include "modules/pacing/packet_router.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/ulpfec_receiver.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/h264_sprop_parameter_sets.h" +#include "modules/video_coding/h264_sps_pps_tracker.h" +#include "modules/video_coding/packet_buffer.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/timestamp_extrapolator.h" +#include "video/receive_statistics_proxy.h" namespace webrtc { diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index 994ef55e89..facb712927 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ -#define WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ +#ifndef VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ +#define VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ #include #include @@ -17,23 +17,23 @@ #include #include -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/packet_buffer.h" -#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" -#include "webrtc/modules/video_coding/sequence_number_util.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/typedefs.h" +#include "call/rtp_packet_sink_interface.h" +#include "call/video_receive_stream.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/video_coding/h264_sps_pps_tracker.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/packet_buffer.h" +#include "modules/video_coding/rtp_frame_reference_finder.h" +#include "modules/video_coding/sequence_number_util.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/sequenced_task_checker.h" +#include "typedefs.h" namespace webrtc { @@ -215,4 +215,4 @@ class RtpVideoStreamReceiver : public RtpData, } // namespace webrtc -#endif // WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ +#endif // VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_ diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc index 4f2dca7338..a3d9da6c25 100644 --- a/video/rtp_video_stream_receiver_unittest.cc +++ b/video/rtp_video_stream_receiver_unittest.cc @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/test/gmock.h" +#include "test/gtest.h" +#include "test/gmock.h" -#include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/media/base/mediaconstants.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/rtc_base/bytebuffer.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial_default.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/video/rtp_video_stream_receiver.h" +#include "common_video/h264/h264_common.h" +#include "media/base/mediaconstants.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/utility/include/process_thread.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/packet.h" +#include "modules/video_coding/rtp_frame_reference_finder.h" +#include "modules/video_coding/timing.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial_default.h" +#include "test/field_trial.h" +#include "video/rtp_video_stream_receiver.h" using testing::_; diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc index 17fd8deec9..8cb81937e2 100644 --- a/video/screenshare_loopback.cc +++ b/video/screenshare_loopback.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/run_test.h" -#include "webrtc/video/video_quality_test.h" +#include "rtc_base/flags.h" +#include "rtc_base/stringencode.h" +#include "test/field_trial.h" +#include "test/gtest.h" +#include "test/run_test.h" +#include "video/video_quality_test.h" namespace webrtc { namespace flags { diff --git a/video/send_delay_stats.cc b/video/send_delay_stats.cc index b7c6658ad3..09b60cd7f9 100644 --- a/video/send_delay_stats.cc +++ b/video/send_delay_stats.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/send_delay_stats.h" +#include "video/send_delay_stats.h" #include -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h index 230fa9d649..e258dfe723 100644 --- a/video/send_delay_stats.h +++ b/video/send_delay_stats.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_SEND_DELAY_STATS_H_ -#define WEBRTC_VIDEO_SEND_DELAY_STATS_H_ +#ifndef VIDEO_SEND_DELAY_STATS_H_ +#define VIDEO_SEND_DELAY_STATS_H_ #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/video/stats_counter.h" -#include "webrtc/call/video_send_stream.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" +#include "video/stats_counter.h" +#include "call/video_send_stream.h" namespace webrtc { @@ -83,4 +83,4 @@ class SendDelayStats : public SendPacketObserver { }; } // namespace webrtc -#endif // WEBRTC_VIDEO_SEND_DELAY_STATS_H_ +#endif // VIDEO_SEND_DELAY_STATS_H_ diff --git a/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc index 0644ad2e7c..174e70df10 100644 --- a/video/send_delay_stats_unittest.cc +++ b/video/send_delay_stats_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/send_delay_stats.h" +#include "video/send_delay_stats.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc index 00dd7bf7d1..83a25ecd86 100644 --- a/video/send_statistics_proxy.cc +++ b/video/send_statistics_proxy.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/send_statistics_proxy.h" +#include "video/send_statistics_proxy.h" #include #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" +#include "common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h index d6e91d74e0..8a609e0022 100644 --- a/video/send_statistics_proxy.h +++ b/video/send_statistics_proxy.h @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ -#define WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ +#ifndef VIDEO_SEND_STATISTICS_PROXY_H_ +#define VIDEO_SEND_STATISTICS_PROXY_H_ #include #include #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/numerics/exp_filter.h" -#include "webrtc/rtc_base/ratetracker.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/video/overuse_frame_detector.h" -#include "webrtc/video/report_block_stats.h" -#include "webrtc/video/stats_counter.h" -#include "webrtc/video/video_stream_encoder.h" -#include "webrtc/call/video_send_stream.h" +#include "common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" +#include "video/overuse_frame_detector.h" +#include "video/report_block_stats.h" +#include "video/stats_counter.h" +#include "video/video_stream_encoder.h" +#include "call/video_send_stream.h" namespace webrtc { @@ -243,4 +243,4 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver, }; } // namespace webrtc -#endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ +#endif // VIDEO_SEND_STATISTICS_PROXY_H_ diff --git a/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc index de42fe8b2a..912908c524 100644 --- a/video/send_statistics_proxy_unittest.cc +++ b/video/send_statistics_proxy_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/send_statistics_proxy.h" +#include "video/send_statistics_proxy.h" #include #include #include #include -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/metrics.h" +#include "system_wrappers/include/metrics_default.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/video/stats_counter.cc b/video/stats_counter.cc index adc0129c7c..bcbf9124a2 100644 --- a/video/stats_counter.cc +++ b/video/stats_counter.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/stats_counter.h" +#include "video/stats_counter.h" #include #include #include -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/clock.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/video/stats_counter.h b/video/stats_counter.h index 4beb5bf56a..1cf22bc79a 100644 --- a/video/stats_counter.h +++ b/video/stats_counter.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_STATS_COUNTER_H_ -#define WEBRTC_VIDEO_STATS_COUNTER_H_ +#ifndef VIDEO_STATS_COUNTER_H_ +#define VIDEO_STATS_COUNTER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/typedefs.h" +#include "rtc_base/constructormagic.h" +#include "typedefs.h" namespace webrtc { @@ -290,4 +290,4 @@ class RateAccCounter : public StatsCounter { } // namespace webrtc -#endif // WEBRTC_VIDEO_STATS_COUNTER_H_ +#endif // VIDEO_STATS_COUNTER_H_ diff --git a/video/stats_counter_unittest.cc b/video/stats_counter_unittest.cc index 183f2609a8..3f00d24eec 100644 --- a/video/stats_counter_unittest.cc +++ b/video/stats_counter_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/stats_counter.h" +#include "video/stats_counter.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/gtest.h" +#include "system_wrappers/include/clock.h" +#include "test/gtest.h" namespace webrtc { namespace { diff --git a/video/stream_synchronization.cc b/video/stream_synchronization.cc index fc9ab32aa2..f47037d0ed 100644 --- a/video/stream_synchronization.cc +++ b/video/stream_synchronization.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/stream_synchronization.h" +#include "video/stream_synchronization.h" #include #include @@ -16,7 +16,7 @@ #include -#include "webrtc/rtc_base/logging.h" +#include "rtc_base/logging.h" namespace webrtc { diff --git a/video/stream_synchronization.h b/video/stream_synchronization.h index d32966bc53..0b74e0e2ae 100644 --- a/video/stream_synchronization.h +++ b/video/stream_synchronization.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ -#define WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ +#ifndef VIDEO_STREAM_SYNCHRONIZATION_H_ +#define VIDEO_STREAM_SYNCHRONIZATION_H_ #include -#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" -#include "webrtc/typedefs.h" +#include "system_wrappers/include/rtp_to_ntp_estimator.h" +#include "typedefs.h" namespace webrtc { @@ -60,4 +60,4 @@ class StreamSynchronization { }; } // namespace webrtc -#endif // WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ +#endif // VIDEO_STREAM_SYNCHRONIZATION_H_ diff --git a/video/stream_synchronization_unittest.cc b/video/stream_synchronization_unittest.cc index d5607a8c87..f9ae37d0bb 100644 --- a/video/stream_synchronization_unittest.cc +++ b/video/stream_synchronization_unittest.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/test/gtest.h" -#include "webrtc/video/stream_synchronization.h" +#include "test/gtest.h" +#include "video/stream_synchronization.h" namespace webrtc { diff --git a/video/transport_adapter.cc b/video/transport_adapter.cc index 4f4dd98f3d..8012e74457 100644 --- a/video/transport_adapter.cc +++ b/video/transport_adapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/transport_adapter.h" +#include "video/transport_adapter.h" -#include "webrtc/rtc_base/checks.h" +#include "rtc_base/checks.h" namespace webrtc { namespace internal { diff --git a/video/transport_adapter.h b/video/transport_adapter.h index 3312094be0..c992072956 100644 --- a/video/transport_adapter.h +++ b/video/transport_adapter.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ -#define WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ +#ifndef VIDEO_TRANSPORT_ADAPTER_H_ +#define VIDEO_TRANSPORT_ADAPTER_H_ -#include "webrtc/api/call/transport.h" -#include "webrtc/common_types.h" -#include "webrtc/system_wrappers/include/atomic32.h" +#include "api/call/transport.h" +#include "common_types.h" +#include "system_wrappers/include/atomic32.h" namespace webrtc { namespace internal { @@ -36,4 +36,4 @@ class TransportAdapter : public Transport { } // namespace internal } // namespace webrtc -#endif // WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ +#endif // VIDEO_TRANSPORT_ADAPTER_H_ diff --git a/video/video_loopback.cc b/video/video_loopback.cc index bf0060986c..d5d525aa12 100644 --- a/video/video_loopback.cc +++ b/video/video_loopback.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/rtc_base/flags.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/run_test.h" -#include "webrtc/video/video_quality_test.h" +#include "rtc_base/flags.h" +#include "test/field_trial.h" +#include "test/gtest.h" +#include "test/run_test.h" +#include "video/video_quality_test.h" namespace webrtc { namespace flags { diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 6294184f2a..16b3f65cd3 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/video_quality_test.h" +#include "video/video_quality_test.h" #include #include @@ -18,44 +18,44 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/call/call.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/media/engine/webrtcvideoengine.h" -#include "webrtc/modules/audio_mixer/audio_mixer_impl.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/cpu_time.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/memory_usage.h" -#include "webrtc/rtc_base/pathutils.h" -#include "webrtc/rtc_base/platform_file.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/cpu_info.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/layer_filtering_transport.h" -#include "webrtc/test/run_loop.h" -#include "webrtc/test/statistics.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/test/testsupport/frame_writer.h" -#include "webrtc/test/testsupport/test_output.h" -#include "webrtc/test/vcm_capturer.h" -#include "webrtc/test/video_renderer.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "api/optional.h" +#include "call/call.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/engine/webrtcvideoengine.h" +#include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "modules/video_coding/codecs/h264/include/h264.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "rtc_base/checks.h" +#include "rtc_base/cpu_time.h" +#include "rtc_base/event.h" +#include "rtc_base/flags.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "rtc_base/memory_usage.h" +#include "rtc_base/pathutils.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/cpu_info.h" +#include "system_wrappers/include/field_trial.h" +#include "test/gtest.h" +#include "test/layer_filtering_transport.h" +#include "test/run_loop.h" +#include "test/statistics.h" +#include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_writer.h" +#include "test/testsupport/test_output.h" +#include "test/vcm_capturer.h" +#include "test/video_renderer.h" +#include "voice_engine/include/voe_base.h" -#include "webrtc/test/rtp_file_writer.h" +#include "test/rtp_file_writer.h" DEFINE_bool(save_worst_frame, false, diff --git a/video/video_quality_test.h b/video/video_quality_test.h index 4238447b80..c16105c3cb 100644 --- a/video/video_quality_test.h +++ b/video/video_quality_test.h @@ -7,18 +7,18 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ -#define WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ +#ifndef VIDEO_VIDEO_QUALITY_TEST_H_ +#define VIDEO_VIDEO_QUALITY_TEST_H_ #include #include #include #include -#include "webrtc/media/engine/simulcast_encoder_adapter.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/testsupport/trace_to_stderr.h" +#include "media/engine/simulcast_encoder_adapter.h" +#include "test/call_test.h" +#include "test/frame_generator.h" +#include "test/testsupport/trace_to_stderr.h" namespace webrtc { @@ -164,4 +164,4 @@ class VideoQualityTest : public test::CallTest { } // namespace webrtc -#endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ +#endif // VIDEO_VIDEO_QUALITY_TEST_H_ diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index a89e3ce366..7de42f8a1d 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/video_receive_stream.h" +#include "video/video_receive_stream.h" #include @@ -16,29 +16,29 @@ #include #include -#include "webrtc/api/optional.h" -#include "webrtc/call/rtp_stream_receiver_controller_interface.h" -#include "webrtc/call/rtx_receive_stream.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/h264/profile_level_id.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/frame_object.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/jitter_estimator.h" -#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/ptr_util.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/receive_statistics_proxy.h" +#include "api/optional.h" +#include "call/rtp_stream_receiver_controller_interface.h" +#include "call/rtx_receive_stream.h" +#include "common_types.h" +#include "common_video/h264/profile_level_id.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/utility/include/process_thread.h" +#include "modules/video_coding/frame_object.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/jitter_estimator.h" +#include "modules/video_coding/timing.h" +#include "modules/video_coding/utility/ivf_file_writer.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/ptr_util.h" +#include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/field_trial.h" +#include "video/call_stats.h" +#include "video/receive_statistics_proxy.h" namespace webrtc { diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h index 8b680aeb1e..7a4a13e474 100644 --- a/video/video_receive_stream.h +++ b/video/video_receive_stream.h @@ -8,27 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ -#define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ +#ifndef VIDEO_VIDEO_RECEIVE_STREAM_H_ +#define VIDEO_VIDEO_RECEIVE_STREAM_H_ #include #include -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/call/syncable.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/common_video/include/incoming_video_stream.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/modules/video_coding/frame_buffer2.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/video/receive_statistics_proxy.h" -#include "webrtc/video/rtp_streams_synchronizer.h" -#include "webrtc/video/rtp_video_stream_receiver.h" -#include "webrtc/video/transport_adapter.h" -#include "webrtc/video/video_stream_decoder.h" +#include "call/rtp_packet_sink_interface.h" +#include "call/syncable.h" +#include "call/video_receive_stream.h" +#include "common_video/include/incoming_video_stream.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/video_coding/frame_buffer2.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/sequenced_task_checker.h" +#include "system_wrappers/include/clock.h" +#include "video/receive_statistics_proxy.h" +#include "video/rtp_streams_synchronizer.h" +#include "video/rtp_video_stream_receiver.h" +#include "video/transport_adapter.h" +#include "video/video_stream_decoder.h" namespace webrtc { @@ -159,4 +159,4 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream, } // namespace internal } // namespace webrtc -#endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ +#endif // VIDEO_VIDEO_RECEIVE_STREAM_H_ diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc index bce4fd3d7b..97a447ba77 100644 --- a/video/video_receive_stream_unittest.cc +++ b/video/video_receive_stream_unittest.cc @@ -10,21 +10,21 @@ #include -#include "webrtc/test/gtest.h" -#include "webrtc/test/gmock.h" +#include "test/gtest.h" +#include "test/gmock.h" -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/video_receive_stream.h" +#include "api/video_codecs/video_decoder.h" +#include "call/rtp_stream_receiver_controller.h" +#include "media/base/fakevideorenderer.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "system_wrappers/include/clock.h" +#include "test/field_trial.h" +#include "video/call_stats.h" +#include "video/video_receive_stream.h" namespace webrtc { namespace { diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc index 61884ca3e6..a874298404 100644 --- a/video/video_send_stream.cc +++ b/video/video_send_stream.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/video_send_stream.h" +#include "video/video_send_stream.h" #include #include @@ -16,27 +16,27 @@ #include #include -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" -#include "webrtc/modules/pacing/alr_detector.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/file.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/rtc_base/weak_ptr.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/payload_router.h" -#include "webrtc/call/video_send_stream.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include "modules/pacing/alr_detector.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "modules/utility/include/process_thread.h" +#include "modules/video_coding/utility/ivf_file_writer.h" +#include "rtc_base/checks.h" +#include "rtc_base/file.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/trace_event.h" +#include "rtc_base/weak_ptr.h" +#include "system_wrappers/include/field_trial.h" +#include "video/call_stats.h" +#include "video/payload_router.h" +#include "call/video_send_stream.h" namespace webrtc { diff --git a/video/video_send_stream.h b/video/video_send_stream.h index 06fbb36769..e6c0fe3bcf 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -8,25 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ -#define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ +#ifndef VIDEO_VIDEO_SEND_STREAM_H_ +#define VIDEO_VIDEO_SEND_STREAM_H_ #include #include #include -#include "webrtc/call/bitrate_allocator.h" -#include "webrtc/call/video_receive_stream.h" -#include "webrtc/call/video_send_stream.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/protection_bitrate_calculator.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/video/encoder_rtcp_feedback.h" -#include "webrtc/video/send_delay_stats.h" -#include "webrtc/video/send_statistics_proxy.h" -#include "webrtc/video/video_stream_encoder.h" +#include "call/bitrate_allocator.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/protection_bitrate_calculator.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/task_queue.h" +#include "video/encoder_rtcp_feedback.h" +#include "video/send_delay_stats.h" +#include "video/send_statistics_proxy.h" +#include "video/video_stream_encoder.h" namespace webrtc { @@ -108,4 +108,4 @@ class VideoSendStream : public webrtc::VideoSendStream { } // namespace internal } // namespace webrtc -#endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ +#endif // VIDEO_VIDEO_SEND_STREAM_H_ diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 422b983ef9..0eeae213b3 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -11,40 +11,40 @@ #include #include -#include "webrtc/call/call.h" -#include "webrtc/call/rtp_transport_controller_send.h" -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/rtc_base/bind.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/call_test.h" -#include "webrtc/test/configurable_frame_size_encoder.h" -#include "webrtc/test/fake_texture_frame.h" -#include "webrtc/test/field_trial.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/frame_generator_capturer.h" -#include "webrtc/test/frame_utils.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/null_transport.h" -#include "webrtc/test/rtcp_packet_parser.h" -#include "webrtc/test/testsupport/perf_test.h" +#include "call/call.h" +#include "call/rtp_transport_controller_send.h" +#include "common_video/include/frame_callback.h" +#include "common_video/include/video_frame.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "modules/rtp_rtcp/source/rtcp_sender.h" +#include "modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "rtc_base/bind.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/rate_limiter.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/sleep.h" +#include "test/call_test.h" +#include "test/configurable_frame_size_encoder.h" +#include "test/fake_texture_frame.h" +#include "test/field_trial.h" +#include "test/frame_generator.h" +#include "test/frame_generator_capturer.h" +#include "test/frame_utils.h" +#include "test/gtest.h" +#include "test/null_transport.h" +#include "test/rtcp_packet_parser.h" +#include "test/testsupport/perf_test.h" -#include "webrtc/video/send_statistics_proxy.h" -#include "webrtc/video/transport_adapter.h" -#include "webrtc/call/video_send_stream.h" +#include "video/send_statistics_proxy.h" +#include "video/transport_adapter.h" +#include "call/video_send_stream.h" namespace webrtc { diff --git a/video/video_stream_decoder.cc b/video/video_stream_decoder.cc index 009a18c875..b27a52ea89 100644 --- a/video/video_stream_decoder.cc +++ b/video/video_stream_decoder.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/video_stream_decoder.h" +#include "video/video_stream_decoder.h" #include #include #include -#include "webrtc/common_video/include/frame_callback.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/payload_router.h" -#include "webrtc/video/receive_statistics_proxy.h" +#include "common_video/include/frame_callback.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics.h" +#include "video/call_stats.h" +#include "video/payload_router.h" +#include "video/receive_statistics_proxy.h" namespace webrtc { diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h index 88cff97364..52d0c9a150 100644 --- a/video/video_stream_decoder.h +++ b/video/video_stream_decoder.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ -#define WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ +#ifndef VIDEO_VIDEO_STREAM_DECODER_H_ +#define VIDEO_VIDEO_STREAM_DECODER_H_ #include #include #include #include -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/typedefs.h" +#include "media/base/videosinkinterface.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "typedefs.h" namespace webrtc { @@ -102,4 +102,4 @@ class VideoStreamDecoder : public VCMReceiveCallback, } // namespace webrtc -#endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ +#endif // VIDEO_VIDEO_STREAM_DECODER_H_ diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index ccd28544e8..e37050cb52 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/video/video_stream_encoder.h" +#include "video/video_stream_encoder.h" #include #include #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/common_video/include/video_frame.h" -#include "webrtc/modules/pacing/paced_sender.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/rtc_base/trace_event.h" -#include "webrtc/video/overuse_frame_detector.h" -#include "webrtc/video/send_statistics_proxy.h" +#include "api/video/i420_buffer.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "common_video/include/video_frame.h" +#include "modules/pacing/paced_sender.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "rtc_base/trace_event.h" +#include "video/overuse_frame_detector.h" +#include "video/send_statistics_proxy.h" namespace webrtc { diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h index a0fa2df745..b0169ae4c7 100644 --- a/video/video_stream_encoder.h +++ b/video/video_stream_encoder.h @@ -8,31 +8,31 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_ -#define WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_ +#ifndef VIDEO_VIDEO_STREAM_ENCODER_H_ +#define VIDEO_VIDEO_STREAM_ENCODER_H_ #include #include #include #include -#include "webrtc/api/video/video_rotation.h" -#include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/call/call.h" -#include "webrtc/common_types.h" -#include "webrtc/common_video/include/video_bitrate_allocator.h" -#include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "webrtc/modules/video_coding/video_coding_impl.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/sequenced_task_checker.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/typedefs.h" -#include "webrtc/video/overuse_frame_detector.h" -#include "webrtc/call/video_send_stream.h" +#include "api/video/video_rotation.h" +#include "api/video_codecs/video_encoder.h" +#include "call/call.h" +#include "common_types.h" +#include "common_video/include/video_bitrate_allocator.h" +#include "media/base/videosinkinterface.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/utility/quality_scaler.h" +#include "modules/video_coding/video_coding_impl.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/task_queue.h" +#include "system_wrappers/include/atomic32.h" +#include "typedefs.h" +#include "video/overuse_frame_detector.h" +#include "call/video_send_stream.h" namespace webrtc { @@ -316,4 +316,4 @@ class VideoStreamEncoder : public rtc::VideoSinkInterface, } // namespace webrtc -#endif // WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_ +#endif // VIDEO_VIDEO_STREAM_ENCODER_H_ diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc index 488486c1ec..5afbe27d2b 100644 --- a/video/video_stream_encoder_unittest.cc +++ b/video/video_stream_encoder_unittest.cc @@ -12,21 +12,21 @@ #include #include -#include "webrtc/api/video/i420_buffer.h" -#include "webrtc/media/base/videoadapter.h" -#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/rtc_base/fakeclock.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics_default.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/test/encoder_settings.h" -#include "webrtc/test/fake_encoder.h" -#include "webrtc/test/frame_generator.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/video/send_statistics_proxy.h" -#include "webrtc/video/video_stream_encoder.h" +#include "api/video/i420_buffer.h" +#include "media/base/videoadapter.h" +#include "modules/video_coding/codecs/vp8/temporal_layers.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/metrics_default.h" +#include "system_wrappers/include/sleep.h" +#include "test/encoder_settings.h" +#include "test/fake_encoder.h" +#include "test/frame_generator.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "video/send_statistics_proxy.h" +#include "video/video_stream_encoder.h" namespace { const int kMinPixelsPerFrame = 320 * 180; diff --git a/voice_engine/BUILD.gn b/voice_engine/BUILD.gn index 627f412cf3..482197a9a6 100644 --- a/voice_engine/BUILD.gn +++ b/voice_engine/BUILD.gn @@ -222,8 +222,8 @@ if (rtc_include_tests) { ] data = [ - "../../resources/utility/encapsulated_pcm16b_8khz.wav", - "../../resources/utility/encapsulated_pcmu_8khz.wav", + "../resources/utility/encapsulated_pcm16b_8khz.wav", + "../resources/utility/encapsulated_pcmu_8khz.wav", ] if (is_win) { diff --git a/voice_engine/DEPS b/voice_engine/DEPS index c5a97ccdfc..496bf29300 100644 --- a/voice_engine/DEPS +++ b/voice_engine/DEPS @@ -1,15 +1,15 @@ include_rules = [ - "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/call", - "+webrtc/common_audio", - "+webrtc/logging/rtc_event_log", - "+webrtc/modules/audio_coding", - "+webrtc/modules/audio_conference_mixer", - "+webrtc/modules/audio_device", - "+webrtc/modules/audio_processing", - "+webrtc/modules/media_file", - "+webrtc/modules/pacing", - "+webrtc/modules/rtp_rtcp", - "+webrtc/modules/utility", - "+webrtc/system_wrappers", + "+audio/utility/audio_frame_operations.h", + "+call", + "+common_audio", + "+logging/rtc_event_log", + "+modules/audio_coding", + "+modules/audio_conference_mixer", + "+modules/audio_device", + "+modules/audio_processing", + "+modules/media_file", + "+modules/pacing", + "+modules/rtp_rtcp", + "+modules/utility", + "+system_wrappers", ] diff --git a/voice_engine/audio_level.cc b/voice_engine/audio_level.cc index ab4114987c..57b485546b 100644 --- a/voice_engine/audio_level.cc +++ b/voice_engine/audio_level.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/audio_level.h" +#include "voice_engine/audio_level.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/include/module_common_types.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/include/module_common_types.h" namespace webrtc { namespace voe { diff --git a/voice_engine/audio_level.h b/voice_engine/audio_level.h index 33f8fe2d51..7434e454f0 100644 --- a/voice_engine/audio_level.h +++ b/voice_engine/audio_level.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_ -#define WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_ +#ifndef VOICE_ENGINE_AUDIO_LEVEL_H_ +#define VOICE_ENGINE_AUDIO_LEVEL_H_ -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/typedefs.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "typedefs.h" namespace webrtc { @@ -57,4 +57,4 @@ class AudioLevel { } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_ +#endif // VOICE_ENGINE_AUDIO_LEVEL_H_ diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index d1c3a4bac6..cc668f2894 100644 --- a/voice_engine/channel.cc +++ b/voice_engine/channel.cc @@ -8,41 +8,41 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/channel.h" +#include "voice_engine/channel.h" #include #include -#include "webrtc/api/array_view.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/logging/rtc_event_log/rtc_event_log.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/rate_limiter.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/system_wrappers/include/field_trial.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" -#include "webrtc/voice_engine/output_mixer.h" -#include "webrtc/voice_engine/statistics.h" -#include "webrtc/voice_engine/utility.h" +#include "api/array_view.h" +#include "audio/utility/audio_frame_operations.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/include/module_common_types.h" +#include "modules/pacing/packet_router.h" +#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/rate_limiter.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timeutils.h" +#include "system_wrappers/include/field_trial.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/include/voe_rtp_rtcp.h" +#include "voice_engine/output_mixer.h" +#include "voice_engine/statistics.h" +#include "voice_engine/utility.h" namespace webrtc { namespace voe { diff --git a/voice_engine/channel.h b/voice_engine/channel.h index e5209f503e..649df7f678 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -8,36 +8,36 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_ -#define WEBRTC_VOICE_ENGINE_CHANNEL_H_ +#ifndef VOICE_ENGINE_CHANNEL_H_ +#define VOICE_ENGINE_CHANNEL_H_ #include -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/api/optional.h" -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" -#include "webrtc/modules/audio_processing/rms_level.h" -#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/event.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/voice_engine/audio_level.h" -#include "webrtc/voice_engine/file_player.h" -#include "webrtc/voice_engine/file_recorder.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/include/voe_network.h" -#include "webrtc/voice_engine/shared_data.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/call/audio_sink.h" +#include "api/optional.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "common_types.h" +#include "modules/audio_coding/acm2/codec_manager.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "modules/audio_processing/rms_level.h" +#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "modules/rtp_rtcp/include/rtp_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/thread_checker.h" +#include "voice_engine/audio_level.h" +#include "voice_engine/file_player.h" +#include "voice_engine/file_recorder.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_network.h" +#include "voice_engine/shared_data.h" +#include "voice_engine/voice_engine_defines.h" namespace rtc { class TimestampWrapAroundHandler; @@ -559,4 +559,4 @@ class Channel } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ +#endif // VOICE_ENGINE_CHANNEL_H_ diff --git a/voice_engine/channel_manager.cc b/voice_engine/channel_manager.cc index ff7a802a46..f841a6e200 100644 --- a/voice_engine/channel_manager.cc +++ b/voice_engine/channel_manager.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/channel_manager.h" +#include "voice_engine/channel_manager.h" -#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/voice_engine/channel.h" +#include "rtc_base/timeutils.h" +#include "voice_engine/channel.h" namespace webrtc { namespace voe { diff --git a/voice_engine/channel_manager.h b/voice_engine/channel_manager.h index 11a44cffca..9df0b14889 100644 --- a/voice_engine/channel_manager.h +++ b/voice_engine/channel_manager.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H -#define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H +#ifndef VOICE_ENGINE_CHANNEL_MANAGER_H_ +#define VOICE_ENGINE_CHANNEL_MANAGER_H_ #include #include -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/random.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/random.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "system_wrappers/include/atomic32.h" +#include "typedefs.h" +#include "voice_engine/include/voe_base.h" namespace webrtc { @@ -125,4 +125,4 @@ class ChannelManager { } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H +#endif // VOICE_ENGINE_CHANNEL_MANAGER_H_ diff --git a/voice_engine/channel_proxy.cc b/voice_engine/channel_proxy.cc index 5f4f98a78f..a4d68ace08 100644 --- a/voice_engine/channel_proxy.cc +++ b/voice_engine/channel_proxy.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/channel_proxy.h" +#include "voice_engine/channel_proxy.h" #include -#include "webrtc/api/call/audio_sink.h" -#include "webrtc/call/rtp_transport_controller_send_interface.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/safe_minmax.h" -#include "webrtc/voice_engine/channel.h" +#include "api/call/audio_sink.h" +#include "call/rtp_transport_controller_send_interface.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/safe_minmax.h" +#include "voice_engine/channel.h" namespace webrtc { namespace voe { diff --git a/voice_engine/channel_proxy.h b/voice_engine/channel_proxy.h index 826117b9aa..7094b3e901 100644 --- a/voice_engine/channel_proxy.h +++ b/voice_engine/channel_proxy.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ -#define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ +#ifndef VOICE_ENGINE_CHANNEL_PROXY_H_ +#define VOICE_ENGINE_CHANNEL_PROXY_H_ -#include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/call/rtp_packet_sink_interface.h" -#include "webrtc/rtc_base/constructormagic.h" -#include "webrtc/rtc_base/race_checker.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/voice_engine/channel_manager.h" -#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/rtpreceiverinterface.h" +#include "call/rtp_packet_sink_interface.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/race_checker.h" +#include "rtc_base/thread_checker.h" +#include "voice_engine/channel_manager.h" +#include "voice_engine/include/voe_rtp_rtcp.h" #include #include @@ -149,4 +149,4 @@ class ChannelProxy : public RtpPacketSinkInterface { } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ +#endif // VOICE_ENGINE_CHANNEL_PROXY_H_ diff --git a/voice_engine/channel_unittest.cc b/voice_engine/channel_unittest.cc index e040b77bac..37dd9b54dd 100644 --- a/voice_engine/channel_unittest.cc +++ b/voice_engine/channel_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/channel.h" +#include "test/gtest.h" +#include "voice_engine/channel.h" // Empty test just to get coverage metrics. TEST(ChannelTest, EmptyTestToGetCodeCoverage) {} diff --git a/voice_engine/coder.cc b/voice_engine/coder.cc index 6337e103a1..26776b8250 100644 --- a/voice_engine/coder.cc +++ b/voice_engine/coder.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/coder.h" +#include "voice_engine/coder.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" -#include "webrtc/modules/include/module_common_types.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/codecs/audio_format_conversion.h" +#include "modules/include/module_common_types.h" namespace webrtc { namespace { diff --git a/voice_engine/coder.h b/voice_engine/coder.h index 5e16b0af66..f903ffde09 100644 --- a/voice_engine/coder.h +++ b/voice_engine/coder.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_CODER_H_ -#define WEBRTC_VOICE_ENGINE_CODER_H_ +#ifndef VOICE_ENGINE_CODER_H_ +#define VOICE_ENGINE_CODER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_coding/acm2/codec_manager.h" +#include "modules/audio_coding/acm2/rent_a_codec.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "typedefs.h" namespace webrtc { class AudioFrame; @@ -65,4 +65,4 @@ class AudioCoder : public AudioPacketizationCallback { }; } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_CODER_H_ +#endif // VOICE_ENGINE_CODER_H_ diff --git a/voice_engine/file_player.cc b/voice_engine/file_player.cc index 8c5824d1bb..1e98c96092 100644 --- a/voice_engine/file_player.cc +++ b/voice_engine/file_player.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/file_player.h" +#include "voice_engine/file_player.h" -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/media_file/media_file.h" -#include "webrtc/modules/media_file/media_file_defines.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/coder.h" +#include "common_audio/resampler/include/resampler.h" +#include "common_types.h" +#include "modules/media_file/media_file.h" +#include "modules/media_file/media_file_defines.h" +#include "rtc_base/logging.h" +#include "typedefs.h" +#include "voice_engine/coder.h" namespace webrtc { diff --git a/voice_engine/file_player.h b/voice_engine/file_player.h index cb14c8f752..f5c3c856ab 100644 --- a/voice_engine/file_player.h +++ b/voice_engine/file_player.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_FILE_PLAYER_H_ -#define WEBRTC_VOICE_ENGINE_FILE_PLAYER_H_ +#ifndef VOICE_ENGINE_FILE_PLAYER_H_ +#define VOICE_ENGINE_FILE_PLAYER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "typedefs.h" namespace webrtc { @@ -77,4 +77,4 @@ class FilePlayer { virtual int32_t SetAudioScaling(float scaleFactor) = 0; }; } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_FILE_PLAYER_H_ +#endif // VOICE_ENGINE_FILE_PLAYER_H_ diff --git a/voice_engine/file_player_unittests.cc b/voice_engine/file_player_unittests.cc index 8762957a4c..27a3eae2ea 100644 --- a/voice_engine/file_player_unittests.cc +++ b/voice_engine/file_player_unittests.cc @@ -10,18 +10,18 @@ // Unit tests for FilePlayer. -#include "webrtc/voice_engine/file_player.h" +#include "voice_engine/file_player.h" #include #include #include -#include "webrtc/rtc_base/flags.h" -#include "webrtc/rtc_base/md5digest.h" -#include "webrtc/rtc_base/stringencode.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "rtc_base/flags.h" +#include "rtc_base/md5digest.h" +#include "rtc_base/stringencode.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" DEFINE_bool(file_player_output, false, "Generate reference files."); diff --git a/voice_engine/file_recorder.cc b/voice_engine/file_recorder.cc index 1d35be9be4..8ce685be75 100644 --- a/voice_engine/file_recorder.cc +++ b/voice_engine/file_recorder.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/file_recorder.h" +#include "voice_engine/file_recorder.h" #include -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/media_file.h" -#include "webrtc/modules/media_file/media_file_defines.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/coder.h" +#include "audio/utility/audio_frame_operations.h" +#include "common_audio/resampler/include/resampler.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "modules/media_file/media_file.h" +#include "modules/media_file/media_file_defines.h" +#include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/event_wrapper.h" +#include "typedefs.h" +#include "voice_engine/coder.h" namespace webrtc { diff --git a/voice_engine/file_recorder.h b/voice_engine/file_recorder.h index c4195d0eba..43159d9190 100644 --- a/voice_engine/file_recorder.h +++ b/voice_engine/file_recorder.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_FILE_RECORDER_H_ -#define WEBRTC_VOICE_ENGINE_FILE_RECORDER_H_ +#ifndef VOICE_ENGINE_FILE_RECORDER_H_ +#define VOICE_ENGINE_FILE_RECORDER_H_ #include -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/media_file_defines.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "modules/media_file/media_file_defines.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ class FileRecorder { }; } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_FILE_RECORDER_H_ +#endif // VOICE_ENGINE_FILE_RECORDER_H_ diff --git a/voice_engine/include/voe_base.h b/voice_engine/include/voe_base.h index 6e93da574c..443b271a3d 100644 --- a/voice_engine/include/voe_base.h +++ b/voice_engine/include/voe_base.h @@ -31,13 +31,13 @@ // base->Release(); // VoiceEngine::Delete(voe); // -#ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H -#define WEBRTC_VOICE_ENGINE_VOE_BASE_H +#ifndef VOICE_ENGINE_VOE_BASE_H_ +#define VOICE_ENGINE_VOE_BASE_H_ -#include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "common_types.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -203,4 +203,4 @@ class WEBRTC_DLLEXPORT VoEBase { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H +#endif // VOICE_ENGINE_VOE_BASE_H_ diff --git a/voice_engine/include/voe_codec.h b/voice_engine/include/voe_codec.h index cedf47d6b9..2a941ad80f 100644 --- a/voice_engine/include/voe_codec.h +++ b/voice_engine/include/voe_codec.h @@ -28,10 +28,10 @@ // codec->Release(); // VoiceEngine::Delete(voe); // -#ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_H -#define WEBRTC_VOICE_ENGINE_VOE_CODEC_H +#ifndef VOICE_ENGINE_VOE_CODEC_H_ +#define VOICE_ENGINE_VOE_CODEC_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -144,4 +144,4 @@ class WEBRTC_DLLEXPORT VoECodec { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_CODEC_H +#endif // VOICE_ENGINE_VOE_CODEC_H_ diff --git a/voice_engine/include/voe_errors.h b/voice_engine/include/voe_errors.h index f48319e225..911d7c281f 100644 --- a/voice_engine/include/voe_errors.h +++ b/voice_engine/include/voe_errors.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_ERRORS_H -#define WEBRTC_VOICE_ENGINE_VOE_ERRORS_H +#ifndef VOICE_ENGINE_VOE_ERRORS_H_ +#define VOICE_ENGINE_VOE_ERRORS_H_ // Warnings #define VE_PORT_NOT_DEFINED 8001 @@ -162,4 +162,4 @@ // Warnings for other platforms (reserved range 8061-8080) #define VE_IGNORED_FUNCTION 8061 -#endif // WEBRTC_VOICE_ENGINE_VOE_ERRORS_H +#endif // VOICE_ENGINE_VOE_ERRORS_H_ diff --git a/voice_engine/include/voe_file.h b/voice_engine/include/voe_file.h index f3a3a1f510..7ecdf700f4 100644 --- a/voice_engine/include/voe_file.h +++ b/voice_engine/include/voe_file.h @@ -35,10 +35,10 @@ // file->Release(); // VoiceEngine::Delete(voe); // -#ifndef WEBRTC_VOICE_ENGINE_VOE_FILE_H -#define WEBRTC_VOICE_ENGINE_VOE_FILE_H +#ifndef VOICE_ENGINE_VOE_FILE_H_ +#define VOICE_ENGINE_VOE_FILE_H_ -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -141,4 +141,4 @@ class WEBRTC_DLLEXPORT VoEFile { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_FILE_H +#endif // VOICE_ENGINE_VOE_FILE_H_ diff --git a/voice_engine/include/voe_network.h b/voice_engine/include/voe_network.h index e659394f81..b0b0428ef5 100644 --- a/voice_engine/include/voe_network.h +++ b/voice_engine/include/voe_network.h @@ -31,11 +31,11 @@ // netw->Release(); // VoiceEngine::Delete(voe); // -#ifndef WEBRTC_VOICE_ENGINE_VOE_NETWORK_H -#define WEBRTC_VOICE_ENGINE_VOE_NETWORK_H +#ifndef VOICE_ENGINE_VOE_NETWORK_H_ +#define VOICE_ENGINE_VOE_NETWORK_H_ -#include "webrtc/api/call/transport.h" -#include "webrtc/common_types.h" +#include "api/call/transport.h" +#include "common_types.h" namespace webrtc { @@ -92,4 +92,4 @@ class WEBRTC_DLLEXPORT VoENetwork { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_NETWORK_H +#endif // VOICE_ENGINE_VOE_NETWORK_H_ diff --git a/voice_engine/include/voe_rtp_rtcp.h b/voice_engine/include/voe_rtp_rtcp.h index b53deaec89..0c0ba7e8ed 100644 --- a/voice_engine/include/voe_rtp_rtcp.h +++ b/voice_engine/include/voe_rtp_rtcp.h @@ -36,11 +36,11 @@ // rtp_rtcp->Release(); // VoiceEngine::Delete(voe); // -#ifndef WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_H -#define WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_H +#ifndef VOICE_ENGINE_VOE_RTP_RTCP_H_ +#define VOICE_ENGINE_VOE_RTP_RTCP_H_ #include -#include "webrtc/common_types.h" +#include "common_types.h" namespace webrtc { @@ -148,4 +148,4 @@ class WEBRTC_DLLEXPORT VoERTP_RTCP { } // namespace webrtc -#endif // #ifndef WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_H +#endif // #ifndef VOICE_ENGINE_VOE_RTP_RTCP_H_ diff --git a/voice_engine/mock/mock_voe_observer.h b/voice_engine/mock/mock_voe_observer.h index 9abc2eb1dc..99c8c55fe1 100644 --- a/voice_engine/mock/mock_voe_observer.h +++ b/voice_engine/mock/mock_voe_observer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ -#define WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ +#ifndef VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ +#define VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ -#include "webrtc/test/gmock.h" -#include "webrtc/voice_engine/include/voe_base.h" +#include "test/gmock.h" +#include "voice_engine/include/voe_base.h" namespace webrtc { @@ -26,4 +26,4 @@ class MockVoEObserver: public VoiceEngineObserver { } -#endif // WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ +#endif // VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ diff --git a/voice_engine/monitor_module.h b/voice_engine/monitor_module.h index ea29d93d80..7ebdaddea4 100644 --- a/voice_engine/monitor_module.h +++ b/voice_engine/monitor_module.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H -#define WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H +#ifndef VOICE_ENGINE_MONITOR_MODULE_H_ +#define VOICE_ENGINE_MONITOR_MODULE_H_ -#include "webrtc/modules/include/module.h" +#include "modules/include/module.h" namespace webrtc { namespace voe { diff --git a/voice_engine/output_mixer.cc b/voice_engine/output_mixer.cc index c497cc1e16..b90dc3e8dc 100644 --- a/voice_engine/output_mixer.cc +++ b/voice_engine/output_mixer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/output_mixer.h" +#include "voice_engine/output_mixer.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/statistics.h" -#include "webrtc/voice_engine/utility.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/format_macros.h" +#include "system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/statistics.h" +#include "voice_engine/utility.h" namespace webrtc { namespace voe { diff --git a/voice_engine/output_mixer.h b/voice_engine/output_mixer.h index fe0cb308f1..542ca4bd09 100644 --- a/voice_engine/output_mixer.h +++ b/voice_engine/output_mixer.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ -#define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ +#ifndef VOICE_ENGINE_OUTPUT_MIXER_H_ +#define VOICE_ENGINE_OUTPUT_MIXER_H_ #include -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/voice_engine/file_recorder.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "common_types.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer.h" +#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "rtc_base/criticalsection.h" +#include "voice_engine/file_recorder.h" namespace webrtc { diff --git a/voice_engine/shared_data.cc b/voice_engine/shared_data.cc index 464374ef31..dc3d8c0472 100644 --- a/voice_engine/shared_data.cc +++ b/voice_engine/shared_data.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/shared_data.h" +#include "voice_engine/shared_data.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/output_mixer.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/channel.h" +#include "voice_engine/output_mixer.h" +#include "voice_engine/transmit_mixer.h" namespace webrtc { diff --git a/voice_engine/shared_data.h b/voice_engine/shared_data.h index 7251c6aeaa..58ac827f6e 100644 --- a/voice_engine/shared_data.h +++ b/voice_engine/shared_data.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H -#define WEBRTC_VOICE_ENGINE_SHARED_DATA_H +#ifndef VOICE_ENGINE_SHARED_DATA_H_ +#define VOICE_ENGINE_SHARED_DATA_H_ #include -#include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/scoped_ref_ptr.h" -#include "webrtc/rtc_base/task_queue.h" -#include "webrtc/rtc_base/thread_annotations.h" -#include "webrtc/rtc_base/thread_checker.h" -#include "webrtc/voice_engine/channel_manager.h" -#include "webrtc/voice_engine/statistics.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "modules/utility/include/process_thread.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" +#include "voice_engine/channel_manager.h" +#include "voice_engine/statistics.h" +#include "voice_engine/voice_engine_defines.h" class ProcessThread; @@ -79,4 +79,4 @@ protected: } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H +#endif // VOICE_ENGINE_SHARED_DATA_H_ diff --git a/voice_engine/statistics.cc b/voice_engine/statistics.cc index 0d8250fa98..15cb438dfe 100644 --- a/voice_engine/statistics.cc +++ b/voice_engine/statistics.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/voice_engine/statistics.h" +#include "voice_engine/statistics.h" -#include "webrtc/system_wrappers/include/trace.h" +#include "system_wrappers/include/trace.h" namespace webrtc { diff --git a/voice_engine/statistics.h b/voice_engine/statistics.h index e0aa248ad6..bfefa150fd 100644 --- a/voice_engine/statistics.h +++ b/voice_engine/statistics.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H -#define WEBRTC_VOICE_ENGINE_STATISTICS_H +#ifndef VOICE_ENGINE_STATISTICS_H_ +#define VOICE_ENGINE_STATISTICS_H_ -#include "webrtc/common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "common_types.h" +#include "rtc_base/criticalsection.h" +#include "typedefs.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/voice_engine_defines.h" namespace webrtc { namespace voe { @@ -49,4 +49,4 @@ class Statistics } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_STATISTICS_H +#endif // VOICE_ENGINE_STATISTICS_H_ diff --git a/voice_engine/test/auto_test/automated_mode.cc b/voice_engine/test/auto_test/automated_mode.cc index 098c574848..2893295ed1 100644 --- a/voice_engine/test/auto_test/automated_mode.cc +++ b/voice_engine/test/auto_test/automated_mode.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/test/testsupport/fileutils.h" +#include "test/gtest.h" +#include "test/testsupport/fileutils.h" namespace webrtc { namespace voetest { diff --git a/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc index efdf633f23..6aa6d6ef46 100644 --- a/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc +++ b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" class TestErrorObserver : public webrtc::VoiceEngineObserver { public: diff --git a/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h index cb36f61315..14e5b2ff6e 100644 --- a/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h +++ b/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h @@ -14,14 +14,14 @@ #include #include -#include "webrtc/common_types.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/platform_thread.h" -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" +#include "common_types.h" +#include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/platform_thread.h" +#include "system_wrappers/include/atomic32.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/sleep.h" +#include "voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" class TestErrorObserver; diff --git a/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc index 715c0592cd..dec014ba2d 100644 --- a/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc +++ b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "voice_engine/voice_engine_impl.h" AfterStreamingFixture::AfterStreamingFixture() : BeforeStreamingFixture() { diff --git a/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h index 1762e01ee4..2164328b76 100644 --- a/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h +++ b/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h @@ -13,8 +13,8 @@ #include -#include "webrtc/voice_engine/channel_proxy.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" +#include "voice_engine/channel_proxy.h" +#include "voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" // This fixture will, in addition to the work done by its superclasses, // start play back on construction. diff --git a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc index acfc150c51..b647e88a86 100644 --- a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc +++ b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" +#include "voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" -#include "webrtc/system_wrappers/include/sleep.h" +#include "system_wrappers/include/sleep.h" BeforeInitializationFixture::BeforeInitializationFixture() : voice_engine_(webrtc::VoiceEngine::Create()) { diff --git a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h index ce35141803..3319d92434 100644 --- a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h +++ b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h @@ -11,17 +11,17 @@ #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_H_ #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_H_ -#include "webrtc/common_types.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/include/voe_codec.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/include/voe_file.h" -#include "webrtc/voice_engine/include/voe_network.h" -#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" -#include "webrtc/voice_engine/test/auto_test/voe_test_common.h" +#include "common_types.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "typedefs.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_codec.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/include/voe_file.h" +#include "voice_engine/include/voe_network.h" +#include "voice_engine/include/voe_rtp_rtcp.h" +#include "voice_engine/test/auto_test/voe_test_common.h" // This convenient fixture sets up all voice engine interfaces automatically for // use by testing subclasses. It allocates each interface and releases it once diff --git a/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc index c3dba83979..554face01c 100644 --- a/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc +++ b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" +#include "test/testsupport/fileutils.h" +#include "voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" BeforeStreamingFixture::BeforeStreamingFixture() : channel_(voe_base_->CreateChannel()), diff --git a/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h index 0ff4a06e14..4d492582c7 100644 --- a/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h +++ b/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h @@ -12,7 +12,7 @@ #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_BEFORE_STREAMING_H_ #include -#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" +#include "voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" // This fixture will, in addition to the work done by its superclasses, // create a channel and prepare playing a file through the fake microphone diff --git a/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc b/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc index 961824bf13..969aad1d53 100644 --- a/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc +++ b/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/channel_proxy.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "voice_engine/channel_proxy.h" +#include "voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" +#include "voice_engine/voice_engine_impl.h" class CodecBeforeStreamingTest : public AfterInitializationFixture { protected: diff --git a/voice_engine/test/auto_test/standard/codec_test.cc b/voice_engine/test/auto_test/standard/codec_test.cc index 27c3b0e869..2d979e7f5f 100644 --- a/voice_engine/test/auto_test/standard/codec_test.cc +++ b/voice_engine/test/auto_test/standard/codec_test.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "test/testsupport/fileutils.h" +#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "voice_engine/voice_engine_defines.h" class CodecTest : public AfterStreamingFixture { protected: diff --git a/voice_engine/test/auto_test/standard/dtmf_test.cc b/voice_engine/test/auto_test/standard/dtmf_test.cc index 2e6c73311d..cc5fec2a1b 100644 --- a/voice_engine/test/auto_test/standard/dtmf_test.cc +++ b/voice_engine/test/auto_test/standard/dtmf_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "voice_engine/voice_engine_defines.h" class DtmfTest : public AfterStreamingFixture { protected: diff --git a/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc index b0d9112457..dc01d90f26 100644 --- a/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc +++ b/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" +#include "voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" using namespace webrtc; using namespace testing; diff --git a/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc index 7b343cb1d4..d4692f5889 100644 --- a/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc +++ b/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include "system_wrappers/include/atomic32.h" +#include "system_wrappers/include/sleep.h" +#include "voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" using ::testing::_; using ::testing::AtLeast; diff --git a/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc index 24bb0a7ed3..2e1952702a 100644 --- a/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc +++ b/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/rtc_base/flags.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/flags.h" +#include "system_wrappers/include/event_wrapper.h" +#include "test/testsupport/fileutils.h" +#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "voice_engine/test/auto_test/voe_standard_test.h" DECLARE_bool(include_timing_dependent_tests); diff --git a/voice_engine/test/auto_test/voe_standard_test.cc b/voice_engine/test/auto_test/voe_standard_test.cc index 545be71619..a42658d492 100644 --- a/voice_engine/test/auto_test/voe_standard_test.cc +++ b/voice_engine/test/auto_test/voe_standard_test.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" +#include "voice_engine/test/auto_test/voe_standard_test.h" #include #include #include -#include "webrtc/rtc_base/flags.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/test/auto_test/automated_mode.h" -#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "rtc_base/flags.h" +#include "system_wrappers/include/event_wrapper.h" +#include "typedefs.h" +#include "voice_engine/test/auto_test/automated_mode.h" +#include "voice_engine/test/auto_test/voe_test_defines.h" +#include "voice_engine/voice_engine_defines.h" DEFINE_bool(include_timing_dependent_tests, true, "If true, we will include tests / parts of tests that are known " diff --git a/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h index 9eaed1c0b5..8888d53c13 100644 --- a/voice_engine/test/auto_test/voe_standard_test.h +++ b/voice_engine/test/auto_test/voe_standard_test.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H -#define WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H +#ifndef VOICE_ENGINE_VOE_STANDARD_TEST_H_ +#define VOICE_ENGINE_VOE_STANDARD_TEST_H_ #include #include -#include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/test/auto_test/voe_test_common.h" +#include "test/testsupport/fileutils.h" +#include "voice_engine/test/auto_test/voe_test_common.h" namespace webrtc { namespace voetest { @@ -49,4 +49,4 @@ class SubAPIManager { } // namespace voetest } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H +#endif // VOICE_ENGINE_VOE_STANDARD_TEST_H_ diff --git a/voice_engine/test/auto_test/voe_test_common.h b/voice_engine/test/auto_test/voe_test_common.h index 67478ffcad..5af710d258 100644 --- a/voice_engine/test/auto_test/voe_test_common.h +++ b/voice_engine/test/auto_test/voe_test_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_TEST_COMMON_H_ -#define WEBRTC_VOICE_ENGINE_VOE_TEST_COMMON_H_ +#ifndef VOICE_ENGINE_VOE_TEST_COMMON_H_ +#define VOICE_ENGINE_VOE_TEST_COMMON_H_ #ifdef WEBRTC_ANDROID #include @@ -28,4 +28,4 @@ // Time in ms to test each packet size for each codec #define CODEC_TEST_TIME 400 -#endif // WEBRTC_VOICE_ENGINE_VOE_TEST_COMMON_H_ +#endif // VOICE_ENGINE_VOE_TEST_COMMON_H_ diff --git a/voice_engine/test/auto_test/voe_test_defines.h b/voice_engine/test/auto_test/voe_test_defines.h index 7264ffe7e5..6b8c0c7bbf 100644 --- a/voice_engine/test/auto_test/voe_test_defines.h +++ b/voice_engine/test/auto_test/voe_test_defines.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_TEST_DEFINES_H -#define WEBRTC_VOICE_ENGINE_VOE_TEST_DEFINES_H +#ifndef VOICE_ENGINE_VOE_TEST_DEFINES_H_ +#define VOICE_ENGINE_VOE_TEST_DEFINES_H_ -#include "webrtc/voice_engine/test/auto_test/voe_test_common.h" +#include "voice_engine/test/auto_test/voe_test_common.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 @@ -108,4 +108,4 @@ TEST_LOG("\n>>> Incomplete test at line: %i <<<\n\n",__LINE__); \ } -#endif // WEBRTC_VOICE_ENGINE_VOE_TEST_DEFINES_H +#endif // VOICE_ENGINE_VOE_TEST_DEFINES_H_ diff --git a/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc index 32f48482c0..fefbc47c3c 100644 --- a/voice_engine/transmit_mixer.cc +++ b/voice_engine/transmit_mixer.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/transmit_mixer.h" +#include "voice_engine/transmit_mixer.h" #include -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/channel_manager.h" -#include "webrtc/voice_engine/statistics.h" -#include "webrtc/voice_engine/utility.h" -#include "webrtc/voice_engine/voe_base_impl.h" +#include "audio/utility/audio_frame_operations.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/event_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/channel.h" +#include "voice_engine/channel_manager.h" +#include "voice_engine/statistics.h" +#include "voice_engine/utility.h" +#include "voice_engine/voe_base_impl.h" namespace webrtc { namespace voe { diff --git a/voice_engine/transmit_mixer.h b/voice_engine/transmit_mixer.h index 0ba99cf9d8..83656bac5a 100644 --- a/voice_engine/transmit_mixer.h +++ b/voice_engine/transmit_mixer.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H -#define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H +#ifndef VOICE_ENGINE_TRANSMIT_MIXER_H_ +#define VOICE_ENGINE_TRANSMIT_MIXER_H_ #include -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_processing/typing_detection.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/voice_engine/audio_level.h" -#include "webrtc/voice_engine/file_player.h" -#include "webrtc/voice_engine/file_recorder.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/monitor_module.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "common_types.h" +#include "modules/audio_processing/typing_detection.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "voice_engine/audio_level.h" +#include "voice_engine/file_player.h" +#include "voice_engine/file_recorder.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/monitor_module.h" +#include "voice_engine/voice_engine_defines.h" #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 1 @@ -217,4 +217,4 @@ private: } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H +#endif // VOICE_ENGINE_TRANSMIT_MIXER_H_ diff --git a/voice_engine/transport_feedback_packet_loss_tracker.cc b/voice_engine/transport_feedback_packet_loss_tracker.cc index 86ca61eed7..9f7153312f 100644 --- a/voice_engine/transport_feedback_packet_loss_tracker.cc +++ b/voice_engine/transport_feedback_packet_loss_tracker.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" +#include "voice_engine/transport_feedback_packet_loss_tracker.h" #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/mod_ops.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "rtc_base/mod_ops.h" namespace { constexpr uint16_t kSeqNumHalf = 0x8000u; diff --git a/voice_engine/transport_feedback_packet_loss_tracker.h b/voice_engine/transport_feedback_packet_loss_tracker.h index 8168216f69..d7420785f7 100644 --- a/voice_engine/transport_feedback_packet_loss_tracker.h +++ b/voice_engine/transport_feedback_packet_loss_tracker.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ -#define WEBRTC_VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ +#ifndef VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ +#define VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ #include -#include "webrtc/api/optional.h" -#include "webrtc/modules/include/module_common_types.h" +#include "api/optional.h" +#include "modules/include/module_common_types.h" namespace webrtc { @@ -138,4 +138,4 @@ class TransportFeedbackPacketLossTracker final { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ +#endif // VOICE_ENGINE_TRANSPORT_FEEDBACK_PACKET_LOSS_TRACKER_H_ diff --git a/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc index b3fa25bf4f..1c00b47c1c 100644 --- a/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc +++ b/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/checks.h" +#include "test/gmock.h" +#include "test/gtest.h" +#include "voice_engine/transport_feedback_packet_loss_tracker.h" namespace webrtc { diff --git a/voice_engine/utility.cc b/voice_engine/utility.cc index 345acbdc65..ae777897aa 100644 --- a/voice_engine/utility.cc +++ b/voice_engine/utility.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/utility.h" +#include "voice_engine/utility.h" -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_types.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "audio/utility/audio_frame_operations.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_types.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "voice_engine/voice_engine_defines.h" namespace webrtc { namespace voe { diff --git a/voice_engine/utility.h b/voice_engine/utility.h index 4139f05cfd..ca80a99278 100644 --- a/voice_engine/utility.h +++ b/voice_engine/utility.h @@ -12,11 +12,11 @@ * Contains functions often used by different parts of VoiceEngine. */ -#ifndef WEBRTC_VOICE_ENGINE_UTILITY_H_ -#define WEBRTC_VOICE_ENGINE_UTILITY_H_ +#ifndef VOICE_ENGINE_UTILITY_H_ +#define VOICE_ENGINE_UTILITY_H_ -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/typedefs.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "typedefs.h" namespace webrtc { @@ -54,4 +54,4 @@ void MixWithSat(int16_t target[], } // namespace voe } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_UTILITY_H_ +#endif // VOICE_ENGINE_UTILITY_H_ diff --git a/voice_engine/utility_unittest.cc b/voice_engine/utility_unittest.cc index fc4f399d66..cd91d21aa1 100644 --- a/voice_engine/utility_unittest.cc +++ b/voice_engine/utility_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/common_audio/resampler/include/push_resampler.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/arraysize.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/utility.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "common_audio/resampler/include/push_resampler.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/arraysize.h" +#include "rtc_base/format_macros.h" +#include "test/gtest.h" +#include "voice_engine/utility.h" +#include "voice_engine/voice_engine_defines.h" namespace webrtc { namespace voe { diff --git a/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc index 51585a0e79..50611df77e 100644 --- a/voice_engine/voe_base_impl.cc +++ b/voice_engine/voe_base_impl.cc @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/voe_base_impl.h" +#include "voice_engine/voe_base_impl.h" -#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/location.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/output_mixer.h" -#include "webrtc/voice_engine/transmit_mixer.h" -#include "webrtc/voice_engine/utility.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "modules/audio_device/audio_device_impl.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "system_wrappers/include/file_wrapper.h" +#include "voice_engine/channel.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/output_mixer.h" +#include "voice_engine/transmit_mixer.h" +#include "voice_engine/utility.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h index 3c85eba26c..36e3502e3b 100644 --- a/voice_engine/voe_base_impl.h +++ b/voice_engine/voe_base_impl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H +#ifndef VOICE_ENGINE_VOE_BASE_IMPL_H_ +#define VOICE_ENGINE_VOE_BASE_IMPL_H_ -#include "webrtc/voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_base.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/rtc_base/criticalsection.h" -#include "webrtc/voice_engine/shared_data.h" +#include "modules/include/module_common_types.h" +#include "rtc_base/criticalsection.h" +#include "voice_engine/shared_data.h" namespace webrtc { @@ -124,4 +124,4 @@ class VoEBaseImpl : public VoEBase, } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H +#endif // VOICE_ENGINE_VOE_BASE_IMPL_H_ diff --git a/voice_engine/voe_base_unittest.cc b/voice_engine/voe_base_unittest.cc index 55f9634a83..d6eb875fb3 100644 --- a/voice_engine/voe_base_unittest.cc +++ b/voice_engine/voe_base_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_base.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/channel_manager.h" -#include "webrtc/voice_engine/shared_data.h" -#include "webrtc/voice_engine/voice_engine_fixture.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gtest.h" +#include "voice_engine/channel_manager.h" +#include "voice_engine/shared_data.h" +#include "voice_engine/voice_engine_fixture.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voe_codec_impl.cc b/voice_engine/voe_codec_impl.cc index cdd2403e8c..7ba9ab3f05 100644 --- a/voice_engine/voe_codec_impl.cc +++ b/voice_engine/voe_codec_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/voe_codec_impl.h" +#include "voice_engine/voe_codec_impl.h" -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "rtc_base/format_macros.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/channel.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voe_codec_impl.h b/voice_engine/voe_codec_impl.h index d24bbac2e5..9101f5d62e 100644 --- a/voice_engine/voe_codec_impl.h +++ b/voice_engine/voe_codec_impl.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H +#ifndef VOICE_ENGINE_VOE_CODEC_IMPL_H_ +#define VOICE_ENGINE_VOE_CODEC_IMPL_H_ -#include "webrtc/voice_engine/include/voe_codec.h" +#include "voice_engine/include/voe_codec.h" -#include "webrtc/voice_engine/shared_data.h" +#include "voice_engine/shared_data.h" namespace webrtc { @@ -70,4 +70,4 @@ class VoECodecImpl : public VoECodec { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H +#endif // VOICE_ENGINE_VOE_CODEC_IMPL_H_ diff --git a/voice_engine/voe_codec_unittest.cc b/voice_engine/voe_codec_unittest.cc index 7d277852a0..4585a672ae 100644 --- a/voice_engine/voe_codec_unittest.cc +++ b/voice_engine/voe_codec_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/voice_engine/include/voe_codec.h" +#include "voice_engine/include/voe_codec.h" -#include "webrtc/modules/audio_device/include/fake_audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/voice_engine_defines.h" +#include "modules/audio_device/include/fake_audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gtest.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/voice_engine_defines.h" namespace webrtc { namespace voe { diff --git a/voice_engine/voe_file_impl.cc b/voice_engine/voe_file_impl.cc index 5519c1e823..9bf8c7a1e0 100644 --- a/voice_engine/voe_file_impl.cc +++ b/voice_engine/voe_file_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/voe_file_impl.h" +#include "voice_engine/voe_file_impl.h" -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/output_mixer.h" -#include "webrtc/voice_engine/transmit_mixer.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/channel.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/output_mixer.h" +#include "voice_engine/transmit_mixer.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voe_file_impl.h b/voice_engine/voe_file_impl.h index 5d28947ed7..d3392a14cf 100644 --- a/voice_engine/voe_file_impl.h +++ b/voice_engine/voe_file_impl.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H +#ifndef VOICE_ENGINE_VOE_FILE_IMPL_H_ +#define VOICE_ENGINE_VOE_FILE_IMPL_H_ -#include "webrtc/voice_engine/include/voe_file.h" -#include "webrtc/voice_engine/shared_data.h" +#include "voice_engine/include/voe_file.h" +#include "voice_engine/shared_data.h" namespace webrtc { @@ -92,4 +92,4 @@ class VoEFileImpl : public VoEFile { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H +#endif // VOICE_ENGINE_VOE_FILE_IMPL_H_ diff --git a/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc index 26ad417668..d56d1aa26f 100644 --- a/voice_engine/voe_network_impl.cc +++ b/voice_engine/voe_network_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/voe_network_impl.h" +#include "voice_engine/voe_network_impl.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/rtc_base/format_macros.h" -#include "webrtc/rtc_base/logging.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "rtc_base/checks.h" +#include "rtc_base/format_macros.h" +#include "rtc_base/logging.h" +#include "voice_engine/channel.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voe_network_impl.h b/voice_engine/voe_network_impl.h index d3601e30a6..da2914e4ba 100644 --- a/voice_engine/voe_network_impl.h +++ b/voice_engine/voe_network_impl.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H +#ifndef VOICE_ENGINE_VOE_NETWORK_IMPL_H_ +#define VOICE_ENGINE_VOE_NETWORK_IMPL_H_ -#include "webrtc/voice_engine/include/voe_network.h" +#include "voice_engine/include/voe_network.h" -#include "webrtc/voice_engine/shared_data.h" +#include "voice_engine/shared_data.h" namespace webrtc { @@ -40,4 +40,4 @@ class VoENetworkImpl : public VoENetwork { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H +#endif // VOICE_ENGINE_VOE_NETWORK_IMPL_H_ diff --git a/voice_engine/voe_network_unittest.cc b/voice_engine/voe_network_unittest.cc index 1124c3ba21..b37caf5a3c 100644 --- a/voice_engine/voe_network_unittest.cc +++ b/voice_engine/voe_network_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/include/voe_network.h" +#include "voice_engine/include/voe_network.h" -#include "webrtc/test/gtest.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/voice_engine_fixture.h" +#include "test/gtest.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/voice_engine_fixture.h" namespace webrtc { diff --git a/voice_engine/voe_rtp_rtcp_impl.cc b/voice_engine/voe_rtp_rtcp_impl.cc index b69ddf382d..15d5022039 100644 --- a/voice_engine/voe_rtp_rtcp_impl.cc +++ b/voice_engine/voe_rtp_rtcp_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/include/voe_errors.h" -#include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "system_wrappers/include/file_wrapper.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/include/voe_errors.h" +#include "voice_engine/voe_rtp_rtcp_impl.h" +#include "voice_engine/voice_engine_impl.h" -#include "webrtc/voice_engine/channel.h" -#include "webrtc/voice_engine/transmit_mixer.h" +#include "voice_engine/channel.h" +#include "voice_engine/transmit_mixer.h" namespace webrtc { diff --git a/voice_engine/voe_rtp_rtcp_impl.h b/voice_engine/voe_rtp_rtcp_impl.h index 8b75682960..b640bdfbd3 100644 --- a/voice_engine/voe_rtp_rtcp_impl.h +++ b/voice_engine/voe_rtp_rtcp_impl.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H +#ifndef VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H_ +#define VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H_ -#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "voice_engine/include/voe_rtp_rtcp.h" -#include "webrtc/voice_engine/shared_data.h" +#include "voice_engine/shared_data.h" namespace webrtc { @@ -52,4 +52,4 @@ class VoERTP_RTCPImpl : public VoERTP_RTCP { } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H +#endif // VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H_ diff --git a/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h index 3b86c6a7b7..6c915b48b1 100644 --- a/voice_engine/voice_engine_defines.h +++ b/voice_engine/voice_engine_defines.h @@ -13,12 +13,12 @@ * platform specific settings. */ -#ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H -#define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H +#ifndef VOICE_ENGINE_VOICE_ENGINE_DEFINES_H_ +#define VOICE_ENGINE_VOICE_ENGINE_DEFINES_H_ -#include "webrtc/common_types.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/typedefs.h" +#include "common_types.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "typedefs.h" namespace webrtc { @@ -97,4 +97,4 @@ inline int VoEChannelId(int moduleId) { #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 #endif // #if (defined(_WIN32) -#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_DEFINES_H +#endif // VOICE_ENGINE_VOICE_ENGINE_DEFINES_H_ diff --git a/voice_engine/voice_engine_fixture.cc b/voice_engine/voice_engine_fixture.cc index 3cb613d0ba..eb605c9c5b 100644 --- a/voice_engine/voice_engine_fixture.cc +++ b/voice_engine/voice_engine_fixture.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/voice_engine_fixture.h" -#include "webrtc/modules/audio_processing/include/mock_audio_processing.h" +#include "voice_engine/voice_engine_fixture.h" +#include "modules/audio_processing/include/mock_audio_processing.h" namespace webrtc { diff --git a/voice_engine/voice_engine_fixture.h b/voice_engine/voice_engine_fixture.h index 9f2f316567..c4fc5d0d25 100644 --- a/voice_engine/voice_engine_fixture.h +++ b/voice_engine/voice_engine_fixture.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/audio_device/include/fake_audio_device.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/mock_transport.h" -#include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/voice_engine/include/voe_network.h" -#include "webrtc/voice_engine/mock/mock_voe_observer.h" +#include "modules/audio_device/include/fake_audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "test/gtest.h" +#include "test/mock_transport.h" +#include "voice_engine/include/voe_base.h" +#include "voice_engine/include/voe_network.h" +#include "voice_engine/mock/mock_voe_observer.h" namespace webrtc { diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc index d2d0fdd8f4..9ecdf3bf8b 100644 --- a/voice_engine/voice_engine_impl.cc +++ b/voice_engine/voice_engine_impl.cc @@ -9,16 +9,16 @@ */ #if defined(WEBRTC_ANDROID) -#include "webrtc/modules/audio_device/android/audio_device_template.h" -#include "webrtc/modules/audio_device/android/audio_record_jni.h" -#include "webrtc/modules/audio_device/android/audio_track_jni.h" +#include "modules/audio_device/android/audio_device_template.h" +#include "modules/audio_device/android/audio_record_jni.h" +#include "modules/audio_device/android/audio_track_jni.h" #endif -#include "webrtc/modules/audio_coding/include/audio_coding_module.h" -#include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/channel_proxy.h" -#include "webrtc/voice_engine/voice_engine_impl.h" +#include "modules/audio_coding/include/audio_coding_module.h" +#include "rtc_base/checks.h" +#include "system_wrappers/include/trace.h" +#include "voice_engine/channel_proxy.h" +#include "voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h index a224271284..df7837ddd0 100644 --- a/voice_engine/voice_engine_impl.h +++ b/voice_engine/voice_engine_impl.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H -#define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H +#ifndef VOICE_ENGINE_VOICE_ENGINE_IMPL_H_ +#define VOICE_ENGINE_VOICE_ENGINE_IMPL_H_ #include -#include "webrtc/system_wrappers/include/atomic32.h" -#include "webrtc/typedefs.h" -#include "webrtc/voice_engine/voe_base_impl.h" -#include "webrtc/voice_engine/voe_codec_impl.h" -#include "webrtc/voice_engine/voe_file_impl.h" -#include "webrtc/voice_engine/voe_network_impl.h" -#include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" +#include "system_wrappers/include/atomic32.h" +#include "typedefs.h" +#include "voice_engine/voe_base_impl.h" +#include "voice_engine/voe_codec_impl.h" +#include "voice_engine/voe_file_impl.h" +#include "voice_engine/voe_network_impl.h" +#include "voice_engine/voe_rtp_rtcp_impl.h" namespace webrtc { namespace voe { @@ -61,4 +61,4 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H +#endif // VOICE_ENGINE_VOICE_ENGINE_IMPL_H_ diff --git a/webrtc.gni b/webrtc.gni index af4d6f97db..b36352ddbe 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -205,7 +205,7 @@ rtc_desktop_capture_supported = is_win || is_mac || (is_linux && use_x11) # Templates # -# Points to //webrtc/ in webrtc stand-alone or to //third_party/webrtc/ in +# Points to // in webrtc stand-alone or to //third_party/webrtc/ in # chromium. # We need absolute paths for all configs in templates as they are shared in # different subdirectories.