From e52b3b9c956eb5932602ab638150221c4e225047 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Tue, 25 Mar 2014 18:15:07 +0000 Subject: [PATCH] iOS video_capture: move @private vars to impl. Promised change from https://webrtc-codereview.appspot.com/10539005/ that got dropped accidentally. R=noahric@google.com Review URL: https://webrtc-codereview.appspot.com/10639004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5781 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_capture/ios/rtc_video_capture_ios_objc.h | 11 +---------- .../video_capture/ios/rtc_video_capture_ios_objc.mm | 10 +++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h index 8c099698a..7d4147b43 100644 --- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h +++ b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h @@ -21,16 +21,7 @@ // This notification must be posted in order for the capturer to reflect the // orientation change in video w.r.t. the application orientation. @interface RTCVideoCaptureIosObjC - : NSObject { - @private - webrtc::videocapturemodule::VideoCaptureIos* _owner; - webrtc::VideoCaptureCapability _capability; - AVCaptureSession* _captureSession; - int _captureId; - AVCaptureConnection* _connection; - BOOL _captureStarting; // Guarded by _captureStartingCondition. - NSCondition* _captureStartingCondition; -} + : NSObject @property webrtc::VideoCaptureRotation frameRotation; diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm index b4065ddbe..016a20bfd 100644 --- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm +++ b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm @@ -26,7 +26,15 @@ using namespace webrtc::videocapturemodule; - (int)changeCaptureInputWithName:(NSString*)captureDeviceName; @end -@implementation RTCVideoCaptureIosObjC +@implementation RTCVideoCaptureIosObjC { + webrtc::videocapturemodule::VideoCaptureIos* _owner; + webrtc::VideoCaptureCapability _capability; + AVCaptureSession* _captureSession; + int _captureId; + AVCaptureConnection* _connection; + BOOL _captureStarting; // Guarded by _captureStartingCondition. + NSCondition* _captureStartingCondition; +} @synthesize frameRotation = _framRotation;