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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm

Issue 2584553002: New method StatsObserver::OnCompleteReports, passing ownership. (Closed)
Patch Set: Drop unneeded ".get()". Created 4 years 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
« no previous file with comments | « webrtc/sdk/android/src/jni/peerconnection_jni.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 11 matching lines...) Expand all
22 public: 22 public:
23 StatsObserverAdapter(void (^completionHandler) 23 StatsObserverAdapter(void (^completionHandler)
24 (NSArray<RTCLegacyStatsReport *> *stats)) { 24 (NSArray<RTCLegacyStatsReport *> *stats)) {
25 completion_handler_ = completionHandler; 25 completion_handler_ = completionHandler;
26 } 26 }
27 27
28 ~StatsObserverAdapter() { 28 ~StatsObserverAdapter() {
29 completion_handler_ = nil; 29 completion_handler_ = nil;
30 } 30 }
31 31
32 void OnComplete(const StatsReports& reports) override { 32 void OnCompleteReports(std::unique_ptr<StatsReports> reports) override {
33 RTC_DCHECK(completion_handler_); 33 RTC_DCHECK(completion_handler_);
34 NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports.size()]; 34 NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports->size()];
35 for (const auto* report : reports) { 35 for (const auto* report : *reports) {
36 RTCLegacyStatsReport *statsReport = 36 RTCLegacyStatsReport *statsReport =
37 [[RTCLegacyStatsReport alloc] initWithNativeReport:*report]; 37 [[RTCLegacyStatsReport alloc] initWithNativeReport:*report];
38 [stats addObject:statsReport]; 38 [stats addObject:statsReport];
39 } 39 }
40 completion_handler_(stats); 40 completion_handler_(stats);
41 completion_handler_ = nil; 41 completion_handler_ = nil;
42 } 42 }
43 43
44 private: 44 private:
45 void (^completion_handler_)(NSArray<RTCLegacyStatsReport *> *stats); 45 void (^completion_handler_)(NSArray<RTCLegacyStatsReport *> *stats);
46 }; 46 };
47 } // namespace webrtc 47 } // namespace webrtc
48 48
49 @implementation RTCPeerConnection (Stats) 49 @implementation RTCPeerConnection (Stats)
50 50
51 - (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack 51 - (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack
52 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel 52 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel
53 completionHandler: 53 completionHandler:
54 (void (^)(NSArray<RTCLegacyStatsReport *> *stats))completionHandler { 54 (void (^)(NSArray<RTCLegacyStatsReport *> *stats))completionHandler {
55 rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer( 55 rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer(
56 new rtc::RefCountedObject<webrtc::StatsObserverAdapter> 56 new rtc::RefCountedObject<webrtc::StatsObserverAdapter>
57 (completionHandler)); 57 (completionHandler));
58 webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel = 58 webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel =
59 [[self class] nativeStatsOutputLevelForLevel:statsOutputLevel]; 59 [[self class] nativeStatsOutputLevelForLevel:statsOutputLevel];
60 self.nativePeerConnection->GetStats( 60 self.nativePeerConnection->GetStats(
61 observer, mediaStreamTrack.nativeTrack, nativeOutputLevel); 61 observer, mediaStreamTrack.nativeTrack, nativeOutputLevel);
62 } 62 }
63 63
64 @end 64 @end
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/peerconnection_jni.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698