Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-05-07 21:58:01 UTC (rev 231459)
@@ -1,3 +1,34 @@
+2018-05-07 Youenn Fablet <[email protected]>
+
+ Activate ARC for libwebrtc Objective C files
+ https://bugs.webkit.org/show_bug.cgi?id=185324
+
+ Reviewed by David Kilzer.
+
+ Revert changes made to libwebrtc to accomodate from not using ARC.
+ Use ARC for all libwebrtc objective C files.
+
+ Remove no longer needed export symbols and stop compiling the related files.
+
+ * Configurations/libwebrtc.iOS.exp:
+ * Configurations/libwebrtc.iOSsim.exp:
+ * Configurations/libwebrtc.mac.exp:
+ * Configurations/libwebrtc.xcconfig:
+ * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
+ * Source/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm:
+ (-[RTCCVPixelBuffer dealloc]):
+ * Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm:
+ (webrtc::ObjCFrameBuffer::~ObjCFrameBuffer):
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm:
+ (-[RTCVideoDecoderH264 dealloc]):
+ (-[RTCVideoDecoderH264 setCallback:]):
+ (-[RTCVideoDecoderH264 releaseDecoder]):
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:
+ (-[RTCVideoEncoderH264 dealloc]):
+ (-[RTCVideoEncoderH264 setCallback:]):
+ (-[RTCVideoEncoderH264 releaseEncoder]):
+ * libwebrtc.xcodeproj/project.pbxproj:
+
2018-05-02 Youenn Fablet <[email protected]>
Disable VCP for iOS until it is fully working
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2018-05-07 21:58:01 UTC (rev 231459)
@@ -116,10 +116,6 @@
__ZNK3rtc13SocketAddress15HostAsURIStringEv
__ZN6webrtc32CreateBuiltinAudioDecoderFactoryEv
__ZN6webrtc32CreateBuiltinAudioEncoderFactoryEv
-__ZN6webrtc31VideoToolboxVideoDecoderFactory9SetActiveEb
-__ZN6webrtc31VideoToolboxVideoEncoderFactory9SetActiveEb
-__ZTVN6webrtc31VideoToolboxVideoDecoderFactoryE
-__ZTVN6webrtc31VideoToolboxVideoEncoderFactoryE
__ZN6webrtc27SessionDescriptionInterface16RemoveCandidatesERKNSt3__16vectorIN7cricket9CandidateENS1_9allocatorIS4_EEEE
__ZNK6webrtc21IceCandidateInterface10server_urlEv
__ZNK6webrtc27SessionDescriptionInterface7GetTypeEv
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2018-05-07 21:58:01 UTC (rev 231459)
@@ -116,10 +116,6 @@
__ZNK3rtc13SocketAddress15HostAsURIStringEv
__ZN6webrtc32CreateBuiltinAudioDecoderFactoryEv
__ZN6webrtc32CreateBuiltinAudioEncoderFactoryEv
-__ZN6webrtc31VideoToolboxVideoDecoderFactory9SetActiveEb
-__ZN6webrtc31VideoToolboxVideoEncoderFactory9SetActiveEb
-__ZTVN6webrtc31VideoToolboxVideoDecoderFactoryE
-__ZTVN6webrtc31VideoToolboxVideoEncoderFactoryE
__ZN6webrtc27SessionDescriptionInterface16RemoveCandidatesERKNSt3__16vectorIN7cricket9CandidateENS1_9allocatorIS4_EEEE
__ZNK6webrtc21IceCandidateInterface10server_urlEv
__ZNK6webrtc27SessionDescriptionInterface7GetTypeEv
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2018-05-07 21:58:01 UTC (rev 231459)
@@ -116,11 +116,6 @@
__ZNK3rtc13SocketAddress15HostAsURIStringEv
__ZN6webrtc32CreateBuiltinAudioDecoderFactoryEv
__ZN6webrtc32CreateBuiltinAudioEncoderFactoryEv
-__ZN6webrtc31VideoToolboxVideoDecoderFactory9SetActiveEb
-__ZN6webrtc31VideoToolboxVideoEncoderFactory9SetActiveEb
-__ZN6webrtc31VideoToolboxVideoEncoderFactory29setH264HardwareEncoderAllowedEb
-__ZTVN6webrtc31VideoToolboxVideoDecoderFactoryE
-__ZTVN6webrtc31VideoToolboxVideoEncoderFactoryE
__ZN6webrtc27SessionDescriptionInterface16RemoveCandidatesERKNSt3__16vectorIN7cricket9CandidateENS1_9allocatorIS4_EEEE
__ZNK6webrtc21IceCandidateInterface10server_urlEv
__ZNK6webrtc27SessionDescriptionInterface7GetTypeEv
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2018-05-07 21:58:01 UTC (rev 231459)
@@ -17,6 +17,8 @@
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
+CLANG_ENABLE_OBJC_ARC = YES;
+
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h 2018-05-07 21:58:01 UTC (rev 231459)
@@ -100,7 +100,7 @@
{ \
void** pointer = static_cast<void**>(dlsym(framework##Library(), #name)); \
if (pointer) \
- pointer##name = static_cast<type>(*pointer); \
+ pointer##name = (__bridge type)(*pointer); \
get##name = name##Function; \
return pointer##name; \
}
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm 2018-05-07 21:58:01 UTC (rev 231459)
@@ -73,7 +73,6 @@
- (void)dealloc {
CVBufferRelease(_pixelBuffer);
- [super dealloc];
}
- (int)width {
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm 2018-05-07 21:58:01 UTC (rev 231459)
@@ -50,10 +50,7 @@
ObjCFrameBuffer::ObjCFrameBuffer(id<RTCVideoFrameBuffer> frame_buffer)
: frame_buffer_(frame_buffer), width_(frame_buffer.width), height_(frame_buffer.height) {}
-ObjCFrameBuffer::~ObjCFrameBuffer() {
- // FIXME: Activate ARC.
- [frame_buffer_ release];
-}
+ObjCFrameBuffer::~ObjCFrameBuffer() {}
VideoFrameBuffer::Type ObjCFrameBuffer::type() const {
return Type::kNative;
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm 2018-05-07 21:58:01 UTC (rev 231459)
@@ -90,10 +90,6 @@
- (void)dealloc {
[self destroyDecompressionSession];
[self setVideoFormat:nullptr];
- if (_callback) {
- Block_release(_callback);
- }
- [super dealloc];
}
- (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings
@@ -182,7 +178,7 @@
}
- (void)setCallback:(RTCVideoDecoderCallback)callback {
- _callback = Block_copy(callback);
+ _callback = callback;
}
- (void)setError:(OSStatus)error {
@@ -194,7 +190,6 @@
// is safe to null out the callback.
[self destroyDecompressionSession];
[self setVideoFormat:nullptr];
- Block_release(_callback);
_callback = nullptr;
return WEBRTC_VIDEO_CODEC_OK;
}
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm 2018-05-07 21:58:01 UTC (rev 231459)
@@ -355,10 +355,6 @@
- (void)dealloc {
[self destroyCompressionSession];
- if (_callback) {
- Block_release(_callback);
- }
- [super dealloc];
}
- (NSInteger)startEncodeWithSettings:(RTCVideoEncoderSettings *)settings
@@ -504,7 +500,7 @@
}
- (void)setCallback:(RTCVideoEncoderCallback)callback {
- _callback = Block_copy(callback);
+ _callback = callback;
}
- (int)setBitrate:(uint32_t)bitrateKbit framerate:(uint32_t)framerate {
@@ -521,7 +517,6 @@
// callback anymore. Do not remove callback until the session is invalidated
// since async encoder callbacks can occur until invalidation.
[self destroyCompressionSession];
- Block_release(_callback);
_callback = nullptr;
return WEBRTC_VIDEO_CODEC_OK;
}
@@ -695,7 +690,8 @@
CFDictionarySetValue(encoderSpecs, kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder, kCFBooleanFalse);
int usageValue = 1;
CFNumberRef usage = CFNumberCreate(nullptr, kCFNumberIntType, &usageValue);
- CFDictionarySetValue(encoderSpecs, getkVTVideoEncoderSpecification_Usage(), usage);
+ CFDictionarySetValue(encoderSpecs, (__bridge CFStringRef)getkVTVideoEncoderSpecification_Usage(), usage);
+
if (usage) {
CFRelease(usage);
usage = nullptr;
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (231458 => 231459)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2018-05-07 21:57:25 UTC (rev 231458)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2018-05-07 21:58:01 UTC (rev 231459)
@@ -691,14 +691,10 @@
419C848F1FE2574D0040C30F /* d1_pkt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 419C84861FE2574C0040C30F /* d1_pkt.cc */; };
419C84921FE2591F0040C30F /* err_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 419C84911FE2591E0040C30F /* err_data.c */; };
419C849D1FE2FEC00040C30F /* decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84971FE2FEBF0040C30F /* decoder.h */; };
- 419C849E1FE2FEC00040C30F /* decoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 419C84981FE2FEBF0040C30F /* decoder.mm */; };
- 419C84A31FE2FFDB0040C30F /* encoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 419C849A1FE2FEC00040C30F /* encoder.mm */; };
419C84A41FE300810040C30F /* encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C849B1FE2FEC00040C30F /* encoder.h */; };
419C84AA1FE303DE0040C30F /* h264.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84A81FE303DD0040C30F /* h264.h */; };
419C84AB1FE303DE0040C30F /* h264_globals.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84A91FE303DE0040C30F /* h264_globals.h */; };
419C84B11FE304C70040C30F /* VideoToolBoxDecoderFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84AD1FE304C60040C30F /* VideoToolBoxDecoderFactory.h */; };
- 419C84B31FE304C70040C30F /* VideoToolBoxDecoderFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419C84AF1FE304C70040C30F /* VideoToolBoxDecoderFactory.cpp */; };
- 419C84B41FE309050040C30F /* VideoToolBoxEncoderFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419C84AE1FE304C60040C30F /* VideoToolBoxEncoderFactory.cpp */; };
419C84B51FE309050040C30F /* VideoToolBoxEncoderFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84AC1FE304C60040C30F /* VideoToolBoxEncoderFactory.h */; };
419C84BC1FE319440040C30F /* audio_encoder_ilbc_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 419C84B71FE319430040C30F /* audio_encoder_ilbc_config.h */; };
419C84BD1FE319440040C30F /* audio_encoder_ilbc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 419C84B81FE319430040C30F /* audio_encoder_ilbc.cc */; };
@@ -13022,7 +13018,6 @@
5CDD87B31E43BC0500621E92 /* decode_bwe.c in Sources */,
41433D0E1F79B33400387B4D /* decode_plc.c in Sources */,
5CDD8B8D1E43C2B500621E92 /* decode_residual.c in Sources */,
- 419C849E1FE2FEC00040C30F /* decoder.mm in Sources */,
5CDD8A191E43BFB300621E92 /* decoder_database.cc in Sources */,
5CDD8B911E43C2B500621E92 /* decoder_interpolate_lsf.c in Sources */,
5CDD83CA1E439A6F00621E92 /* decoding_state.cc in Sources */,
@@ -13067,7 +13062,6 @@
5CDD87B51E43BC0500621E92 /* encode_lpc_swb.c in Sources */,
5CDD8A951E43C00F00621E92 /* encode_neteq_input.cc in Sources */,
5CDD83CC1E439A6F00621E92 /* encoded_frame.cc in Sources */,
- 419C84A31FE2FFDB0040C30F /* encoder.mm in Sources */,
5CDD859F1E43B5C000621E92 /* encoder_rtcp_feedback.cc in Sources */,
5CDD86511E43B8B500621E92 /* energy.c in Sources */,
5CDD8B981E43C2B500621E92 /* energy_inverse.c in Sources */,
@@ -13734,8 +13728,6 @@
41ECEAFD20646664009D5141 /* VideoProcessingSoftLink.cpp in Sources */,
5C4B490B1E42C1E3002651C8 /* videosourcebase.cc in Sources */,
41F9BF8F2051C80100ABF0B9 /* videosourceinterface.cc in Sources */,
- 419C84B31FE304C70040C30F /* VideoToolBoxDecoderFactory.cpp in Sources */,
- 419C84B41FE309050040C30F /* VideoToolBoxEncoderFactory.cpp in Sources */,
5CD285161E6A60570094FDC8 /* videotrack.cc in Sources */,
5CD285181E6A60570094FDC8 /* videotracksource.cc in Sources */,
413A23121FE18E0700373E99 /* virtualsocketserver.cc in Sources */,
