Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-15 16:24:21 UTC (rev 292910)
@@ -1,3 +1,31 @@
+2022-04-15 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
[Xcode] In open-source builds, disable bitcode in xcconfigs instead of build-webkit
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCRtpEncodingParameters.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -32,7 +32,7 @@
(const webrtc::RtpEncodingParameters &)nativeParameters {
if (self = [self init]) {
if (!nativeParameters.rid.empty()) {
- _rid = [NSString stringForStdString:nativeParameters.rid];
+ _rid = [NSString rtcStringForStdString:nativeParameters.rid];
}
_isActive = nativeParameters.active;
if (nativeParameters.max_bitrate_bps) {
@@ -65,7 +65,7 @@
- (webrtc::RtpEncodingParameters)nativeParameters {
webrtc::RtpEncodingParameters parameters;
if (_rid != nil) {
- parameters.rid = [NSString stdStringForString:_rid];
+ parameters.rid = [NSString rtcStdStringForString:_rid];
}
parameters.active = _isActive;
if (_maxBitrateBps != nil) {
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -17,21 +17,21 @@
- (instancetype)initWithNativeSdpVideoFormat:(webrtc::SdpVideoFormat)format {
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];
}
- (webrtc::SdpVideoFormat)nativeSdpVideoFormat {
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);
}
@end
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -58,7 +58,7 @@
const absl::optional<std::string> profileString =
ProfileLevelIdToString(ProfileLevelId(profile, profileLevelId->level));
if (profileString) {
- return [NSString stringForStdString:*profileString];
+ return [NSString rtcStringForStdString:*profileString];
}
}
return nil;
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.h (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.h 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.h 2022-04-15 16:24:21 UTC (rev 292910)
@@ -16,10 +16,10 @@
@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
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/helpers/NSString+StdString.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -12,17 +12,17 @@
@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),
charData.length);
}
-+ (NSString *)stringForStdString:(const std::string&)stdString {
++ (NSString *)rtcStringForStdString:(const std::string&)stdString {
// std::string may contain null termination character so we construct
// using length.
return [[NSString alloc] initWithBytes:stdString.data()
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_decoder_factory.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -34,7 +34,7 @@
class ObjCVideoDecoder : public VideoDecoder {
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 {
return [decoder_ startDecodeWithNumberOfCores:settings.number_of_cores()] == WEBRTC_VIDEO_CODEC_OK;
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm (292909 => 292910)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm 2022-04-15 16:04:20 UTC (rev 292909)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/native/src/objc_video_encoder_factory.mm 2022-04-15 16:24:21 UTC (rev 292910)
@@ -42,7 +42,7 @@
class ObjCVideoEncoder : public VideoEncoder {
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 {
#if defined(WEBRTC_WEBKIT_BUILD)
