Chromium Code Reviews

Side by Side Diff: webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm

Issue 1644843003: Compile rtc_base_objc and rtc_api_objc for Mac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #define DEFAULT_CAPTURE_DEVICE_INDEX 1 11 #define DEFAULT_CAPTURE_DEVICE_INDEX 1
12 #define DEFAULT_FRAME_RATE 30 12 #define DEFAULT_FRAME_RATE 30
13 #define DEFAULT_FRAME_WIDTH 352 13 #define DEFAULT_FRAME_WIDTH 352
14 #define DEFAULT_FRAME_HEIGHT 288 14 #define DEFAULT_FRAME_HEIGHT 288
15 #define ROTATE_CAPTURED_FRAME 1 15 #define ROTATE_CAPTURED_FRAME 1
16 #define LOW_QUALITY 1 16 #define LOW_QUALITY 1
17 17
18 #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h" 18 #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h"
19 19
20 #include "webrtc/system_wrappers/include/trace.h" 20 #include "webrtc/system_wrappers/include/trace.h"
21 21
22 using namespace webrtc; 22 using namespace webrtc;
23 using namespace videocapturemodule; 23 using namespace videocapturemodule;
24 24
25 @implementation VideoCaptureMacQTKitObjC 25 @implementation VideoCaptureMacQTKitObjC
26 26
27 #pragma clang diagnostic push
tkchin_webrtc 2016/01/28 21:09:44 Is this because QTKit is deprecated?
hjon_webrtc 2016/01/28 23:49:51 Yes. There were enough errors in this file that it
28 #pragma clang diagnostic ignored "-Wdeprecated"
27 -(id)init { 29 -(id)init {
28 self = [super init]; 30 self = [super init];
29 if (self) { 31 if (self) {
30 [self initializeVariables]; 32 [self initializeVariables];
31 } 33 }
32 return self; 34 return self;
33 } 35 }
34 36
35 - (void)dealloc { 37 - (void)dealloc {
36 if (_captureSession) 38 if (_captureSession)
(...skipping 212 matching lines...)
249 tempCaptureCapability.rawType = kVideoBGRA; 251 tempCaptureCapability.rawType = kVideoBGRA;
250 252
251 _owner->IncomingFrame((unsigned char*)baseAddress, frameSize, 253 _owner->IncomingFrame((unsigned char*)baseAddress, frameSize,
252 tempCaptureCapability, 0); 254 tempCaptureCapability, 0);
253 CVPixelBufferUnlockBaseAddress(videoFrame, kFlags); 255 CVPixelBufferUnlockBaseAddress(videoFrame, kFlags);
254 } 256 }
255 [_lock unlock]; 257 [_lock unlock];
256 _framesDelivered++; 258 _framesDelivered++;
257 _framesRendered++; 259 _framesRendered++;
258 } 260 }
261 #pragma clang diagnostic pop
259 262
260 @end 263 @end
OLDNEW

Powered by Google App Engine