Renamed RTCStatsReport to RTCLegacyStatsReport in objc files.
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}
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h b/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h
index 29bd7fc..a876b96 100644
--- a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h
+++ b/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-@class RTCStatsReport;
+@class RTCLegacyStatsReport;
/** Class used to accumulate stats information into a single displayable string.
*/
@@ -24,6 +24,6 @@
/** Parses the information in the stats report into an appropriate internal
* format used to generate the stats string.
*/
-- (void)parseStatsReport:(RTCStatsReport *)statsReport;
+- (void)parseStatsReport:(RTCLegacyStatsReport *)statsReport;
@end
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m b/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m
index d53165b..0643b42 100644
--- a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m
+++ b/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m
@@ -10,7 +10,7 @@
#import "ARDStatsBuilder.h"
-#import "WebRTC/RTCStatsReport.h"
+#import "WebRTC/RTCLegacyStatsReport.h"
#import "ARDBitrateTracker.h"
#import "ARDUtilities.h"
@@ -129,7 +129,7 @@
return result;
}
-- (void)parseStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseStatsReport:(RTCLegacyStatsReport *)statsReport {
NSString *reportType = statsReport.type;
if ([reportType isEqualToString:@"ssrc"] &&
[statsReport.reportId rangeOfString:@"ssrc"].location != NSNotFound) {
@@ -148,7 +148,7 @@
#pragma mark - Private
-- (void)parseBweStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseBweStatsReport:(RTCLegacyStatsReport *)statsReport {
[statsReport.values enumerateKeysAndObjectsUsingBlock:^(
NSString *key, NSString *value, BOOL *stop) {
if ([key isEqualToString:@"googAvailableSendBandwidth"]) {
@@ -167,7 +167,7 @@
}];
}
-- (void)parseConnectionStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseConnectionStatsReport:(RTCLegacyStatsReport *)statsReport {
NSString *activeConnection = statsReport.values[@"googActiveConnection"];
if (![activeConnection isEqualToString:@"true"]) {
return;
@@ -194,7 +194,7 @@
}];
}
-- (void)parseSendSsrcStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseSendSsrcStatsReport:(RTCLegacyStatsReport *)statsReport {
NSDictionary *values = statsReport.values;
if ([values objectForKey:@"googFrameRateSent"]) {
// Video track.
@@ -205,7 +205,7 @@
}
}
-- (void)parseAudioSendStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseAudioSendStatsReport:(RTCLegacyStatsReport *)statsReport {
[statsReport.values enumerateKeysAndObjectsUsingBlock:^(
NSString *key, NSString *value, BOOL *stop) {
if ([key isEqualToString:@"googCodecName"]) {
@@ -218,7 +218,7 @@
}];
}
-- (void)parseVideoSendStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseVideoSendStatsReport:(RTCLegacyStatsReport *)statsReport {
[statsReport.values enumerateKeysAndObjectsUsingBlock:^(
NSString *key, NSString *value, BOOL *stop) {
if ([key isEqualToString:@"googCodecName"]) {
@@ -245,7 +245,7 @@
}];
}
-- (void)parseRecvSsrcStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseRecvSsrcStatsReport:(RTCLegacyStatsReport *)statsReport {
NSDictionary *values = statsReport.values;
if ([values objectForKey:@"googFrameWidthReceived"]) {
// Video track.
@@ -256,7 +256,7 @@
}
}
-- (void)parseAudioRecvStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseAudioRecvStatsReport:(RTCLegacyStatsReport *)statsReport {
[statsReport.values enumerateKeysAndObjectsUsingBlock:^(
NSString *key, NSString *value, BOOL *stop) {
if ([key isEqualToString:@"googCodecName"]) {
@@ -273,7 +273,7 @@
}];
}
-- (void)parseVideoRecvStatsReport:(RTCStatsReport *)statsReport {
+- (void)parseVideoRecvStatsReport:(RTCLegacyStatsReport *)statsReport {
[statsReport.values enumerateKeysAndObjectsUsingBlock:^(
NSString *key, NSString *value, BOOL *stop) {
if ([key isEqualToString:@"googFrameHeightReceived"]) {
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m b/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m
index f452242..39067e0 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m
+++ b/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m
@@ -10,7 +10,7 @@
#import "ARDStatsView.h"
-#import "WebRTC/RTCStatsReport.h"
+#import "WebRTC/RTCLegacyStatsReport.h"
#import "ARDStatsBuilder.h"
@@ -35,7 +35,7 @@
}
- (void)setStats:(NSArray *)stats {
- for (RTCStatsReport *report in stats) {
+ for (RTCLegacyStatsReport *report in stats) {
[_statsBuilder parseStatsReport:report];
}
_statsLabel.text = _statsBuilder.statsString;