diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h index 29f7d04bdc..50076003cb 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h @@ -35,7 +35,7 @@ bool _captureInitialized; webrtc::videocapturemodule::VideoCaptureMacQTKit* _owner; - NSLock* lock_; + NSLock* _lock; QTCaptureSession* _captureSession; QTCaptureDeviceInput* _captureVideoDeviceInput; diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm index 7cd7407e45..4bbd8c4801 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm @@ -46,6 +46,7 @@ using namespace videocapturemodule; [_captureDecompressedVideoOutput release]; [_captureSession release]; [_captureDevices release]; + [_lock release]; [super dealloc]; } @@ -53,9 +54,9 @@ using namespace videocapturemodule; #pragma mark Public methods - (void)registerOwner:(VideoCaptureMacQTKit*)owner { - [lock_ lock]; + [_lock lock]; _owner = owner; - [lock_ unlock]; + [_lock unlock]; } - (BOOL)setCaptureDeviceById:(char*)uniqueId { @@ -170,7 +171,7 @@ using namespace videocapturemodule; _frameRate = DEFAULT_FRAME_RATE; _frameWidth = DEFAULT_FRAME_WIDTH; _frameHeight = DEFAULT_FRAME_HEIGHT; - lock_ = [[NSLock alloc] init]; + _lock = [[NSLock alloc] init]; _captureSession = [[QTCaptureSession alloc] init]; _captureDecompressedVideoOutput = [[QTCaptureDecompressedVideoOutput alloc] init]; @@ -227,9 +228,9 @@ using namespace videocapturemodule; withSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection { - [lock_ lock]; + [_lock lock]; if (!_owner) { - [lock_ unlock]; + [_lock unlock]; return; } @@ -251,7 +252,7 @@ using namespace videocapturemodule; tempCaptureCapability, 0); CVPixelBufferUnlockBaseAddress(videoFrame, kFlags); } - [lock_ unlock]; + [_lock unlock]; _framesDelivered++; _framesRendered++; }