OLD | NEW |
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 "webrtc/api/objc/RTCPeerConnection+Private.h" | 11 #import "webrtc/api/objc/RTCPeerConnection+Private.h" |
12 | 12 |
13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
14 | 14 |
15 #import "webrtc/api/objc/RTCMediaStreamTrack+Private.h" | 15 #import "webrtc/api/objc/RTCMediaStreamTrack+Private.h" |
16 #import "webrtc/api/objc/RTCStatsReport+Private.h" | 16 #import "webrtc/api/objc/RTCStatsReport+Private.h" |
17 #import "webrtc/base/objc/NSString+StdString.h" | 17 #import "webrtc/base/objc/NSString+StdString.h" |
18 | 18 |
| 19 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 |
| 20 |
19 namespace webrtc { | 21 namespace webrtc { |
20 | 22 |
21 class StatsObserverAdapter : public StatsObserver { | 23 class StatsObserverAdapter : public StatsObserver { |
22 public: | 24 public: |
23 StatsObserverAdapter(void (^completionHandler) | 25 StatsObserverAdapter(void (^completionHandler) |
24 (NSArray<RTCStatsReport *> *stats)) { | 26 (NSArray *stats)) { |
| 27 // (NSArray<RTCStatsReport *> *stats)) { |
25 completion_handler_ = completionHandler; | 28 completion_handler_ = completionHandler; |
26 } | 29 } |
27 | 30 |
28 ~StatsObserverAdapter() { | 31 ~StatsObserverAdapter() { |
29 completion_handler_ = nil; | 32 completion_handler_ = nil; |
30 } | 33 } |
31 | 34 |
32 void OnComplete(const StatsReports& reports) override { | 35 void OnComplete(const StatsReports& reports) override { |
33 RTC_DCHECK(completion_handler_); | 36 RTC_DCHECK(completion_handler_); |
34 NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports.size()]; | 37 NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports.size()]; |
35 for (const auto* report : reports) { | 38 for (const auto* report : reports) { |
36 RTCStatsReport *statsReport = | 39 RTCStatsReport *statsReport = |
37 [[RTCStatsReport alloc] initWithNativeReport:*report]; | 40 [[RTCStatsReport alloc] initWithNativeReport:*report]; |
38 [stats addObject:statsReport]; | 41 [stats addObject:statsReport]; |
39 } | 42 } |
40 completion_handler_(stats); | 43 completion_handler_(stats); |
41 completion_handler_ = nil; | 44 completion_handler_ = nil; |
42 } | 45 } |
43 | 46 |
44 private: | 47 private: |
45 void (^completion_handler_)(NSArray<RTCStatsReport *> *stats); | 48 void (^completion_handler_)(NSArray *stats); |
| 49 // void (^completion_handler_)(NSArray<RTCStatsReport *> *stats); |
46 }; | 50 }; |
47 } // namespace webrtc | 51 } // namespace webrtc |
48 | 52 |
49 @implementation RTCPeerConnection (Stats) | 53 @implementation RTCPeerConnection (Stats) |
50 | 54 |
51 - (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack | 55 - (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack |
52 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel | 56 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel |
53 completionHandler: | 57 completionHandler: |
54 (void (^)(NSArray<RTCStatsReport *> *stats))completionHandler { | 58 (void (^)(NSArray *stats))completionHandler { |
| 59 // (void (^)(NSArray<RTCStatsReport *> *stats))completionHandler { |
55 rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer( | 60 rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer( |
56 new rtc::RefCountedObject<webrtc::StatsObserverAdapter> | 61 new rtc::RefCountedObject<webrtc::StatsObserverAdapter> |
57 (completionHandler)); | 62 (completionHandler)); |
58 webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel = | 63 webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel = |
59 [[self class] nativeStatsOutputLevelForLevel:statsOutputLevel]; | 64 [[self class] nativeStatsOutputLevelForLevel:statsOutputLevel]; |
60 self.nativePeerConnection->GetStats( | 65 self.nativePeerConnection->GetStats( |
61 observer, mediaStreamTrack.nativeTrack, nativeOutputLevel); | 66 observer, mediaStreamTrack.nativeTrack, nativeOutputLevel); |
62 } | 67 } |
63 | 68 |
64 @end | 69 @end |
OLD | NEW |