webrtc_m130/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

65 lines
2.1 KiB
Plaintext
Raw Normal View History

/*
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#import "RTCPeerConnection+Private.h"
#import "NSString+StdString.h"
#import "RTCMediaStreamTrack+Private.h"
#import "RTCLegacyStatsReport+Private.h"
#include "webrtc/base/checks.h"
namespace webrtc {
class StatsObserverAdapter : public StatsObserver {
public:
StatsObserverAdapter(void (^completionHandler)
(NSArray<RTCLegacyStatsReport *> *stats)) {
completion_handler_ = completionHandler;
}
~StatsObserverAdapter() {
completion_handler_ = nil;
}
Revert of New method StatsObserver::OnCompleteReports, passing ownership. (patchset #2 id:20001 of https://codereview.webrtc.org/2584553002/ ) Reason for revert: The new method doesn't work as intended. It can't pass ownership, because the StatsReports is a vector of raw pointers to StatReport objects owned by the StatsCollector. Original issue's description: > New method StatsObserver::OnCompleteReports, passing ownership. > > The new name, OnCompleteReports rather than OnComplete, is needed > because in C++ method lookup, overriding a method hides all otherwise > inherited methods with the same name, even if they have a different > signature. And here, the intention is that each subclass should > override one or the other of the two methods, and inherit the method it > doesn't override. > > This cl is a prerequisite for > https://codereview.webrtc.org/2567143003/, because the Chrome glue > code needs to retain the stats report after the OnComplete method has > returned. > > Currently, Chrome makes a copy of the stats mapping (which breaks when > changing ValuePtr from an rtc::linked_ptr to an std::unique_ptr). After > this cl, Chrome can be fixed to take ownership and no longer needs to > copy anything, unblocking cl 2567143003. > > BUG=webrtc:6424 > > Review-Url: https://codereview.webrtc.org/2584553002 > Cr-Commit-Position: refs/heads/master@{#15708} > Committed: https://chromium.googlesource.com/external/webrtc/+/b36ee8d498be2fa58fde3f3f3d69a74e4d3b817d TBR=solenberg@webrtc.org,magjed@webrtc.org,tkchin@webrtc.org,hbos@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6424 Review-Url: https://codereview.webrtc.org/2641783002 Cr-Commit-Position: refs/heads/master@{#16144}
2017-01-18 05:00:34 -08:00
void OnComplete(const StatsReports& reports) override {
RTC_DCHECK(completion_handler_);
Revert of New method StatsObserver::OnCompleteReports, passing ownership. (patchset #2 id:20001 of https://codereview.webrtc.org/2584553002/ ) Reason for revert: The new method doesn't work as intended. It can't pass ownership, because the StatsReports is a vector of raw pointers to StatReport objects owned by the StatsCollector. Original issue's description: > New method StatsObserver::OnCompleteReports, passing ownership. > > The new name, OnCompleteReports rather than OnComplete, is needed > because in C++ method lookup, overriding a method hides all otherwise > inherited methods with the same name, even if they have a different > signature. And here, the intention is that each subclass should > override one or the other of the two methods, and inherit the method it > doesn't override. > > This cl is a prerequisite for > https://codereview.webrtc.org/2567143003/, because the Chrome glue > code needs to retain the stats report after the OnComplete method has > returned. > > Currently, Chrome makes a copy of the stats mapping (which breaks when > changing ValuePtr from an rtc::linked_ptr to an std::unique_ptr). After > this cl, Chrome can be fixed to take ownership and no longer needs to > copy anything, unblocking cl 2567143003. > > BUG=webrtc:6424 > > Review-Url: https://codereview.webrtc.org/2584553002 > Cr-Commit-Position: refs/heads/master@{#15708} > Committed: https://chromium.googlesource.com/external/webrtc/+/b36ee8d498be2fa58fde3f3f3d69a74e4d3b817d TBR=solenberg@webrtc.org,magjed@webrtc.org,tkchin@webrtc.org,hbos@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6424 Review-Url: https://codereview.webrtc.org/2641783002 Cr-Commit-Position: refs/heads/master@{#16144}
2017-01-18 05:00:34 -08:00
NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports.size()];
for (const auto* report : reports) {
RTCLegacyStatsReport *statsReport =
[[RTCLegacyStatsReport alloc] initWithNativeReport:*report];
[stats addObject:statsReport];
}
completion_handler_(stats);
completion_handler_ = nil;
}
private:
void (^completion_handler_)(NSArray<RTCLegacyStatsReport *> *stats);
};
} // namespace webrtc
@implementation RTCPeerConnection (Stats)
- (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack
statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel
completionHandler:
(void (^)(NSArray<RTCLegacyStatsReport *> *stats))completionHandler {
rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer(
new rtc::RefCountedObject<webrtc::StatsObserverAdapter>
(completionHandler));
webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel =
[[self class] nativeStatsOutputLevelForLevel:statsOutputLevel];
self.nativePeerConnection->GetStats(
observer, mediaStreamTrack.nativeTrack, nativeOutputLevel);
}
@end