Format /sdk
git ls-files | grep -e "\(\.h\|\.cc\)$" | grep -e "^sdk/" | xargs clang-format -i ; git cl format
after landing: add to .git-blame-ignore-revs
Bug: webrtc:15082
Change-Id: If05d3c7555c4f2bf25e387249932787a93aa39c5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/302060
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39913}
diff --git a/sdk/android/native_api/codecs/wrapper.h b/sdk/android/native_api/codecs/wrapper.h
index 0420169..16d3294 100644
--- a/sdk/android/native_api/codecs/wrapper.h
+++ b/sdk/android/native_api/codecs/wrapper.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_NATIVE_API_CODECS_WRAPPER_H_
#include <jni.h>
+
#include <memory>
#include <vector>
diff --git a/sdk/android/native_api/stacktrace/stacktrace.cc b/sdk/android/native_api/stacktrace/stacktrace.cc
index 96e03e0..94b9b7b 100644
--- a/sdk/android/native_api/stacktrace/stacktrace.cc
+++ b/sdk/android/native_api/stacktrace/stacktrace.cc
@@ -19,6 +19,7 @@
#include <ucontext.h>
#include <unistd.h>
#include <unwind.h>
+
#include <atomic>
// ptrace.h is polluting the namespace. Clean up to avoid conflicts with rtc.
diff --git a/sdk/android/native_api/video/wrapper.h b/sdk/android/native_api/video/wrapper.h
index e32cf34..3cfcb05 100644
--- a/sdk/android/native_api/video/wrapper.h
+++ b/sdk/android/native_api/video/wrapper.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_NATIVE_API_VIDEO_WRAPPER_H_
#include <jni.h>
+
#include <memory>
#include "api/media_stream_interface.h"
diff --git a/sdk/android/native_unittests/codecs/wrapper_unittest.cc b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
index c858095..6a43480 100644
--- a/sdk/android/native_unittests/codecs/wrapper_unittest.cc
+++ b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "sdk/android/native_api/codecs/wrapper.h"
+
#include <memory>
#include "absl/memory/memory.h"
#include "media/base/media_constants.h"
#include "sdk/android/generated_native_unittests_jni/CodecsWrapperTestHelper_jni.h"
-#include "sdk/android/native_api/codecs/wrapper.h"
#include "sdk/android/src/jni/video_encoder_wrapper.h"
#include "test/gtest.h"
diff --git a/sdk/android/native_unittests/java_types_unittest.cc b/sdk/android/native_unittests/java_types_unittest.cc
index 4e7a6ed..9e99001 100644
--- a/sdk/android/native_unittests/java_types_unittest.cc
+++ b/sdk/android/native_unittests/java_types_unittest.cc
@@ -8,11 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "sdk/android/native_api/jni/java_types.h"
+
#include <memory>
#include <vector>
#include "sdk/android/generated_native_unittests_jni/JavaTypesTestHelper_jni.h"
-#include "sdk/android/native_api/jni/java_types.h"
#include "test/gtest.h"
namespace webrtc {
@@ -26,7 +27,9 @@
std::map<std::string, std::string> output = JavaToNativeStringMap(env, j_map);
std::map<std::string, std::string> expected{
- {"one", "1"}, {"two", "2"}, {"three", "3"},
+ {"one", "1"},
+ {"two", "2"},
+ {"three", "3"},
};
EXPECT_EQ(expected, output);
}
diff --git a/sdk/android/native_unittests/video/video_source_unittest.cc b/sdk/android/native_unittests/video/video_source_unittest.cc
index 3c4eed1..36dd5c4 100644
--- a/sdk/android/native_unittests/video/video_source_unittest.cc
+++ b/sdk/android/native_unittests/video/video_source_unittest.cc
@@ -8,11 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "sdk/android/native_api/video/video_source.h"
+
#include <vector>
#include "api/video/video_sink_interface.h"
#include "sdk/android/generated_native_unittests_jni/JavaVideoSourceTestHelper_jni.h"
-#include "sdk/android/native_api/video/video_source.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/android_histogram.cc b/sdk/android/src/jni/android_histogram.cc
index 498f143..aa4c0a2 100644
--- a/sdk/android/src/jni/android_histogram.cc
+++ b/sdk/android/src/jni/android_histogram.cc
@@ -38,9 +38,7 @@
return jlongFromPointer(metrics::HistogramFactoryGetEnumeration(name, max));
}
-static void JNI_Histogram_AddSample(JNIEnv* jni,
- jlong histogram,
- jint sample) {
+static void JNI_Histogram_AddSample(JNIEnv* jni, jlong histogram, jint sample) {
if (histogram) {
HistogramAdd(reinterpret_cast<metrics::Histogram*>(histogram), sample);
}
diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc
index d553af2..e7bf5b9 100644
--- a/sdk/android/src/jni/android_video_track_source.cc
+++ b/sdk/android/src/jni/android_video_track_source.cc
@@ -58,8 +58,7 @@
return false;
}
-void AndroidVideoTrackSource::SetState(JNIEnv* env,
- jboolean j_is_live) {
+void AndroidVideoTrackSource::SetState(JNIEnv* env, jboolean j_is_live) {
const SourceState state = j_is_live ? kLive : kEnded;
if (state_.exchange(state) != state) {
if (rtc::Thread::Current() == signaling_thread_) {
diff --git a/sdk/android/src/jni/android_video_track_source.h b/sdk/android/src/jni/android_video_track_source.h
index 625633b..9099ce6 100644
--- a/sdk/android/src/jni/android_video_track_source.h
+++ b/sdk/android/src/jni/android_video_track_source.h
@@ -70,8 +70,7 @@
jlong j_timestamp_ns,
const JavaRef<jobject>& j_video_frame_buffer);
- void SetState(JNIEnv* env,
- jboolean j_is_live);
+ void SetState(JNIEnv* env, jboolean j_is_live);
void AdaptOutputFormat(JNIEnv* env,
jint j_landscape_width,
diff --git a/sdk/android/src/jni/audio_device/audio_track_jni.cc b/sdk/android/src/jni/audio_device/audio_track_jni.cc
index c1ff4c3..512c10f 100644
--- a/sdk/android/src/jni/audio_device/audio_track_jni.cc
+++ b/sdk/android/src/jni/audio_device/audio_track_jni.cc
@@ -244,8 +244,7 @@
// This method is called on a high-priority thread from Java. The name of
// the thread is 'AudioRecordTrack'.
-void AudioTrackJni::GetPlayoutData(JNIEnv* env,
- size_t length) {
+void AudioTrackJni::GetPlayoutData(JNIEnv* env, size_t length) {
RTC_DCHECK(thread_checker_java_.IsCurrent());
const size_t bytes_per_frame = audio_parameters_.channels() * sizeof(int16_t);
RTC_DCHECK_EQ(frames_per_buffer_, length / bytes_per_frame);
diff --git a/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc b/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc
index d445cc7..5cd95c6 100644
--- a/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc
+++ b/sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc
@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "sdk/android/generated_builtin_audio_codecs_jni/BuiltinAudioDecoderFactoryFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "api/audio_codecs/builtin_audio_decoder_factory.h"
-
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc b/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc
index e5a4b10..352b8da 100644
--- a/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc
+++ b/sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc
@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "sdk/android/generated_builtin_audio_codecs_jni/BuiltinAudioEncoderFactoryFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "api/audio_codecs/builtin_audio_encoder_factory.h"
-
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/encoded_image.h b/sdk/android/src/jni/encoded_image.h
index fc6d062..2e89286 100644
--- a/sdk/android/src/jni/encoded_image.h
+++ b/sdk/android/src/jni/encoded_image.h
@@ -12,10 +12,10 @@
#define SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
#include <jni.h>
+
#include <vector>
#include "api/video/video_frame_type.h"
-
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc
index 3764f8d..b4ad2d5 100644
--- a/sdk/android/src/jni/jni_common.cc
+++ b/sdk/android/src/jni/jni_common.cc
@@ -27,9 +27,8 @@
->Release();
}
-static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(
- JNIEnv* jni,
- jint size) {
+static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(JNIEnv* jni,
+ jint size) {
void* new_data = ::operator new(size);
return NewDirectByteBuffer(jni, new_data, size);
}
diff --git a/sdk/android/src/jni/jni_generator_helper.h b/sdk/android/src/jni/jni_generator_helper.h
index 23695ca..17b5764 100644
--- a/sdk/android/src/jni/jni_generator_helper.h
+++ b/sdk/android/src/jni/jni_generator_helper.h
@@ -15,6 +15,7 @@
#define SDK_ANDROID_SRC_JNI_JNI_GENERATOR_HELPER_H_
#include <jni.h>
+
#include <atomic>
#include "rtc_base/checks.h"
@@ -82,9 +83,9 @@
using webrtc::JavaParamRef;
using webrtc::JavaRef;
-using webrtc::ScopedJavaLocalRef;
using webrtc::LazyGetClass;
using webrtc::MethodID;
+using webrtc::ScopedJavaLocalRef;
} // namespace android
} // namespace base
diff --git a/sdk/android/src/jni/jni_helpers.h b/sdk/android/src/jni/jni_helpers.h
index 7a2f27b..4e57810 100644
--- a/sdk/android/src/jni/jni_helpers.h
+++ b/sdk/android/src/jni/jni_helpers.h
@@ -15,6 +15,7 @@
#define SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_
#include <jni.h>
+
#include <string>
#include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/libaom_av1_encoder.cc b/sdk/android/src/jni/libaom_av1_encoder.cc
index 400c312..96e0dda 100644
--- a/sdk/android/src/jni/libaom_av1_encoder.cc
+++ b/sdk/android/src/jni/libaom_av1_encoder.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
+
#include <jni.h>
-#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
#include "sdk/android/generated_libaom_av1_encoder_jni/LibaomAv1Encoder_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/nv12_buffer.cc b/sdk/android/src/jni/nv12_buffer.cc
index d0e7972..4a51f89 100644
--- a/sdk/android/src/jni/nv12_buffer.cc
+++ b/sdk/android/src/jni/nv12_buffer.cc
@@ -9,13 +9,13 @@
*/
#include <jni.h>
-#include <vector>
-#include "third_party/libyuv/include/libyuv/convert.h"
-#include "third_party/libyuv/include/libyuv/scale.h"
+#include <vector>
#include "rtc_base/checks.h"
#include "sdk/android/generated_video_jni/NV12Buffer_jni.h"
+#include "third_party/libyuv/include/libyuv/convert.h"
+#include "third_party/libyuv/include/libyuv/scale.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/nv21_buffer.cc b/sdk/android/src/jni/nv21_buffer.cc
index 10e3316..ad43698 100644
--- a/sdk/android/src/jni/nv21_buffer.cc
+++ b/sdk/android/src/jni/nv21_buffer.cc
@@ -9,14 +9,14 @@
*/
#include <jni.h>
-#include <vector>
-#include "third_party/libyuv/include/libyuv/convert.h"
-#include "third_party/libyuv/include/libyuv/scale.h"
+#include <vector>
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "rtc_base/checks.h"
#include "sdk/android/generated_video_jni/NV21Buffer_jni.h"
+#include "third_party/libyuv/include/libyuv/convert.h"
+#include "third_party/libyuv/include/libyuv/scale.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/audio_track.cc b/sdk/android/src/jni/pc/audio_track.cc
index b00287e..36ed43f 100644
--- a/sdk/android/src/jni/pc/audio_track.cc
+++ b/sdk/android/src/jni/pc/audio_track.cc
@@ -14,9 +14,7 @@
namespace webrtc {
namespace jni {
-static void JNI_AudioTrack_SetVolume(JNIEnv*,
- jlong j_p,
- jdouble volume) {
+static void JNI_AudioTrack_SetVolume(JNIEnv*, jlong j_p, jdouble volume) {
rtc::scoped_refptr<AudioSourceInterface> source(
reinterpret_cast<AudioTrackInterface*>(j_p)->GetSource());
source->SetVolume(volume);
diff --git a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
index b937a0d..cef4df5 100644
--- a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
+++ b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
@@ -36,9 +36,8 @@
return jlongFromPointer(sink);
}
-static void JNI_CallSessionFileRotatingLogSink_DeleteSink(
- JNIEnv* jni,
- jlong j_sink) {
+static void JNI_CallSessionFileRotatingLogSink_DeleteSink(JNIEnv* jni,
+ jlong j_sink) {
rtc::CallSessionFileRotatingLogSink* sink =
reinterpret_cast<rtc::CallSessionFileRotatingLogSink*>(j_sink);
rtc::LogMessage::RemoveLogToStream(sink);
diff --git a/sdk/android/src/jni/pc/data_channel.cc b/sdk/android/src/jni/pc/data_channel.cc
index 3552974..c08aed5 100644
--- a/sdk/android/src/jni/pc/data_channel.cc
+++ b/sdk/android/src/jni/pc/data_channel.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <memory>
+#include "sdk/android/src/jni/pc/data_channel.h"
#include <limits>
+#include <memory>
#include "api/data_channel_interface.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_peerconnection_jni/DataChannel_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/data_channel.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/data_channel.h b/sdk/android/src/jni/pc/data_channel.h
index 9da1b67..c034f2d 100644
--- a/sdk/android/src/jni/pc/data_channel.h
+++ b/sdk/android/src/jni/pc/data_channel.h
@@ -11,6 +11,9 @@
#ifndef SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
#define SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
+#include "api/data_channel_interface.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/dtmf_sender.cc b/sdk/android/src/jni/pc/dtmf_sender.cc
index 13cb027..cbf1928 100644
--- a/sdk/android/src/jni/pc/dtmf_sender.cc
+++ b/sdk/android/src/jni/pc/dtmf_sender.cc
@@ -39,8 +39,7 @@
reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->tones());
}
-static jint JNI_DtmfSender_Duration(JNIEnv* jni,
- jlong j_dtmf_sender_pointer) {
+static jint JNI_DtmfSender_Duration(JNIEnv* jni, jlong j_dtmf_sender_pointer) {
return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
->duration();
}
diff --git a/sdk/android/src/jni/pc/logging.cc b/sdk/android/src/jni/pc/logging.cc
index 7b35ca0..cbfc99f 100644
--- a/sdk/android/src/jni/pc/logging.cc
+++ b/sdk/android/src/jni/pc/logging.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "rtc_base/logging.h"
+
#include <memory>
-#include "rtc_base/logging.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/media_constraints.h b/sdk/android/src/jni/pc/media_constraints.h
index 68cedc7..9f8aacb 100644
--- a/sdk/android/src/jni/pc/media_constraints.h
+++ b/sdk/android/src/jni/pc/media_constraints.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
#include <jni.h>
+
#include <memory>
#include "sdk/android/native_api/jni/scoped_java_ref.h"
diff --git a/sdk/android/src/jni/pc/media_stream.h b/sdk/android/src/jni/pc/media_stream.h
index efa177c..a477764 100644
--- a/sdk/android/src/jni/pc/media_stream.h
+++ b/sdk/android/src/jni/pc/media_stream.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
#include <jni.h>
+
#include <memory>
#include "api/media_stream_interface.h"
diff --git a/sdk/android/src/jni/pc/media_stream_track.cc b/sdk/android/src/jni/pc/media_stream_track.cc
index 928f10c..225b608 100644
--- a/sdk/android/src/jni/pc/media_stream_track.cc
+++ b/sdk/android/src/jni/pc/media_stream_track.cc
@@ -30,28 +30,24 @@
Java_MediaType_getNative(jni, j_media_type));
}
-static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetId(
- JNIEnv* jni,
- jlong j_p) {
+static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetId(JNIEnv* jni,
+ jlong j_p) {
return NativeToJavaString(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->id());
}
-static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetKind(
- JNIEnv* jni,
- jlong j_p) {
+static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetKind(JNIEnv* jni,
+ jlong j_p) {
return NativeToJavaString(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->kind());
}
-static jboolean JNI_MediaStreamTrack_GetEnabled(JNIEnv* jni,
- jlong j_p) {
+static jboolean JNI_MediaStreamTrack_GetEnabled(JNIEnv* jni, jlong j_p) {
return reinterpret_cast<MediaStreamTrackInterface*>(j_p)->enabled();
}
-static ScopedJavaLocalRef<jobject> JNI_MediaStreamTrack_GetState(
- JNIEnv* jni,
- jlong j_p) {
+static ScopedJavaLocalRef<jobject> JNI_MediaStreamTrack_GetState(JNIEnv* jni,
+ jlong j_p) {
return Java_State_fromNativeIndex(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->state());
}
diff --git a/sdk/android/src/jni/pc/owned_factory_and_threads.h b/sdk/android/src/jni/pc/owned_factory_and_threads.h
index 7dc9443..865063d 100644
--- a/sdk/android/src/jni/pc/owned_factory_and_threads.h
+++ b/sdk/android/src/jni/pc/owned_factory_and_threads.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
#include <jni.h>
+
#include <memory>
#include <utility>
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc
index 045a2b9..4c68208 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.cc
+++ b/sdk/android/src/jni/pc/peer_connection_factory.cc
@@ -350,8 +350,7 @@
TakeOwnershipOfUniquePtr<NetEqFactory>(native_neteq_factory));
}
-static void JNI_PeerConnectionFactory_FreeFactory(JNIEnv*,
- jlong j_p) {
+static void JNI_PeerConnectionFactory_FreeFactory(JNIEnv*, jlong j_p) {
delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
field_trial::InitFieldTrialsFromString(nullptr);
GetStaticObjects().field_trials_init_string = nullptr;
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.h b/sdk/android/src/jni/pc/peer_connection_factory.h
index b5d5e5d..337d32a 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.h
+++ b/sdk/android/src/jni/pc/peer_connection_factory.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
#include <jni.h>
+
#include "api/peer_connection_interface.h"
#include "rtc_base/thread.h"
diff --git a/sdk/android/src/jni/pc/rtc_certificate.cc b/sdk/android/src/jni/pc/rtc_certificate.cc
index f305324..db7c150 100644
--- a/sdk/android/src/jni/pc/rtc_certificate.cc
+++ b/sdk/android/src/jni/pc/rtc_certificate.cc
@@ -9,7 +9,6 @@
*/
#include "sdk/android/src/jni/pc/rtc_certificate.h"
-#include "sdk/android/src/jni/pc/ice_candidate.h"
#include "rtc_base/ref_count.h"
#include "rtc_base/rtc_certificate.h"
@@ -17,6 +16,7 @@
#include "sdk/android/generated_peerconnection_jni/RtcCertificatePem_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_sender.cc b/sdk/android/src/jni/pc/rtp_sender.cc
index fc83862..ddb53f6 100644
--- a/sdk/android/src/jni/pc/rtp_sender.cc
+++ b/sdk/android/src/jni/pc/rtp_sender.cc
@@ -35,8 +35,7 @@
->SetTrack(reinterpret_cast<MediaStreamTrackInterface*>(j_track_pointer));
}
-jlong JNI_RtpSender_GetTrack(JNIEnv* jni,
- jlong j_rtp_sender_pointer) {
+jlong JNI_RtpSender_GetTrack(JNIEnv* jni, jlong j_rtp_sender_pointer) {
// MediaStreamTrack will have shared ownership by the MediaStreamTrack Java
// object.
return jlongFromPointer(
@@ -65,8 +64,7 @@
convert_function);
}
-jlong JNI_RtpSender_GetDtmfSender(JNIEnv* jni,
- jlong j_rtp_sender_pointer) {
+jlong JNI_RtpSender_GetDtmfSender(JNIEnv* jni, jlong j_rtp_sender_pointer) {
return jlongFromPointer(
reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
->GetDtmfSender()
diff --git a/sdk/android/src/jni/pc/session_description.h b/sdk/android/src/jni/pc/session_description.h
index f0f49cb..6b3b4bc 100644
--- a/sdk/android/src/jni/pc/session_description.h
+++ b/sdk/android/src/jni/pc/session_description.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
#include <jni.h>
+
#include <memory>
#include <string>
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
index 74ef3b8..20c0a0f 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
@@ -9,6 +9,7 @@
*/
#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
+
#include "sdk/android/generated_peerconnection_jni/SSLCertificateVerifier_jni.h"
#include "sdk/android/native_api/jni/class_loader.h"
#include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
index 8c883f4..a997299 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
#include <jni.h>
+
#include <vector>
#include "rtc_base/ssl_certificate.h"
diff --git a/sdk/android/src/jni/pc/turn_customizer.cc b/sdk/android/src/jni/pc/turn_customizer.cc
index 5c93fcd..94ebf01 100644
--- a/sdk/android/src/jni/pc/turn_customizer.cc
+++ b/sdk/android/src/jni/pc/turn_customizer.cc
@@ -9,6 +9,7 @@
*/
#include "api/turn_customizer.h"
+
#include "sdk/android/generated_peerconnection_jni/TurnCustomizer_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/timestamp_aligner.cc b/sdk/android/src/jni/timestamp_aligner.cc
index c0c5fd9..19f2f63 100644
--- a/sdk/android/src/jni/timestamp_aligner.cc
+++ b/sdk/android/src/jni/timestamp_aligner.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "rtc_base/timestamp_aligner.h"
+
#include <jni.h>
#include "rtc_base/time_utils.h"
-#include "rtc_base/timestamp_aligner.h"
#include "sdk/android/generated_video_jni/TimestampAligner_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
@@ -32,10 +33,9 @@
delete reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner);
}
-static jlong JNI_TimestampAligner_TranslateTimestamp(
- JNIEnv* env,
- jlong timestamp_aligner,
- jlong camera_time_ns) {
+static jlong JNI_TimestampAligner_TranslateTimestamp(JNIEnv* env,
+ jlong timestamp_aligner,
+ jlong camera_time_ns) {
return reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner)
->TranslateTimestamp(camera_time_ns / rtc::kNumNanosecsPerMicrosec,
rtc::TimeMicros()) *
diff --git a/sdk/android/src/jni/video_decoder_wrapper.cc b/sdk/android/src/jni/video_decoder_wrapper.cc
index aa83e82..22bfe77 100644
--- a/sdk/android/src/jni/video_decoder_wrapper.cc
+++ b/sdk/android/src/jni/video_decoder_wrapper.cc
@@ -87,10 +87,9 @@
return status == WEBRTC_VIDEO_CODEC_OK;
}
-int32_t VideoDecoderWrapper::Decode(
- const EncodedImage& image_param,
- bool missing_frames,
- int64_t render_time_ms) {
+int32_t VideoDecoderWrapper::Decode(const EncodedImage& image_param,
+ bool missing_frames,
+ int64_t render_time_ms) {
RTC_DCHECK_RUN_ON(&decoder_thread_checker_);
if (!initialized_) {
// Most likely initializing the codec failed.
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.h b/sdk/android/src/jni/video_encoder_factory_wrapper.h
index 2be6b1b..bf6d1e3 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.h
@@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
#include <jni.h>
+
#include <vector>
#include "api/video_codecs/sdp_video_format.h"
diff --git a/sdk/android/src/jni/video_encoder_wrapper.h b/sdk/android/src/jni/video_encoder_wrapper.h
index 5c5aab7..d3eb220 100644
--- a/sdk/android/src/jni/video_encoder_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_wrapper.h
@@ -51,8 +51,7 @@
EncoderInfo GetEncoderInfo() const override;
// Should only be called by JNI.
- void OnEncodedFrame(JNIEnv* jni,
- const JavaRef<jobject>& j_encoded_image);
+ void OnEncodedFrame(JNIEnv* jni, const JavaRef<jobject>& j_encoded_image);
private:
struct FrameExtraInfo {
diff --git a/sdk/android/src/jni/video_track.cc b/sdk/android/src/jni/video_track.cc
index 70bedc1..eb343eb 100644
--- a/sdk/android/src/jni/video_track.cc
+++ b/sdk/android/src/jni/video_track.cc
@@ -40,8 +40,7 @@
return jlongFromPointer(new VideoSinkWrapper(jni, sink));
}
-static void JNI_VideoTrack_FreeSink(JNIEnv* jni,
- jlong j_native_sink) {
+static void JNI_VideoTrack_FreeSink(JNIEnv* jni, jlong j_native_sink) {
delete reinterpret_cast<rtc::VideoSinkInterface<VideoFrame>*>(j_native_sink);
}
diff --git a/sdk/media_constraints.h b/sdk/media_constraints.h
index c946e4f..a428abd 100644
--- a/sdk/media_constraints.h
+++ b/sdk/media_constraints.h
@@ -17,6 +17,7 @@
#define SDK_MEDIA_CONSTRAINTS_H_
#include <stddef.h>
+
#include <string>
#include <utility>
#include <vector>
@@ -59,10 +60,10 @@
// These keys are google specific.
static const char kGoogEchoCancellation[]; // googEchoCancellation
- static const char kAutoGainControl[]; // googAutoGainControl
- static const char kNoiseSuppression[]; // googNoiseSuppression
- static const char kHighpassFilter[]; // googHighpassFilter
- static const char kAudioMirroring[]; // googAudioMirroring
+ static const char kAutoGainControl[]; // googAutoGainControl
+ static const char kNoiseSuppression[]; // googNoiseSuppression
+ static const char kHighpassFilter[]; // googHighpassFilter
+ static const char kAudioMirroring[]; // googAudioMirroring
static const char
kAudioNetworkAdaptorConfig[]; // googAudioNetworkAdaptorConfig
static const char kInitAudioRecordingOnSend[]; // InitAudioRecordingOnSend;
diff --git a/sdk/objc/api/logging/RTCCallbackLogger.h b/sdk/objc/api/logging/RTCCallbackLogger.h
index c1aeb82..1d178b6 100644
--- a/sdk/objc/api/logging/RTCCallbackLogger.h
+++ b/sdk/objc/api/logging/RTCCallbackLogger.h
@@ -32,7 +32,7 @@
// to implement dispatching to some other queue.
- (void)start:(nullable RTCCallbackLoggerMessageHandler)handler;
- (void)startWithMessageAndSeverityHandler:
- (nullable RTCCallbackLoggerMessageAndSeverityHandler)handler;
+ (nullable RTCCallbackLoggerMessageAndSeverityHandler)handler;
- (void)stop;
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
index 70a6532..6ad780a 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
@@ -21,39 +21,39 @@
: (RTCIceTransportPolicy)policy;
+ (RTCIceTransportPolicy)transportPolicyForTransportsType:
- (webrtc::PeerConnectionInterface::IceTransportsType)nativeType;
+ (webrtc::PeerConnectionInterface::IceTransportsType)nativeType;
+ (NSString *)stringForTransportPolicy:(RTCIceTransportPolicy)policy;
+ (webrtc::PeerConnectionInterface::BundlePolicy)nativeBundlePolicyForPolicy:
- (RTCBundlePolicy)policy;
+ (RTCBundlePolicy)policy;
+ (RTCBundlePolicy)bundlePolicyForNativePolicy:
- (webrtc::PeerConnectionInterface::BundlePolicy)nativePolicy;
+ (webrtc::PeerConnectionInterface::BundlePolicy)nativePolicy;
+ (NSString *)stringForBundlePolicy:(RTCBundlePolicy)policy;
+ (webrtc::PeerConnectionInterface::RtcpMuxPolicy)nativeRtcpMuxPolicyForPolicy:
- (RTCRtcpMuxPolicy)policy;
+ (RTCRtcpMuxPolicy)policy;
+ (RTCRtcpMuxPolicy)rtcpMuxPolicyForNativePolicy:
- (webrtc::PeerConnectionInterface::RtcpMuxPolicy)nativePolicy;
+ (webrtc::PeerConnectionInterface::RtcpMuxPolicy)nativePolicy;
+ (NSString *)stringForRtcpMuxPolicy:(RTCRtcpMuxPolicy)policy;
+ (webrtc::PeerConnectionInterface::TcpCandidatePolicy)nativeTcpCandidatePolicyForPolicy:
- (RTCTcpCandidatePolicy)policy;
+ (RTCTcpCandidatePolicy)policy;
+ (RTCTcpCandidatePolicy)tcpCandidatePolicyForNativePolicy:
- (webrtc::PeerConnectionInterface::TcpCandidatePolicy)nativePolicy;
+ (webrtc::PeerConnectionInterface::TcpCandidatePolicy)nativePolicy;
+ (NSString *)stringForTcpCandidatePolicy:(RTCTcpCandidatePolicy)policy;
+ (webrtc::PeerConnectionInterface::CandidateNetworkPolicy)nativeCandidateNetworkPolicyForPolicy:
- (RTCCandidateNetworkPolicy)policy;
+ (RTCCandidateNetworkPolicy)policy;
+ (RTCCandidateNetworkPolicy)candidateNetworkPolicyForNativePolicy:
- (webrtc::PeerConnectionInterface::CandidateNetworkPolicy)nativePolicy;
+ (webrtc::PeerConnectionInterface::CandidateNetworkPolicy)nativePolicy;
+ (NSString *)stringForCandidateNetworkPolicy:(RTCCandidateNetworkPolicy)policy;
@@ -72,7 +72,7 @@
- (nullable webrtc::PeerConnectionInterface::RTCConfiguration *)createNativeConfiguration;
- (instancetype)initWithNativeConfiguration:
- (const webrtc::PeerConnectionInterface::RTCConfiguration &)config NS_DESIGNATED_INITIALIZER;
+ (const webrtc::PeerConnectionInterface::RTCConfiguration &)config NS_DESIGNATED_INITIALIZER;
@end
diff --git a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
index 2cdbdab..d903b0c 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
@@ -40,10 +40,10 @@
: (rtc::scoped_refptr<webrtc::DataChannelInterface>)nativeDataChannel NS_DESIGNATED_INITIALIZER;
+ (webrtc::DataChannelInterface::DataState)nativeDataChannelStateForState:
- (RTCDataChannelState)state;
+ (RTCDataChannelState)state;
+ (RTCDataChannelState)dataChannelStateForNativeState:
- (webrtc::DataChannelInterface::DataState)nativeState;
+ (webrtc::DataChannelInterface::DataState)nativeState;
+ (NSString *)stringForState:(RTCDataChannelState)state;
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
index 49a6216..627d02a 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
@@ -22,7 +22,7 @@
/** Initialize an RTCDtmfSender with a native DtmfSenderInterface. */
- (instancetype)initWithNativeDtmfSender:
- (rtc::scoped_refptr<webrtc::DtmfSenderInterface>)nativeDtmfSender NS_DESIGNATED_INITIALIZER;
+ (rtc::scoped_refptr<webrtc::DtmfSenderInterface>)nativeDtmfSender NS_DESIGNATED_INITIALIZER;
@end
diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.h b/sdk/objc/api/peerconnection/RTCFieldTrials.h
index 3e8fcc8..2c00e11 100644
--- a/sdk/objc/api/peerconnection/RTCFieldTrials.h
+++ b/sdk/objc/api/peerconnection/RTCFieldTrials.h
@@ -14,14 +14,14 @@
/** The only valid value for the following if set is kRTCFieldTrialEnabledValue. */
RTC_EXTERN NSString *const kRTCFieldTrialAudioForceABWENoTWCCKey;
-RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03AdvertisedKey;
-RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03Key;
-RTC_EXTERN NSString * const kRTCFieldTrialH264HighProfileKey;
-RTC_EXTERN NSString * const kRTCFieldTrialMinimizeResamplingOnMobileKey;
+RTC_EXTERN NSString *const kRTCFieldTrialFlexFec03AdvertisedKey;
+RTC_EXTERN NSString *const kRTCFieldTrialFlexFec03Key;
+RTC_EXTERN NSString *const kRTCFieldTrialH264HighProfileKey;
+RTC_EXTERN NSString *const kRTCFieldTrialMinimizeResamplingOnMobileKey;
RTC_EXTERN NSString *const kRTCFieldTrialUseNWPathMonitor;
/** The valid value for field trials above. */
-RTC_EXTERN NSString * const kRTCFieldTrialEnabledValue;
+RTC_EXTERN NSString *const kRTCFieldTrialEnabledValue;
/** Initialize field trials using a dictionary mapping field trial keys to their
* values. See above for valid keys and values. Must be called before any other
diff --git a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
index ee51e27..df45c79 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
@@ -46,10 +46,10 @@
- (BOOL)isEqualToTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track;
+ (webrtc::MediaStreamTrackInterface::TrackState)nativeTrackStateForState:
- (RTCMediaStreamTrackState)state;
+ (RTCMediaStreamTrackState)state;
+ (RTCMediaStreamTrackState)trackStateForNativeState:
- (webrtc::MediaStreamTrackInterface::TrackState)nativeState;
+ (webrtc::MediaStreamTrackInterface::TrackState)nativeState;
+ (NSString *)stringForState:(RTCMediaStreamTrackState)state;
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
index 00f2ef7..9714f50 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
@@ -104,39 +104,39 @@
NS_DESIGNATED_INITIALIZER;
+ (webrtc::PeerConnectionInterface::SignalingState)nativeSignalingStateForState:
- (RTCSignalingState)state;
+ (RTCSignalingState)state;
+ (RTCSignalingState)signalingStateForNativeState:
- (webrtc::PeerConnectionInterface::SignalingState)nativeState;
+ (webrtc::PeerConnectionInterface::SignalingState)nativeState;
+ (NSString *)stringForSignalingState:(RTCSignalingState)state;
+ (webrtc::PeerConnectionInterface::IceConnectionState)nativeIceConnectionStateForState:
- (RTCIceConnectionState)state;
+ (RTCIceConnectionState)state;
+ (webrtc::PeerConnectionInterface::PeerConnectionState)nativeConnectionStateForState:
- (RTCPeerConnectionState)state;
+ (RTCPeerConnectionState)state;
+ (RTCIceConnectionState)iceConnectionStateForNativeState:
- (webrtc::PeerConnectionInterface::IceConnectionState)nativeState;
+ (webrtc::PeerConnectionInterface::IceConnectionState)nativeState;
+ (RTCPeerConnectionState)connectionStateForNativeState:
- (webrtc::PeerConnectionInterface::PeerConnectionState)nativeState;
+ (webrtc::PeerConnectionInterface::PeerConnectionState)nativeState;
+ (NSString *)stringForIceConnectionState:(RTCIceConnectionState)state;
+ (NSString *)stringForConnectionState:(RTCPeerConnectionState)state;
+ (webrtc::PeerConnectionInterface::IceGatheringState)nativeIceGatheringStateForState:
- (RTCIceGatheringState)state;
+ (RTCIceGatheringState)state;
+ (RTCIceGatheringState)iceGatheringStateForNativeState:
- (webrtc::PeerConnectionInterface::IceGatheringState)nativeState;
+ (webrtc::PeerConnectionInterface::IceGatheringState)nativeState;
+ (NSString *)stringForIceGatheringState:(RTCIceGatheringState)state;
+ (webrtc::PeerConnectionInterface::StatsOutputLevel)nativeStatsOutputLevelForLevel:
- (RTCStatsOutputLevel)level;
+ (RTCStatsOutputLevel)level;
@end
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.h b/sdk/objc/api/peerconnection/RTCPeerConnection.h
index 55af686..466e053 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.h
@@ -82,9 +82,8 @@
RTCStatsOutputLevelDebug,
};
-typedef void (^RTCCreateSessionDescriptionCompletionHandler)(RTC_OBJC_TYPE(RTCSessionDescription) *
- _Nullable sdp,
- NSError *_Nullable error);
+typedef void (^RTCCreateSessionDescriptionCompletionHandler)(
+ RTC_OBJC_TYPE(RTCSessionDescription) *_Nullable sdp, NSError *_Nullable error);
typedef void (^RTCSetSessionDescriptionCompletionHandler)(NSError *_Nullable error);
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
index 6aed0b4..eccbcbc 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
@@ -45,7 +45,7 @@
+ (cricket::MediaType)nativeMediaTypeForMediaType:(RTCRtpMediaType)mediaType;
-+ (NSString*)stringForMediaType:(RTCRtpMediaType)mediaType;
++ (NSString *)stringForMediaType:(RTCRtpMediaType)mediaType;
@end
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.h b/sdk/objc/api/peerconnection/RTCRtpSender.h
index fcdf199..41bb083 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender.h
@@ -21,8 +21,8 @@
@protocol RTC_OBJC_TYPE
(RTCRtpSender)<NSObject>
-/** A unique identifier for this sender. */
-@property(nonatomic, readonly) NSString *senderId;
+ /** A unique identifier for this sender. */
+ @property(nonatomic, readonly) NSString *senderId;
/** The currently active RTCRtpParameters, as defined in
* https://www.w3.org/TR/webrtc/#idl-def-RTCRtpParameters.
diff --git a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
index 65d45fb..868cbd8 100644
--- a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
@@ -36,10 +36,10 @@
NS_DESIGNATED_INITIALIZER;
+ (webrtc::RtpTransceiverDirection)nativeRtpTransceiverDirectionFromDirection:
- (RTCRtpTransceiverDirection)direction;
+ (RTCRtpTransceiverDirection)direction;
+ (RTCRtpTransceiverDirection)rtpTransceiverDirectionFromNativeDirection:
- (webrtc::RtpTransceiverDirection)nativeDirection;
+ (webrtc::RtpTransceiverDirection)nativeDirection;
@end
diff --git a/sdk/objc/api/peerconnection/RTCSessionDescription+Private.h b/sdk/objc/api/peerconnection/RTCSessionDescription+Private.h
index aa087e5..d01c04b 100644
--- a/sdk/objc/api/peerconnection/RTCSessionDescription+Private.h
+++ b/sdk/objc/api/peerconnection/RTCSessionDescription+Private.h
@@ -31,7 +31,7 @@
* description.
*/
- (instancetype)initWithNativeDescription:
- (const webrtc::SessionDescriptionInterface *)nativeDescription;
+ (const webrtc::SessionDescriptionInterface *)nativeDescription;
+ (std::string)stdStringForType:(RTCSdpType)type;
diff --git a/sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h b/sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h
index 47c5241..e91302a 100644
--- a/sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h
+++ b/sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h
@@ -12,8 +12,9 @@
#include "api/stats/rtc_stats_report.h"
-@interface RTC_OBJC_TYPE (RTCStatisticsReport) (Private)
+@interface RTC_OBJC_TYPE (RTCStatisticsReport)
+(Private)
-- (instancetype)initWithReport : (const webrtc::RTCStatsReport &)report;
+ - (instancetype)initWithReport : (const webrtc::RTCStatsReport &)report;
@end
diff --git a/sdk/objc/base/RTCLogging.h b/sdk/objc/base/RTCLogging.h
index 754945c..0fa6a91 100644
--- a/sdk/objc/base/RTCLogging.h
+++ b/sdk/objc/base/RTCLogging.h
@@ -34,9 +34,12 @@
// Some convenience macros.
-#define RTCLogString(format, ...) \
- [NSString stringWithFormat:@"(%@:%d %s): " format, RTCFileName(__FILE__), \
- __LINE__, __FUNCTION__, ##__VA_ARGS__]
+#define RTCLogString(format, ...) \
+ [NSString stringWithFormat:@"(%@:%d %s): " format, \
+ RTCFileName(__FILE__), \
+ __LINE__, \
+ __FUNCTION__, \
+ ##__VA_ARGS__]
#define RTCLogFormat(severity, format, ...) \
do { \
@@ -44,17 +47,13 @@
RTCLogEx(severity, log_string); \
} while (false)
-#define RTCLogVerbose(format, ...) \
- RTCLogFormat(RTCLoggingSeverityVerbose, format, ##__VA_ARGS__)
+#define RTCLogVerbose(format, ...) RTCLogFormat(RTCLoggingSeverityVerbose, format, ##__VA_ARGS__)
-#define RTCLogInfo(format, ...) \
- RTCLogFormat(RTCLoggingSeverityInfo, format, ##__VA_ARGS__)
+#define RTCLogInfo(format, ...) RTCLogFormat(RTCLoggingSeverityInfo, format, ##__VA_ARGS__)
-#define RTCLogWarning(format, ...) \
- RTCLogFormat(RTCLoggingSeverityWarning, format, ##__VA_ARGS__)
+#define RTCLogWarning(format, ...) RTCLogFormat(RTCLoggingSeverityWarning, format, ##__VA_ARGS__)
-#define RTCLogError(format, ...) \
- RTCLogFormat(RTCLoggingSeverityError, format, ##__VA_ARGS__)
+#define RTCLogError(format, ...) RTCLogFormat(RTCLoggingSeverityError, format, ##__VA_ARGS__)
#if !defined(NDEBUG)
#define RTCLogDebug(format, ...) RTCLogInfo(format, ##__VA_ARGS__)
diff --git a/sdk/objc/base/RTCVideoEncoder.h b/sdk/objc/base/RTCVideoEncoder.h
index 2445d43..27e6927 100644
--- a/sdk/objc/base/RTCVideoEncoder.h
+++ b/sdk/objc/base/RTCVideoEncoder.h
@@ -28,7 +28,7 @@
@protocol RTC_OBJC_TYPE
(RTCVideoEncoder)<NSObject>
-- (void)setCallback:(nullable RTCVideoEncoderCallback)callback;
+ - (void)setCallback : (nullable RTCVideoEncoderCallback)callback;
- (NSInteger)startEncodeWithSettings:(RTC_OBJC_TYPE(RTCVideoEncoderSettings) *)settings
numberOfCores:(int)numberOfCores;
- (NSInteger)releaseEncoder;
diff --git a/sdk/objc/base/RTCVideoFrame.h b/sdk/objc/base/RTCVideoFrame.h
index f5638d2..edf074b 100644
--- a/sdk/objc/base/RTCVideoFrame.h
+++ b/sdk/objc/base/RTCVideoFrame.h
@@ -45,7 +45,7 @@
@property(nonatomic, readonly) id<RTC_OBJC_TYPE(RTCVideoFrameBuffer)> buffer;
- (instancetype)init NS_UNAVAILABLE;
-- (instancetype) new NS_UNAVAILABLE;
+- (instancetype)new NS_UNAVAILABLE;
/** Initialize an RTCVideoFrame from a pixel buffer, rotation, and timestamp.
* Deprecated - initialize with a RTCCVPixelBuffer instead
diff --git a/sdk/objc/components/video_codec/helpers.h b/sdk/objc/components/video_codec/helpers.h
index 7c9ef1c..9dc05c8 100644
--- a/sdk/objc/components/video_codec/helpers.h
+++ b/sdk/objc/components/video_codec/helpers.h
@@ -14,6 +14,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <VideoToolbox/VideoToolbox.h>
+
#include <string>
// Convenience function for creating a dictionary.
diff --git a/sdk/objc/components/video_codec/nalu_rewriter.cc b/sdk/objc/components/video_codec/nalu_rewriter.cc
index b7330e1..73c0ed0 100644
--- a/sdk/objc/components/video_codec/nalu_rewriter.cc
+++ b/sdk/objc/components/video_codec/nalu_rewriter.cc
@@ -12,6 +12,7 @@
#include "sdk/objc/components/video_codec/nalu_rewriter.h"
#include <CoreFoundation/CoreFoundation.h>
+
#include <memory>
#include <vector>
diff --git a/sdk/objc/components/video_codec/nalu_rewriter.h b/sdk/objc/components/video_codec/nalu_rewriter.h
index c647497..c2b9e48 100644
--- a/sdk/objc/components/video_codec/nalu_rewriter.h
+++ b/sdk/objc/components/video_codec/nalu_rewriter.h
@@ -12,12 +12,12 @@
#ifndef SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_
#define SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_NALU_REWRITER_H_
-#include "modules/video_coding/codecs/h264/include/h264.h"
-
#include <CoreMedia/CoreMedia.h>
+
#include <vector>
#include "common_video/h264/h264_common.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
#include "rtc_base/buffer.h"
using webrtc::H264::NaluIndex;
diff --git a/sdk/objc/native/api/video_capturer.h b/sdk/objc/native/api/video_capturer.h
index 9847d81..c1dfb07 100644
--- a/sdk/objc/native/api/video_capturer.h
+++ b/sdk/objc/native/api/video_capturer.h
@@ -11,8 +11,10 @@
#ifndef SDK_OBJC_NATIVE_API_VIDEO_CAPTURER_H_
#define SDK_OBJC_NATIVE_API_VIDEO_CAPTURER_H_
+// import
#import "base/RTCVideoCapturer.h"
+// include
#include "api/media_stream_interface.h"
#include "api/scoped_refptr.h"
#include "rtc_base/thread.h"
diff --git a/sdk/objc/native/api/video_decoder_factory.h b/sdk/objc/native/api/video_decoder_factory.h
index 03d8af3..9ba11d6 100644
--- a/sdk/objc/native/api/video_decoder_factory.h
+++ b/sdk/objc/native/api/video_decoder_factory.h
@@ -13,9 +13,8 @@
#include <memory>
-#import "base/RTCVideoDecoderFactory.h"
-
#include "api/video_codecs/video_decoder_factory.h"
+#import "base/RTCVideoDecoderFactory.h"
namespace webrtc {
diff --git a/sdk/objc/native/api/video_encoder_factory.h b/sdk/objc/native/api/video_encoder_factory.h
index 6e551b2..ecd9ab0 100644
--- a/sdk/objc/native/api/video_encoder_factory.h
+++ b/sdk/objc/native/api/video_encoder_factory.h
@@ -13,9 +13,8 @@
#include <memory>
-#import "base/RTCVideoEncoderFactory.h"
-
#include "api/video_codecs/video_encoder_factory.h"
+#import "base/RTCVideoEncoderFactory.h"
namespace webrtc {
diff --git a/sdk/objc/native/api/video_frame.h b/sdk/objc/native/api/video_frame.h
index b4416ff..4ca469f 100644
--- a/sdk/objc/native/api/video_frame.h
+++ b/sdk/objc/native/api/video_frame.h
@@ -11,9 +11,8 @@
#ifndef SDK_OBJC_NATIVE_API_VIDEO_FRAME_H_
#define SDK_OBJC_NATIVE_API_VIDEO_FRAME_H_
-#import "base/RTCVideoFrame.h"
-
#include "api/video/video_frame.h"
+#import "base/RTCVideoFrame.h"
namespace webrtc {
diff --git a/sdk/objc/native/api/video_frame_buffer.h b/sdk/objc/native/api/video_frame_buffer.h
index 204d65d..68a8543 100644
--- a/sdk/objc/native/api/video_frame_buffer.h
+++ b/sdk/objc/native/api/video_frame_buffer.h
@@ -11,8 +11,10 @@
#ifndef SDK_OBJC_NATIVE_API_VIDEO_FRAME_BUFFER_H_
#define SDK_OBJC_NATIVE_API_VIDEO_FRAME_BUFFER_H_
+// import
#import "base/RTCVideoFrameBuffer.h"
+// include
#include "api/scoped_refptr.h"
#include "common_video/include/video_frame_buffer.h"
diff --git a/sdk/objc/native/api/video_renderer.h b/sdk/objc/native/api/video_renderer.h
index 04796b8..279857a 100644
--- a/sdk/objc/native/api/video_renderer.h
+++ b/sdk/objc/native/api/video_renderer.h
@@ -11,12 +11,11 @@
#ifndef SDK_OBJC_NATIVE_API_VIDEO_RENDERER_H_
#define SDK_OBJC_NATIVE_API_VIDEO_RENDERER_H_
-#import "base/RTCVideoRenderer.h"
-
#include <memory>
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
+#import "base/RTCVideoRenderer.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.h b/sdk/objc/native/src/audio/audio_device_module_ios.h
index 9bcf114..189d7e6 100644
--- a/sdk/objc/native/src/audio/audio_device_module_ios.h
+++ b/sdk/objc/native/src/audio/audio_device_module_ios.h
@@ -13,9 +13,8 @@
#include <memory>
-#include "audio_device_ios.h"
-
#include "api/task_queue/task_queue_factory.h"
+#include "audio_device_ios.h"
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device.h"
#include "rtc_base/checks.h"
diff --git a/sdk/objc/native/src/objc_video_decoder_factory.h b/sdk/objc/native/src/objc_video_decoder_factory.h
index 30ad8c2..19c997e 100644
--- a/sdk/objc/native/src/objc_video_decoder_factory.h
+++ b/sdk/objc/native/src/objc_video_decoder_factory.h
@@ -29,8 +29,7 @@
id<RTC_OBJC_TYPE(RTCVideoDecoderFactory)> wrapped_decoder_factory() const;
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
- std::unique_ptr<VideoDecoder> CreateVideoDecoder(
- const SdpVideoFormat& format) override;
+ std::unique_ptr<VideoDecoder> CreateVideoDecoder(const SdpVideoFormat& format) override;
private:
id<RTC_OBJC_TYPE(RTCVideoDecoderFactory)> decoder_factory_;
diff --git a/sdk/objc/native/src/objc_video_encoder_factory.h b/sdk/objc/native/src/objc_video_encoder_factory.h
index 38db5e6..85a1e53 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.h
+++ b/sdk/objc/native/src/objc_video_encoder_factory.h
@@ -31,8 +31,7 @@
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
std::vector<SdpVideoFormat> GetImplementations() const override;
- std::unique_ptr<VideoEncoder> CreateVideoEncoder(
- const SdpVideoFormat& format) override;
+ std::unique_ptr<VideoEncoder> CreateVideoEncoder(const SdpVideoFormat& format) override;
std::unique_ptr<EncoderSelectorInterface> GetEncoderSelector() const override;
private:
diff --git a/sdk/objc/native/src/objc_video_frame.h b/sdk/objc/native/src/objc_video_frame.h
index c2931cb..0781d47 100644
--- a/sdk/objc/native/src/objc_video_frame.h
+++ b/sdk/objc/native/src/objc_video_frame.h
@@ -11,9 +11,8 @@
#ifndef SDK_OBJC_NATIVE_SRC_OBJC_VIDEO_FRAME_H_
#define SDK_OBJC_NATIVE_SRC_OBJC_VIDEO_FRAME_H_
-#import "base/RTCVideoFrame.h"
-
#include "api/video/video_frame.h"
+#import "base/RTCVideoFrame.h"
namespace webrtc {
