zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed RTCStatsReport to RTCLegacyStatsReport in objc files.

Browse Source 
This is to avoid a naming conflict with webrtc::RTCStatsReport that is
surfaced if you try to include it in peerconnectioninterface.h.

Background: The current stats is very much non-spec-compliant. A new
stats collection API is underway that is meant to be spec-compliant.
Some classes in Chromium and webrtc/sdk/objc have spec-compliant names
but non-spec-compliant behavior. These are being renamed to "Legacy" so
that new spec-compliant classes can be added with the correct names.

BUG=chromium:627816
TBR=tkchin@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2313943002
Cr-Commit-Position: refs/heads/master@{#14150}
This commit is contained in:
hbos
2016-09-09 01:36:28 -07:00
committed by Commit bot
parent b0afd97d6e
commit bd3dda6c86
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm
View File

@ -12,7 +12,7 @@
#import "NSString+StdString.h"
#import "RTCMediaStreamTrack+Private.h"
#import "RTCStatsReport+Private.h"
#import "RTCLegacyStatsReport+Private.h"
#include "webrtc/base/checks.h"
@ -21,7 +21,7 @@ namespace webrtc {
class StatsObserverAdapter : public StatsObserver {
public:
StatsObserverAdapter(void (^completionHandler)
(NSArray<RTCStatsReport *> *stats)) {
(NSArray<RTCLegacyStatsReport *> *stats)) {
completion_handler_ = completionHandler;
}
@ -33,8 +33,8 @@ class StatsObserverAdapter : public StatsObserver {
RTC_DCHECK(completion_handler_);
NSMutableArray *stats = [NSMutableArray arrayWithCapacity:reports.size()];
for (const auto* report : reports) {
RTCStatsReport *statsReport =
[[RTCStatsReport alloc] initWithNativeReport:*report];
RTCLegacyStatsReport *statsReport =
[[RTCLegacyStatsReport alloc] initWithNativeReport:*report];
[stats addObject:statsReport];
}
completion_handler_(stats);
@ -42,7 +42,7 @@ class StatsObserverAdapter : public StatsObserver {
}
private:
void (^completion_handler_)(NSArray<RTCStatsReport *> *stats);
void (^completion_handler_)(NSArray<RTCLegacyStatsReport *> *stats);
};
} // namespace webrtc
@ -51,7 +51,7 @@ class StatsObserverAdapter : public StatsObserver {
- (void)statsForTrack:(RTCMediaStreamTrack *)mediaStreamTrack
statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel
completionHandler:
(void (^)(NSArray<RTCStatsReport *> *stats))completionHandler {
(void (^)(NSArray<RTCLegacyStatsReport *> *stats))completionHandler {
rtc::scoped_refptr<webrtc::StatsObserverAdapter> observer(
new rtc::RefCountedObject<webrtc::StatsObserverAdapter>
(completionHandler));