ObjC: RTCVideoSource cleanup
RTCVideoSource was recently added in
https://codereview.webrtc.org/2745193002/. This CL addresses some post
commit feedback.
BUG=webrtc:7177
Review-Url: https://codereview.webrtc.org/2812533003
Cr-Commit-Position: refs/heads/master@{#17649}
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnectionFactory.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnectionFactory.mm
index 9759269..18a707c 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnectionFactory.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnectionFactory.mm
@@ -89,9 +89,9 @@
}
- (RTCVideoSource *)videoSource {
- rtc::scoped_refptr<webrtc::ObjcVideoTrackSource> objc_video_track_source(
+ rtc::scoped_refptr<webrtc::ObjcVideoTrackSource> objcVideoTrackSource(
new rtc::RefCountedObject<webrtc::ObjcVideoTrackSource>());
- return [[RTCVideoSource alloc] initWithNativeVideoSource:objc_video_track_source];
+ return [[RTCVideoSource alloc] initWithNativeVideoSource:objcVideoTrackSource];
}
- (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoCapturer.m b/webrtc/sdk/objc/Framework/Classes/RTCVideoCapturer.m
index e0a307b..9d4d99d 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCVideoCapturer.m
+++ b/webrtc/sdk/objc/Framework/Classes/RTCVideoCapturer.m
@@ -10,19 +10,16 @@
#import "WebRTC/RTCVideoCapturer.h"
-@implementation RTCVideoCapturer {
- __weak id<RTCVideoCapturerDelegate> _delegate;
-}
+@implementation RTCVideoCapturer
+
+@synthesize delegate = _delegate;
- (instancetype)initWithDelegate:(id<RTCVideoCapturerDelegate>)delegate {
+ NSAssert(delegate != nil, @"delegate cannot be nil");
if (self = [super init]) {
_delegate = delegate;
}
return self;
}
-- (id<RTCVideoCapturerDelegate>)delegate {
- return _delegate;
-}
-
@end
diff --git a/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h b/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h
index 0b1e4ba..9bde63f 100644
--- a/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h
+++ b/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h
@@ -11,11 +11,12 @@
#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_OBJCVIDEOTRACKSOURCE_H_
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_OBJCVIDEOTRACKSOURCE_H_
-#import <WebRTC/RTCVideoFrame.h>
-
+#include "WebRTC/RTCMacros.h"
#include "webrtc/base/timestampaligner.h"
#include "webrtc/media/base/adaptedvideotracksource.h"
+RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
+
namespace webrtc {
class ObjcVideoTrackSource : public rtc::AdaptedVideoTrackSource {