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/sdk/objc/Framework/Classes/RTCStatsReport+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport+Private.h
similarity index 79%
rename from webrtc/sdk/objc/Framework/Classes/RTCStatsReport+Private.h
rename to webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport+Private.h
index e1af6f7..67eb318 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCStatsReport+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport+Private.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#import "WebRTC/RTCStatsReport.h"
+#import "WebRTC/RTCLegacyStatsReport.h"
#include "webrtc/api/statstypes.h"
NS_ASSUME_NONNULL_BEGIN
-@interface RTCStatsReport ()
+@interface RTCLegacyStatsReport ()
-/** Initialize an RTCStatsReport object from a native StatsReport. */
+/** Initialize an RTCLegacyStatsReport object from a native StatsReport. */
- (instancetype)initWithNativeReport:(const webrtc::StatsReport &)nativeReport;
@end
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCStatsReport.mm b/webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport.mm
similarity index 91%
rename from webrtc/sdk/objc/Framework/Classes/RTCStatsReport.mm
rename to webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport.mm
index 1bc3eb9..a55bb3e 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCStatsReport.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCLegacyStatsReport.mm
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#import "RTCStatsReport+Private.h"
+#import "RTCLegacyStatsReport+Private.h"
#import "NSString+StdString.h"
#import "WebRTC/RTCLogging.h"
#include "webrtc/base/checks.h"
-@implementation RTCStatsReport
+@implementation RTCLegacyStatsReport
@synthesize timestamp = _timestamp;
@synthesize type = _type;
@@ -23,7 +23,7 @@
@synthesize values = _values;
- (NSString *)description {
- return [NSString stringWithFormat:@"RTCStatsReport:\n%@\n%@\n%f\n%@",
+ return [NSString stringWithFormat:@"RTCLegacyStatsReport:\n%@\n%@\n%f\n%@",
_reportId,
_type,
_timestamp,
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm
index ccbd58f..2c4571e 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Stats.mm
@@ -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 @@
class StatsObserverAdapter : public StatsObserver {
public:
StatsObserverAdapter(void (^completionHandler)
- (NSArray<RTCStatsReport *> *stats)) {
+ (NSArray<RTCLegacyStatsReport *> *stats)) {
completion_handler_ = completionHandler;
}
@@ -33,8 +33,8 @@
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 @@
}
private:
- void (^completion_handler_)(NSArray<RTCStatsReport *> *stats);
+ void (^completion_handler_)(NSArray<RTCLegacyStatsReport *> *stats);
};
} // namespace webrtc
@@ -51,7 +51,7 @@
- (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));
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
index 0af400b..b4a8738 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
@@ -14,13 +14,13 @@
#import "RTCConfiguration+Private.h"
#import "RTCDataChannel+Private.h"
#import "RTCIceCandidate+Private.h"
+#import "RTCLegacyStatsReport+Private.h"
#import "RTCMediaConstraints+Private.h"
#import "RTCMediaStream+Private.h"
#import "RTCPeerConnectionFactory+Private.h"
#import "RTCRtpReceiver+Private.h"
#import "RTCRtpSender+Private.h"
#import "RTCSessionDescription+Private.h"
-#import "RTCStatsReport+Private.h"
#import "WebRTC/RTCLogging.h"
#include <memory>
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCStatsReport.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
similarity index 95%
rename from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCStatsReport.h
rename to webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
index 5a55967..14d996c 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCStatsReport.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h
@@ -16,7 +16,7 @@
/** This does not currently conform to the spec. */
RTC_EXPORT
-@interface RTCStatsReport : NSObject
+@interface RTCLegacyStatsReport : NSObject
/** Time since 1970-01-01T00:00:00Z in milliseconds. */
@property(nonatomic, readonly) CFTimeInterval timestamp;
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
index 3ea97c3..4438eb2 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
@@ -23,7 +23,7 @@
@class RTCRtpReceiver;
@class RTCRtpSender;
@class RTCSessionDescription;
-@class RTCStatsReport;
+@class RTCLegacyStatsReport;
NS_ASSUME_NONNULL_BEGIN
@@ -217,7 +217,7 @@
(nullable RTCMediaStreamTrack *)mediaStreamTrack
statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel
completionHandler:
- (nullable void (^)(NSArray<RTCStatsReport *> *stats))completionHandler;
+ (nullable void (^)(NSArray<RTCLegacyStatsReport *> *stats))completionHandler;
@end
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h
index 502d59e..8082d02 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/WebRTC.h
@@ -21,6 +21,7 @@
#import <WebRTC/RTCFileLogger.h>
#import <WebRTC/RTCIceCandidate.h>
#import <WebRTC/RTCIceServer.h>
+#import <WebRTC/RTCLegacyStatsReport.h>
#import <WebRTC/RTCLogging.h>
#import <WebRTC/RTCMacros.h>
#import <WebRTC/RTCMediaConstraints.h>
@@ -38,7 +39,6 @@
#import <WebRTC/RTCRtpSender.h>
#import <WebRTC/RTCSSLAdapter.h>
#import <WebRTC/RTCSessionDescription.h>
-#import <WebRTC/RTCStatsReport.h>
#import <WebRTC/RTCTracing.h>
#import <WebRTC/RTCVideoFrame.h>
#import <WebRTC/RTCVideoRenderer.h>