From d4937d3336bcf86f2fb3363cb6a64a0eb1a36576 Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Wed, 8 Jan 2025 05:58:03 -0800 Subject: [PATCH] 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 Reviewed-by: Danil Chapovalov Reviewed-by: Harald Alvestrand Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#43684} --- .../audio_device_module/audio_device_android.cc | 8 ++++---- .../audio_device_module/audio_device_android.h | 10 ++++------ sdk/android/native_api/jni/java_types.cc | 6 ++---- sdk/android/native_api/jni/jni_int_wrapper.h | 1 - sdk/android/src/jni/android_network_monitor.cc | 3 +-- .../src/jni/audio_device/audio_device_module.cc | 6 ++++-- sdk/android/src/jni/audio_device/audio_device_module.h | 3 ++- sdk/android/src/jni/pc/peer_connection.cc | 2 +- sdk/media_constraints.h | 4 ++-- 9 files changed, 20 insertions(+), 23 deletions(-) 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 6438f086af..052781c641 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 @@ rtc::scoped_refptr CreateAndroidAudioDeviceModule( // 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 587d0041c9..4b7d311ce0 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 @@ rtc::scoped_refptr CreateOpenSLESAudioDeviceModule( jobject application_context); rtc::scoped_refptr -CreateJavaInputAndOpenSLESOutputAudioDeviceModule( - JNIEnv* env, - jobject application_context); +CreateJavaInputAndOpenSLESOutputAudioDeviceModule(JNIEnv* env, + jobject application_context); rtc::scoped_refptr -CreateJavaInputAndAAudioOutputAudioDeviceModule( - JNIEnv* env, - jobject application_context); +CreateJavaInputAndAAudioOutputAudioDeviceModule(JNIEnv* env, + jobject application_context); rtc::scoped_refptr 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 ab730c48f5..2f2f183a93 100644 --- a/sdk/android/native_api/jni/java_types.cc +++ b/sdk/android/native_api/jni/java_types.cc @@ -335,8 +335,7 @@ ScopedJavaLocalRef NativeToJavaStringArray( } 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 @@ void JavaListBuilder::add(const jni_zero::JavaRef& element) { 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 4fec4cc676..54535cfbad 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 f7a9f69672..787345bcff 100644 --- a/sdk/android/src/jni/android_network_monitor.cc +++ b/sdk/android/src/jni/android_network_monitor.cc @@ -424,8 +424,7 @@ void AndroidNetworkMonitor::OnNetworkConnected_n( 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 eb1c150f5f..dafe18010f 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 @@ void GetAudioParameters(JNIEnv* env, RTC_CHECK(output_parameters->is_valid()); } -bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef& j_context) { +bool IsLowLatencyInputSupported(JNIEnv* env, + const JavaRef& j_context) { return Java_WebRtcAudioManager_isLowLatencyInputSupported(env, j_context); } -bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef& j_context) { +bool IsLowLatencyOutputSupported(JNIEnv* env, + const JavaRef& 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 c06991ff4b..a812d069f3 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 @@ void GetAudioParameters(JNIEnv* env, bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef& j_context); -bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef& j_context); +bool IsLowLatencyOutputSupported(JNIEnv* env, + const JavaRef& j_context); // Glue together an audio input and audio output to get an AudioDeviceModule. rtc::scoped_refptr CreateAudioDeviceModuleFromInputAndOutput( diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc index e515cece44..67a2bd1863 100644 --- a/sdk/android/src/jni/pc/peer_connection.cc +++ b/sdk/android/src/jni/pc/peer_connection.cc @@ -285,7 +285,7 @@ void JavaToNativeRTCConfiguration( } 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 5bd38c2d1a..c9678ac191 100644 --- a/sdk/media_constraints.h +++ b/sdk/media_constraints.h @@ -89,8 +89,8 @@ class MediaConstraints { 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: raw" in the SDP for all video payload.