Changeset 292910 in webkit

Timestamp:

Apr 15, 2022, 9:24:21 AM (4 years ago)

Author:

youenn@apple.com

Message:

Rename libwebrtc ObjC NSString utility routines
​https://bugs.webkit.org/show_bug.cgi?id=239287
<rdar://91431764>

Reviewed by Eric Carlson.

Add rtc prefix to NSString utility routines to prevent symbol collision.

• Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm:

(-[RTCRtpEncodingParameters initWithNativeParameters:]):
(-[RTCRtpEncodingParameters nativeParameters]):

• Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm:

(-[RTCVideoCodecInfo initWithNativeSdpVideoFormat:]):
(-[RTCVideoCodecInfo nativeSdpVideoFormat]):

• Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm:
• Source/webrtc/sdk/objc/helpers/NSString+StdString.h:
• Source/webrtc/sdk/objc/helpers/NSString+StdString.mm:

(-[NSString rtcStdString]):
(+[NSString rtcStdStringForString:]):
(+[NSString rtcStringForStdString:]):
(-[NSString stdString]): Deleted.
(+[NSString stdStringForString:]): Deleted.
(+[NSString stringForStdString:]): Deleted.

• Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm:
• Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm:

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm (modified) (2 diffs)
• Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm (modified) (2 diffs)
• Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm (modified) (1 diff)
• Source/webrtc/sdk/objc/helpers/NSString+StdString.h (modified) (1 diff)
• Source/webrtc/sdk/objc/helpers/NSString+StdString.mm (modified) (2 diffs)
• Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm (modified) (1 diff)
• Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm (modified) (1 diff)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2022-04-15  Youenn Fablet  <youenn@apple.com>
+
+        Rename libwebrtc ObjC NSString utility routines
+        https://bugs.webkit.org/show_bug.cgi?id=239287
+        <rdar://91431764>
+
+        Reviewed by Eric Carlson.
+
+        Add rtc prefix to NSString utility routines to prevent symbol collision.
+
+        * Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm:
+        (-[RTCRtpEncodingParameters initWithNativeParameters:]):
+        (-[RTCRtpEncodingParameters nativeParameters]):
+        * Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm:
+        (-[RTCVideoCodecInfo initWithNativeSdpVideoFormat:]):
+        (-[RTCVideoCodecInfo nativeSdpVideoFormat]):
+        * Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm:
+        * Source/webrtc/sdk/objc/helpers/NSString+StdString.h:
+        * Source/webrtc/sdk/objc/helpers/NSString+StdString.mm:
+        (-[NSString rtcStdString]):
+        (+[NSString rtcStdStringForString:]):
+        (+[NSString rtcStringForStdString:]):
+        (-[NSString stdString]): Deleted.
+        (+[NSString stdStringForString:]): Deleted.
+        (+[NSString stringForStdString:]): Deleted.
+        * Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm:
+        * Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm:
+
 2022-04-12  Elliott Williams  <emw@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm

@@ -33 +33 @@
   if (self = [self init]) {
     if (!nativeParameters.rid.empty()) {
-      _rid = [NSString stringForStdString:nativeParameters.rid];
+      _rid = [NSString rtcStringForStdString:nativeParameters.rid];
     }
     _isActive = nativeParameters.active;
@@ -66 +66 @@
   webrtc::RtpEncodingParameters parameters;
   if (_rid != nil) {
-    parameters.rid = [NSString stdStringForString:_rid];
+    parameters.rid = [NSString rtcStdStringForString:_rid];
   }
   parameters.active = _isActive;

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm

@@ -18 +18 @@
   NSMutableDictionary *params = [NSMutableDictionary dictionary];
   for (auto it = format.parameters.begin(); it != format.parameters.end(); ++it) {
-    [params setObject:[NSString stringForStdString:it->second]
-               forKey:[NSString stringForStdString:it->first]];
+    [params setObject:[NSString rtcStringForStdString:it->second]
+               forKey:[NSString rtcStringForStdString:it->first]];
   }
-  return [self initWithName:[NSString stringForStdString:format.name] parameters:params];
+  return [self initWithName:[NSString rtcStringForStdString:format.name] parameters:params];
 }
 
@@ -27 +27 @@
   std::map<std::string, std::string> parameters;
   for (NSString *paramKey in self.parameters.allKeys) {
-    std::string key = [NSString stdStringForString:paramKey];
-    std::string value = [NSString stdStringForString:self.parameters[paramKey]];
+    std::string key = [NSString rtcStdStringForString:paramKey];
+    std::string value = [NSString rtcStdStringForString:self.parameters[paramKey]];
     parameters[key] = value;
   }
 
-  return webrtc::SdpVideoFormat([NSString stdStringForString:self.name], parameters);
+  return webrtc::SdpVideoFormat([NSString rtcStdStringForString:self.name], parameters);
 }
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm

@@ -59 +59 @@
         ProfileLevelIdToString(ProfileLevelId(profile, profileLevelId->level));
     if (profileString) {
-      return [NSString stringForStdString:*profileString];
+      return [NSString rtcStringForStdString:*profileString];
     }
   }

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.h

@@ -17 +17 @@
 @interface NSString (StdString)
 
-@property(nonatomic, readonly) std::string stdString;
+@property(nonatomic, readonly) std::string rtcStdString;
 
-+ (std::string)stdStringForString:(NSString *)nsString;
-+ (NSString *)stringForStdString:(const std::string &)stdString;
++ (std::string)rtcStdStringForString:(NSString *)nsString;
++ (NSString *)rtcStringForStdString:(const std::string &)stdString;
 
 @end

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.mm

@@ -13 +13 @@
 @implementation NSString (StdString)
 
-- (std::string)stdString {
-  return [NSString stdStringForString:self];
+- (std::string)rtcStdString {
+  return [NSString rtcStdStringForString:self];
 }
 
-+ (std::string)stdStringForString:(NSString *)nsString {
++ (std::string)rtcStdStringForString:(NSString *)nsString {
   NSData *charData = [nsString dataUsingEncoding:NSUTF8StringEncoding];
   return std::string(reinterpret_cast<const char *>(charData.bytes),
@@ -23 +23 @@
 }
 
-+ (NSString *)stringForStdString:(const std::string&)stdString {
++ (NSString *)rtcStringForStdString:(const std::string&)stdString {
   // std::string may contain null termination character so we construct
   // using length.

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm

@@ -35 +35 @@
  public:
   ObjCVideoDecoder(id<RTCVideoDecoder> decoder)
-      : decoder_(decoder), implementation_name_([decoder implementationName].stdString) {}
+      : decoder_(decoder), implementation_name_([decoder implementationName].rtcStdString) {}
 
   bool Configure(const Settings& settings) override {

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm

@@ -43 +43 @@
  public:
   ObjCVideoEncoder(id<RTCVideoEncoder> encoder)
-      : encoder_(encoder), implementation_name_([encoder implementationName].stdString) {}
+      : encoder_(encoder), implementation_name_([encoder implementationName].rtcStdString) {}
 
   int32_t InitEncode(const VideoCodec *codec_settings, const Settings &encoder_settings) override {