admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format /sdk

Browse Source 
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}
This commit is contained in:
Jared Siskin 2023-04-20 13:49:21 -07:00 committed by WebRTC LUCI CQ
parent 7c0525b98b
commit 6f86f6af00
72 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/android/native_api/codecs/wrapper.h
View File

@ -12,6 +12,7 @@
#define SDK_ANDROID_NATIVE_API_CODECS_WRAPPER_H_
#include <jni.h>
#include <memory>
#include <vector>

1
sdk/android/native_api/stacktrace/stacktrace.cc
View File

@ -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.

1
sdk/android/native_api/video/wrapper.h
View File

@ -12,6 +12,7 @@
#define SDK_ANDROID_NATIVE_API_VIDEO_WRAPPER_H_
#include <jni.h>
#include <memory>
#include "api/media_stream_interface.h"

3
sdk/android/native_unittests/codecs/wrapper_unittest.cc
View File

@ -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"

7
sdk/android/native_unittests/java_types_unittest.cc
View File

@ -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 @@ TEST(JavaTypesTest, TestJavaToNativeStringMap) {
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);
}

3
sdk/android/native_unittests/video/video_source_unittest.cc
View File

@ -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 {

4
sdk/android/src/jni/android_histogram.cc
View File

@ -38,9 +38,7 @@ static jlong JNI_Histogram_CreateEnumeration(
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);
}

3
sdk/android/src/jni/android_video_track_source.cc
View File

@ -58,8 +58,7 @@ absl::optional<bool> AndroidVideoTrackSource::needs_denoising() const {
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_) {

3
sdk/android/src/jni/android_video_track_source.h
View File

@ -70,8 +70,7 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
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,

3
sdk/android/src/jni/audio_device/audio_track_jni.cc
View File

@ -244,8 +244,7 @@ void AudioTrackJni::CacheDirectBufferAddress(
// 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);

3
sdk/android/src/jni/builtin_audio_decoder_factory_factory.cc
View File

@ -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 {

3
sdk/android/src/jni/builtin_audio_encoder_factory_factory.cc
View File

@ -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 {

2
sdk/android/src/jni/encoded_image.h
View File

@ -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 {

3
sdk/android/src/jni/jni_common.cc
View File

@ -27,8 +27,7 @@ static void JNI_JniCommon_ReleaseRef(JNIEnv* jni,
->Release();
}
static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(
JNIEnv* jni,
static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(JNIEnv* jni,
jint size) {
void* new_data = ::operator new(size);
return NewDirectByteBuffer(jni, new_data, size);

3
sdk/android/src/jni/jni_generator_helper.h
View File

@ -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 @@ namespace android {
using webrtc::JavaParamRef;
using webrtc::JavaRef;
using webrtc::ScopedJavaLocalRef;
using webrtc::LazyGetClass;
using webrtc::MethodID;
using webrtc::ScopedJavaLocalRef;
} // namespace android
} // namespace base

1
sdk/android/src/jni/jni_helpers.h
View File

@ -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"

3
sdk/android/src/jni/libaom_av1_encoder.cc
View File

@ -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"

6
sdk/android/src/jni/nv12_buffer.cc
View File

@ -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 {

6
sdk/android/src/jni/nv21_buffer.cc
View File

@ -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 {

4
sdk/android/src/jni/pc/audio_track.cc
View File

@ -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);

3
sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
View File

@ -36,8 +36,7 @@ static jlong JNI_CallSessionFileRotatingLogSink_AddSink(
return jlongFromPointer(sink);
}
static void JNI_CallSessionFileRotatingLogSink_DeleteSink(
JNIEnv* jni,
static void JNI_CallSessionFileRotatingLogSink_DeleteSink(JNIEnv* jni,
jlong j_sink) {
rtc::CallSessionFileRotatingLogSink* sink =
reinterpret_cast<rtc::CallSessionFileRotatingLogSink*>(j_sink);

4
sdk/android/src/jni/pc/data_channel.cc
View File

@ -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 {

3
sdk/android/src/jni/pc/data_channel.h
View File

@ -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 {

3
sdk/android/src/jni/pc/dtmf_sender.cc
View File

@ -39,8 +39,7 @@ static ScopedJavaLocalRef<jstring> JNI_DtmfSender_Tones(
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();
}

3
sdk/android/src/jni/pc/logging.cc
View File

@ -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"

1
sdk/android/src/jni/pc/media_constraints.h
View File

@ -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"

1
sdk/android/src/jni/pc/media_stream.h
View File

@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
#include <jni.h>
#include <memory>
#include "api/media_stream_interface.h"

12
sdk/android/src/jni/pc/media_stream_track.cc
View File

@ -30,27 +30,23 @@ cricket::MediaType JavaToNativeMediaType(JNIEnv* jni,
Java_MediaType_getNative(jni, j_media_type));
}
static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetId(
JNIEnv* jni,
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,
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,
static ScopedJavaLocalRef<jobject> JNI_MediaStreamTrack_GetState(JNIEnv* jni,
jlong j_p) {
return Java_State_fromNativeIndex(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->state());

1
sdk/android/src/jni/pc/owned_factory_and_threads.h
View File

@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
#include <jni.h>
#include <memory>
#include <utility>

3
sdk/android/src/jni/pc/peer_connection_factory.cc
View File

@ -350,8 +350,7 @@ JNI_PeerConnectionFactory_CreatePeerConnectionFactory(
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;

1
sdk/android/src/jni/pc/peer_connection_factory.h
View File

@ -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"

2
sdk/android/src/jni/pc/rtc_certificate.cc
View File

@ -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 {

6
sdk/android/src/jni/pc/rtp_sender.cc
View File

@ -35,8 +35,7 @@ static jboolean JNI_RtpSender_SetTrack(JNIEnv* jni,
->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 @@ ScopedJavaLocalRef<jobject> JNI_RtpSender_GetStreams(
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()

1
sdk/android/src/jni/pc/session_description.h
View File

@ -12,6 +12,7 @@
#define SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
#include <jni.h>
#include <memory>
#include <string>

1
sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
View File

@ -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"

1
sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
View File

@ -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"

1
sdk/android/src/jni/pc/turn_customizer.cc
View File

@ -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"

6
sdk/android/src/jni/timestamp_aligner.cc
View File

@ -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,8 +33,7 @@ static void JNI_TimestampAligner_ReleaseTimestampAligner(
delete reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner);
}
static jlong JNI_TimestampAligner_TranslateTimestamp(
JNIEnv* env,
static jlong JNI_TimestampAligner_TranslateTimestamp(JNIEnv* env,
jlong timestamp_aligner,
jlong camera_time_ns) {
return reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner)

3
sdk/android/src/jni/video_decoder_wrapper.cc
View File

@ -87,8 +87,7 @@ bool VideoDecoderWrapper::ConfigureInternal(JNIEnv* jni) {
return status == WEBRTC_VIDEO_CODEC_OK;
}
int32_t VideoDecoderWrapper::Decode(
const EncodedImage& image_param,
int32_t VideoDecoderWrapper::Decode(const EncodedImage& image_param,
bool missing_frames,
int64_t render_time_ms) {
RTC_DCHECK_RUN_ON(&decoder_thread_checker_);

1
sdk/android/src/jni/video_encoder_factory_wrapper.h
View File

@ -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"

3
sdk/android/src/jni/video_encoder_wrapper.h
View File

@ -51,8 +51,7 @@ class VideoEncoderWrapper : public VideoEncoder {
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 {

3
sdk/android/src/jni/video_track.cc
View File

@ -40,8 +40,7 @@ static jlong JNI_VideoTrack_WrapSink(JNIEnv* jni,
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);
}

1
sdk/media_constraints.h
View File

@ -17,6 +17,7 @@
#define SDK_MEDIA_CONSTRAINTS_H_
#include <stddef.h>
#include <string>
#include <utility>
#include <vector>

5
sdk/objc/api/peerconnection/RTCPeerConnection.h
View File

@ -82,9 +82,8 @@ typedef NS_ENUM(NSInteger, RTCStatsOutputLevel) {
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);

3
sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h
View File

@ -12,7 +12,8 @@
#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;

19
sdk/objc/base/RTCLogging.h
View File

@ -35,8 +35,11 @@ RTC_EXTERN NSString* RTCFileName(const char* filePath);
// Some convenience macros.
#define RTCLogString(format, ...) \
[NSString stringWithFormat:@"(%@:%d %s): " format, RTCFileName(__FILE__), \
__LINE__, __FUNCTION__, ##__VA_ARGS__]
[NSString stringWithFormat:@"(%@:%d %s): " format, \
RTCFileName(__FILE__), \
__LINE__, \
__FUNCTION__, \
##__VA_ARGS__]
#define RTCLogFormat(severity, format, ...) \
do { \
@ -44,17 +47,13 @@ RTC_EXTERN NSString* RTCFileName(const char* filePath);
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__)

1
sdk/objc/components/video_codec/helpers.h
View File

@ -14,6 +14,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <VideoToolbox/VideoToolbox.h>
#include <string>
// Convenience function for creating a dictionary.

1
sdk/objc/components/video_codec/nalu_rewriter.cc
View File

@ -12,6 +12,7 @@
#include "sdk/objc/components/video_codec/nalu_rewriter.h"
#include <CoreFoundation/CoreFoundation.h>
#include <memory>
#include <vector>

4
sdk/objc/components/video_codec/nalu_rewriter.h
View File

@ -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;

2
sdk/objc/native/api/video_capturer.h
View File

@ -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"

3
sdk/objc/native/api/video_decoder_factory.h
View File

@ -13,9 +13,8 @@
#include <memory>
#import "base/RTCVideoDecoderFactory.h"
#include "api/video_codecs/video_decoder_factory.h"
#import "base/RTCVideoDecoderFactory.h"
namespace webrtc {

3
sdk/objc/native/api/video_encoder_factory.h
View File

@ -13,9 +13,8 @@
#include <memory>
#import "base/RTCVideoEncoderFactory.h"
#include "api/video_codecs/video_encoder_factory.h"
#import "base/RTCVideoEncoderFactory.h"
namespace webrtc {

3
sdk/objc/native/api/video_frame.h
View File

@ -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 {

2
sdk/objc/native/api/video_frame_buffer.h
View File

@ -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"

3
sdk/objc/native/api/video_renderer.h
View File

@ -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 {

3
sdk/objc/native/src/audio/audio_device_module_ios.h
View File

@ -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"

3
sdk/objc/native/src/objc_video_decoder_factory.h
View File

@ -29,8 +29,7 @@ class ObjCVideoDecoderFactory : public VideoDecoderFactory {
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_;

3
sdk/objc/native/src/objc_video_encoder_factory.h
View File

@ -31,8 +31,7 @@ class ObjCVideoEncoderFactory : public VideoEncoderFactory {
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:

3
sdk/objc/native/src/objc_video_frame.h
View File

@ -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 {