Format the rest of /sdk folder
I already submitted separate CLs for /objc, here I'm
doing the rest of this folder
Formatting done via:
git ls-files | grep -E '^sdk\/.*\.(h|cc|mm)' | grep -Ev '^sdk\/objc.*' | xargs clang-format -i
Bug: webrtc:42225392
Change-Id: Ib2c2bf1d882c4e916a5787c2205818e2e4dcc22d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/373902
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43684}
diff --git a/sdk/android/native_api/audio_device_module/audio_device_android.cc b/sdk/android/native_api/audio_device_module/audio_device_android.cc
index 6438f08..052781c 100644
--- a/sdk/android/native_api/audio_device_module/audio_device_android.cc
+++ b/sdk/android/native_api/audio_device_module/audio_device_android.cc
@@ -217,16 +217,16 @@
// Java audio for input and OpenSL ES for output audio (i.e. mixed APIs).
// This combination provides low-latency output audio and at the same
// time support for HW AEC using the AudioRecord Java API.
- return CreateJavaInputAndOpenSLESOutputAudioDeviceModule(
- env, j_context.obj());
+ return CreateJavaInputAndOpenSLESOutputAudioDeviceModule(env,
+ j_context.obj());
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
case AudioDeviceModule::kAndroidAAudioAudio:
// AAudio based audio for both input and output.
return CreateAAudioAudioDeviceModule(env, j_context.obj());
case AudioDeviceModule::kAndroidJavaInputAndAAudioOutputAudio:
// Java audio for input and AAudio for output audio (i.e. mixed APIs).
- return CreateJavaInputAndAAudioOutputAudioDeviceModule(
- env, j_context.obj());
+ return CreateJavaInputAndAAudioOutputAudioDeviceModule(env,
+ j_context.obj());
#endif
default:
return nullptr;
diff --git a/sdk/android/native_api/audio_device_module/audio_device_android.h b/sdk/android/native_api/audio_device_module/audio_device_android.h
index 587d004..4b7d311 100644
--- a/sdk/android/native_api/audio_device_module/audio_device_android.h
+++ b/sdk/android/native_api/audio_device_module/audio_device_android.h
@@ -32,14 +32,12 @@
jobject application_context);
rtc::scoped_refptr<AudioDeviceModule>
-CreateJavaInputAndOpenSLESOutputAudioDeviceModule(
- JNIEnv* env,
- jobject application_context);
+CreateJavaInputAndOpenSLESOutputAudioDeviceModule(JNIEnv* env,
+ jobject application_context);
rtc::scoped_refptr<AudioDeviceModule>
-CreateJavaInputAndAAudioOutputAudioDeviceModule(
- JNIEnv* env,
- jobject application_context);
+CreateJavaInputAndAAudioOutputAudioDeviceModule(JNIEnv* env,
+ jobject application_context);
rtc::scoped_refptr<AudioDeviceModule> CreateAndroidAudioDeviceModule(
AudioDeviceModule::AudioLayer audio_layer);
diff --git a/sdk/android/native_api/jni/java_types.cc b/sdk/android/native_api/jni/java_types.cc
index ab730c4..2f2f183 100644
--- a/sdk/android/native_api/jni/java_types.cc
+++ b/sdk/android/native_api/jni/java_types.cc
@@ -335,8 +335,7 @@
}
JavaListBuilder::JavaListBuilder(JNIEnv* env)
- : env_(env), j_list_(JNI_ArrayList::Java_ArrayList_Constructor(env)) {
-}
+ : env_(env), j_list_(JNI_ArrayList::Java_ArrayList_Constructor(env)) {}
JavaListBuilder::~JavaListBuilder() = default;
@@ -346,8 +345,7 @@
JavaMapBuilder::JavaMapBuilder(JNIEnv* env)
: env_(env),
- j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_Constructor(env)) {
-}
+ j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_Constructor(env)) {}
JavaMapBuilder::~JavaMapBuilder() = default;
diff --git a/sdk/android/native_api/jni/jni_int_wrapper.h b/sdk/android/native_api/jni/jni_int_wrapper.h
index 4fec4cc..54535cf 100644
--- a/sdk/android/native_api/jni/jni_int_wrapper.h
+++ b/sdk/android/native_api/jni/jni_int_wrapper.h
@@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-
#ifndef SDK_ANDROID_NATIVE_API_JNI_JNI_INT_WRAPPER_H_
#define SDK_ANDROID_NATIVE_API_JNI_JNI_INT_WRAPPER_H_
diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc
index f7a9f69..787345b 100644
--- a/sdk/android/src/jni/android_network_monitor.cc
+++ b/sdk/android/src/jni/android_network_monitor.cc
@@ -424,8 +424,7 @@
if (iter != network_info_by_handle_.end()) {
// Remove old if_name for this handle if they don't match.
if (network_info.interface_name != iter->second.interface_name) {
- RTC_LOG(LS_INFO) << "Network"
- << " handle " << network_info.handle
+ RTC_LOG(LS_INFO) << "Network" << " handle " << network_info.handle
<< " change if_name from: "
<< iter->second.interface_name
<< " to: " << network_info.interface_name;
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc
index eb1c150..dafe180 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/audio_device_module.cc
@@ -639,11 +639,13 @@
RTC_CHECK(output_parameters->is_valid());
}
-bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef<jobject>& j_context) {
+bool IsLowLatencyInputSupported(JNIEnv* env,
+ const JavaRef<jobject>& j_context) {
return Java_WebRtcAudioManager_isLowLatencyInputSupported(env, j_context);
}
-bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef<jobject>& j_context) {
+bool IsLowLatencyOutputSupported(JNIEnv* env,
+ const JavaRef<jobject>& j_context) {
return Java_WebRtcAudioManager_isLowLatencyOutputSupported(env, j_context);
}
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.h b/sdk/android/src/jni/audio_device/audio_device_module.h
index c06991f..a812d06 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.h
+++ b/sdk/android/src/jni/audio_device/audio_device_module.h
@@ -91,7 +91,8 @@
bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef<jobject>& j_context);
-bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef<jobject>& j_context);
+bool IsLowLatencyOutputSupported(JNIEnv* env,
+ const JavaRef<jobject>& j_context);
// Glue together an audio input and audio output to get an AudioDeviceModule.
rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceModuleFromInputAndOutput(
diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc
index e515cec..67a2bd1 100644
--- a/sdk/android/src/jni/pc/peer_connection.cc
+++ b/sdk/android/src/jni/pc/peer_connection.cc
@@ -285,7 +285,7 @@
}
rtc_config->port_allocator_config.flags =
- Java_RTCConfiguration_getPortAllocatorFlags(jni, j_rtc_config);
+ Java_RTCConfiguration_getPortAllocatorFlags(jni, j_rtc_config);
}
rtc::KeyType GetRtcConfigKeyType(
diff --git a/sdk/media_constraints.h b/sdk/media_constraints.h
index 5bd38c2..c9678ac 100644
--- a/sdk/media_constraints.h
+++ b/sdk/media_constraints.h
@@ -89,8 +89,8 @@
static const char kEnableIPv6[]; // googIPv6
// Temporary constraint to enable suspend below min bitrate feature.
static const char kEnableVideoSuspendBelowMinBitrate[];
- static const char kScreencastMinBitrate[]; // googScreencastMinBitrate
- static const char kCpuOveruseDetection[]; // googCpuOveruseDetection
+ static const char kScreencastMinBitrate[]; // googScreencastMinBitrate
+ static const char kCpuOveruseDetection[]; // googCpuOveruseDetection
// Constraint to enable negotiating raw RTP packetization using attribute
// "a=packetization:<payload_type> raw" in the SDP for all video payload.
