Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Side by Side Diff: webrtc/base/objc/RTCDispatcher.m

Issue 1782363002: Fix lock behavior on RTCAudioSession. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add log for error Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 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 #import "RTCDispatcher.h" 11 #import "RTCDispatcher.h"
12 12
13 static dispatch_queue_t kAudioSessionQueue = nil;
13 static dispatch_queue_t kCaptureSessionQueue = nil; 14 static dispatch_queue_t kCaptureSessionQueue = nil;
14 15
15 @implementation RTCDispatcher { 16 @implementation RTCDispatcher {
16 dispatch_queue_t _captureSessionQueue; 17 dispatch_queue_t _captureSessionQueue;
18 dispatch_queue_t _audioSessionQueue;
Chuck 2016/03/11 16:53:22 Are these actually used for anything?
tkchin_webrtc 2016/03/11 17:48:21 lol. Removed, thanks.
17 } 19 }
18 20
19 + (void)initialize { 21 + (void)initialize {
20 static dispatch_once_t onceToken; 22 static dispatch_once_t onceToken;
21 dispatch_once(&onceToken, ^{ 23 dispatch_once(&onceToken, ^{
24 kAudioSessionQueue = dispatch_queue_create(
25 "org.webrtc.RTCDispatcherAudioSession",
26 DISPATCH_QUEUE_SERIAL);
22 kCaptureSessionQueue = dispatch_queue_create( 27 kCaptureSessionQueue = dispatch_queue_create(
23 "org.webrtc.RTCDispatcherCaptureSession", 28 "org.webrtc.RTCDispatcherCaptureSession",
24 DISPATCH_QUEUE_SERIAL); 29 DISPATCH_QUEUE_SERIAL);
25 }); 30 });
26 } 31 }
27 32
28 + (void)dispatchAsyncOnType:(RTCDispatcherQueueType)dispatchType 33 + (void)dispatchAsyncOnType:(RTCDispatcherQueueType)dispatchType
29 block:(dispatch_block_t)block { 34 block:(dispatch_block_t)block {
30 dispatch_queue_t queue = [self dispatchQueueForType:dispatchType]; 35 dispatch_queue_t queue = [self dispatchQueueForType:dispatchType];
31 dispatch_async(queue, block); 36 dispatch_async(queue, block);
32 } 37 }
33 38
34 #pragma mark - Private 39 #pragma mark - Private
35 40
36 + (dispatch_queue_t)dispatchQueueForType:(RTCDispatcherQueueType)dispatchType { 41 + (dispatch_queue_t)dispatchQueueForType:(RTCDispatcherQueueType)dispatchType {
37 switch (dispatchType) { 42 switch (dispatchType) {
38 case RTCDispatcherTypeMain: 43 case RTCDispatcherTypeMain:
39 return dispatch_get_main_queue(); 44 return dispatch_get_main_queue();
40 case RTCDispatcherTypeCaptureSession: 45 case RTCDispatcherTypeCaptureSession:
41 return kCaptureSessionQueue; 46 return kCaptureSessionQueue;
47 case RTCDispatcherTypeAudioSession:
48 return kAudioSessionQueue;
42 } 49 }
43 } 50 }
44 51
45 @end 52 @end
46 53
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698