Diff
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-22 17:57:37 UTC (rev 227313)
@@ -1,3 +1,26 @@
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r227206. rdar://problem/36722612
+
+ 2018-01-19 Youenn Fablet <you...@apple.com>
+
+ Softlink VideoProcessing in WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=181853
+ <rdar://problem/36590005>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/libwebrtc.xcconfig:
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.cpp: Added.
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h: Added.
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h:
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.mm:
+ (internal::SetVTSessionProperty):
+ (webrtc::H264VideoToolboxEncoderVCP::Encode):
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm:
+ (webrtc::VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory):
+ * libwebrtc.xcodeproj/project.pbxproj:
+
2018-01-08 David Kilzer <ddkil...@apple.com>
libwebrtc: Fix 'ld: warning: cannot export hidden symbol' messages
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2018-01-22 17:57:37 UTC (rev 227313)
@@ -40,5 +40,5 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc;
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = voice_processing_audio_unit.mm;
-OTHER_LDFLAGS[sdk=macosx10.13*] = $(inherited) -framework VideoProcessing;
-OTHER_LDFLAGS[sdk=macosx10.14*] = $(inherited) -framework VideoProcessing;
+OTHER_LDFLAGS[sdk=macosx10.13*] = $(inherited);
+OTHER_LDFLAGS[sdk=macosx10.14*] = $(inherited);
Added: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.cpp (0 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.cpp (rev 0)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.cpp 2018-01-22 17:57:37 UTC (rev 227313)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "VideoProcessingSoftLink.h"
+
+#if ENABLE_VCP_ENCODER
+
+#include "webrtc/base/logging.h"
+#import <dlfcn.h>
+#import <objc/runtime.h>
+
+// Macros copied from <wtf/cocoa/SoftLinking.h>
+#define SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) \
+ namespace functionNamespace { \
+ void* framework##Library(bool isOptional) \
+ { \
+ static void* frameworkLibrary; \
+ static dispatch_once_t once; \
+ dispatch_once(&once, ^{ \
+ frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+ if (!isOptional && !frameworkLibrary) \
+ LOG(LS_ERROR) << "Cannot open framework: " << dlerror(); \
+ }); \
+ return frameworkLibrary; \
+ } \
+ }
+
+#define SOFT_LINK_FUNCTION_FOR_SOURCE(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
+ extern "C" { \
+ resultType functionName parameterDeclarations; \
+ } \
+ namespace functionNamespace { \
+ static resultType init##framework##functionName parameterDeclarations; \
+ resultType (*softLink##framework##functionName) parameterDeclarations = init##framework##functionName; \
+ static resultType init##framework##functionName parameterDeclarations \
+ { \
+ static dispatch_once_t once; \
+ dispatch_once(&once, ^{ \
+ softLink##framework##functionName = (resultType (*) parameterDeclarations) dlsym(framework##Library(), #functionName); \
+ if (!softLink##framework##functionName) \
+ LOG(LS_ERROR) << "Cannot find function ##functionName: " << dlerror(); \
+ }); \
+ return softLink##framework##functionName parameterNames; \
+ } \
+}
+
+SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(webrtc, VideoProcessing)
+
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VCPCompressionSessionSetProperty, OSStatus, (VCPCompressionSessionRef session, CFStringRef key, CFTypeRef value), (session, key, value))
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VCPCompressionSessionGetPixelBufferPool, CVPixelBufferPoolRef, (VCPCompressionSessionRef session), (session))
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VCPCompressionSessionEncodeFrame, OSStatus, (VCPCompressionSessionRef session, CVImageBufferRef buffer, CMTime timestamp, CMTime time, CFDictionaryRef dictionary, void * data, VTEncodeInfoFlags * flags), (session, buffer, timestamp, time, dictionary, data, flags))
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VCPCompressionSessionCreate, OSStatus, (CFAllocatorRef allocator1, int32_t value1 , int32_t value2, CMVideoCodecType type, CFDictionaryRef dictionary1, CFDictionaryRef dictionary2, CFAllocatorRef allocator3, VTCompressionOutputCallback callback, void * data, VCPCompressionSessionRef *session), (allocator1, value1, value2, type, dictionary1, dictionary2, allocator3, callback, data, session))
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VCPCompressionSessionInvalidate, void, (VCPCompressionSessionRef session), (session))
+SOFT_LINK_FUNCTION_FOR_SOURCE(webrtc, VideoProcessing, VPModuleInitialize, void, (), ())
+
+#endif // ENABLE_VCP_ENCODER
Added: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h (0 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h (rev 0)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h 2018-01-22 17:57:37 UTC (rev 227313)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#ifdef __APPLE__
+#include <Availability.h>
+#include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
+
+#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
+// FIXME: Activate VCP for iOS/iOS simulator
+#define ENABLE_VCP_ENCODER 0
+#elif (defined(TARGET_OS_MAC) && TARGET_OS_MAC)
+#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
+#endif
+
+#if ENABLE_VCP_ENCODER
+
+#include <VideoProcessing/VideoProcessing.h>
+
+#define ALWAYS_INLINE inline
+
+#ifdef __cplusplus
+#define WTF_EXTERN_C_BEGIN extern "C" {
+#define WTF_EXTERN_C_END }
+#else
+#define WTF_EXTERN_C_BEGIN
+#define WTF_EXTERN_C_END
+#endif
+
+// Macros copied from <wtf/cocoa/SoftLinking.h>
+#define SOFT_LINK_FRAMEWORK_FOR_HEADER(functionNamespace, framework) \
+ namespace functionNamespace { \
+ extern void* framework##Library(bool isOptional = false); \
+ bool is##framework##FrameworkAvailable(); \
+ inline bool is##framework##FrameworkAvailable() { \
+ return framework##Library(true) != nullptr; \
+ } \
+ }
+
+#define SOFT_LINK_FUNCTION_FOR_HEADER(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
+ WTF_EXTERN_C_BEGIN \
+ resultType functionName parameterDeclarations; \
+ WTF_EXTERN_C_END \
+ namespace functionNamespace { \
+ extern resultType (*softLink##framework##functionName) parameterDeclarations; \
+ inline resultType softLink_##framework##_##functionName parameterDeclarations \
+ { \
+ return softLink##framework##functionName parameterNames; \
+ } \
+ } \
+ ALWAYS_INLINE resultType functionName parameterDeclarations \
+ {\
+ return functionNamespace::softLink##framework##functionName parameterNames; \
+ }
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(webrtc, VideoProcessing)
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VCPCompressionSessionSetProperty, OSStatus, (VCPCompressionSessionRef session, CFStringRef key, CFTypeRef value), (session, key, value))
+#define VCPCompressionSessionSetProperty softLink_VideoProcessing_VCPCompressionSessionSetProperty
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VCPCompressionSessionGetPixelBufferPool, CVPixelBufferPoolRef, (VCPCompressionSessionRef session), (session))
+#define VCPCompressionSessionGetPixelBufferPool softLink_VideoProcessing_VCPCompressionSessionGetPixelBufferPool
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VCPCompressionSessionEncodeFrame, OSStatus, (VCPCompressionSessionRef session, CVImageBufferRef buffer, CMTime timestamp, CMTime time, CFDictionaryRef dictionary, void * data, VTEncodeInfoFlags * flags), (session, buffer, timestamp, time, dictionary, data, flags))
+#define VCPCompressionSessionEncodeFrame softLink_VideoProcessing_VCPCompressionSessionEncodeFrame
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VCPCompressionSessionCreate, OSStatus, (CFAllocatorRef allocator1, int32_t value1 , int32_t value2, CMVideoCodecType type, CFDictionaryRef dictionary1, CFDictionaryRef dictionary2, CFAllocatorRef allocator3, VTCompressionOutputCallback callback, void * data, VCPCompressionSessionRef *session), (allocator1, value1, value2, type, dictionary1, dictionary2, allocator3, callback, data, session))
+#define VCPCompressionSessionCreate softLink_VideoProcessing_VCPCompressionSessionCreate
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VCPCompressionSessionInvalidate, void, (VCPCompressionSessionRef session), (session))
+#define VCPCompressionSessionInvalidate softLink_VideoProcessing_VCPCompressionSessionInvalidate
+
+SOFT_LINK_FUNCTION_FOR_HEADER(webrtc, VideoProcessing, VPModuleInitialize, void, (), ())
+#define VPModuleInitialize softLink_VideoProcessing_VPModuleInitialize
+
+#endif // ENABLE_VCP_ENCODER
+
+#endif // __APPLE__
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h 2018-01-22 17:57:37 UTC (rev 227313)
@@ -12,18 +12,8 @@
#pragma once
-#ifdef __APPLE__
-#include <Availability.h>
-#include <AvailabilityMacros.h>
-#include <TargetConditionals.h>
+#include "VideoProcessingSoftLink.h"
-#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
-// FIXME: Activate VCP for iOS/iOS simulator
-#define ENABLE_VCP_ENCODER 0
-#elif (defined(TARGET_OS_MAC) && TARGET_OS_MAC)
-#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
-#endif
-
#if ENABLE_VCP_ENCODER
#include "webrtc/api/video/video_rotation.h"
@@ -34,7 +24,6 @@
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include <VideoProcessing/VideoProcessing.h>
#include <vector>
// This file provides a H264 encoder implementation using the VideoProcessing APIs.
@@ -127,4 +116,3 @@
#endif // ENABLE_VCP_ENCODER
-#endif // __APPLE__
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.mm (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.mm 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.mm 2018-01-22 17:57:37 UTC (rev 227313)
@@ -74,7 +74,7 @@
int32_t value) {
CFNumberRef cfNum =
CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &value);
- OSStatus status = VCPCompressionSessionSetProperty(session, key, cfNum);
+ OSStatus status = webrtc::VCPCompressionSessionSetProperty(session, key, cfNum);
CFRelease(cfNum);
if (status != noErr) {
std::string key_string = CFStringToString(key);
@@ -90,7 +90,7 @@
int64_t value_64 = value;
CFNumberRef cfNum =
CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &value_64);
- OSStatus status = VCPCompressionSessionSetProperty(session, key, cfNum);
+ OSStatus status = webrtc::VCPCompressionSessionSetProperty(session, key, cfNum);
CFRelease(cfNum);
if (status != noErr) {
std::string key_string = CFStringToString(key);
@@ -102,7 +102,7 @@
// Convenience function for setting a VT property.
void SetVTSessionProperty(VCPCompressionSessionRef session, CFStringRef key, bool value) {
CFBooleanRef cf_bool = (value) ? kCFBooleanTrue : kCFBooleanFalse;
- OSStatus status = VCPCompressionSessionSetProperty(session, key, cf_bool);
+ OSStatus status = webrtc::VCPCompressionSessionSetProperty(session, key, cf_bool);
if (status != noErr) {
std::string key_string = CFStringToString(key);
LOG(LS_ERROR) << "VTSessionSetProperty failed to set: " << key_string
@@ -114,7 +114,7 @@
void SetVTSessionProperty(VCPCompressionSessionRef session,
CFStringRef key,
CFStringRef value) {
- OSStatus status = VCPCompressionSessionSetProperty(session, key, value);
+ OSStatus status = webrtc::VCPCompressionSessionSetProperty(session, key, value);
if (status != noErr) {
std::string key_string = CFStringToString(key);
std::string val_string = CFStringToString(value);
@@ -413,7 +413,7 @@
// Get a pixel buffer from the pool and copy frame data over.
CVPixelBufferPoolRef pixel_buffer_pool =
- VCPCompressionSessionGetPixelBufferPool(compression_session_);
+ webrtc::VCPCompressionSessionGetPixelBufferPool(compression_session_);
#if defined(WEBRTC_IOS)
if (!pixel_buffer_pool) {
// Kind of a hack. On backgrounding, the compression session seems to get
@@ -423,7 +423,7 @@
// In addition we request a keyframe so video can recover quickly.
ResetCompressionSession();
pixel_buffer_pool =
- VCPCompressionSessionGetPixelBufferPool(compression_session_);
+ webrtc::VCPCompressionSessionGetPixelBufferPool(compression_session_);
is_keyframe_required = true;
LOG(LS_INFO) << "Resetting compression session due to invalid pool.";
}
@@ -496,7 +496,7 @@
// Update the bitrate if needed.
SetBitrateBps(bitrate_adjuster_.GetAdjustedBitrateBps());
- OSStatus status = VCPCompressionSessionEncodeFrame(
+ OSStatus status = webrtc::VCPCompressionSessionEncodeFrame(
compression_session_, pixel_buffer, presentation_time_stamp,
kCMTimeInvalid, frame_properties, encode_params.release(), nullptr);
if (frame_properties) {
@@ -593,7 +593,7 @@
CFDictionaryRef encoderSpecification = nullptr;
#endif
- OSStatus status = VCPCompressionSessionCreate(
+ OSStatus status = webrtc::VCPCompressionSessionCreate(
nullptr, // use default allocator
width, height, kVCPCodecType4CC_H264,
encoderSpecification, // use default encoder
@@ -645,7 +645,7 @@
void H264VideoToolboxEncoderVCP::DestroyCompressionSession() {
if (compression_session_) {
- VCPCompressionSessionInvalidate(compression_session_);
+ webrtc::VCPCompressionSessionInvalidate(compression_session_);
CFRelease(compression_session_);
compression_session_ = nullptr;
}
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm 2018-01-22 17:57:37 UTC (rev 227313)
@@ -32,7 +32,7 @@
VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory()
{
#if ENABLE_VCP_ENCODER
- VPModuleInitialize();
+ webrtc::VPModuleInitialize();
#endif
}
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (227312 => 227313)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2018-01-22 17:57:33 UTC (rev 227312)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2018-01-22 17:57:37 UTC (rev 227313)
@@ -167,6 +167,8 @@
414D71191E4AEB110023E526 /* sctp_userspace.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71181E4AEB110023E526 /* sctp_userspace.c */; };
416D2F151FA8CCAE00097345 /* encoder_vcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 416D2F131FA8CCAD00097345 /* encoder_vcp.h */; };
416D2F161FA8CCAE00097345 /* encoder_vcp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 416D2F141FA8CCAD00097345 /* encoder_vcp.mm */; };
+ 417CF799201239AF001ADF3A /* VideoProcessingSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417CF797201239AE001ADF3A /* VideoProcessingSoftLink.cpp */; };
+ 417CF79A201239AF001ADF3A /* VideoProcessingSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 417CF798201239AE001ADF3A /* VideoProcessingSoftLink.h */; };
417DA4581EF9CD0D00E869DB /* RTCUIApplicationStatusObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DA4561EF9CD0A00E869DB /* RTCUIApplicationStatusObserver.h */; };
41A391731EFC447C00C4516A /* sha1-altivec.c in Sources */ = {isa = PBXBuildFile; fileRef = 41A3914F1EFC446E00C4516A /* sha1-altivec.c */; };
41A391741EFC447C00C4516A /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 41A391501EFC446E00C4516A /* sha1.c */; };
@@ -2937,6 +2939,8 @@
416D2F101FA8CC0400097345 /* VideoProcessing.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoProcessing.framework; path = System/Library/PrivateFrameworks/VideoProcessing.framework; sourceTree = SDKROOT; };
416D2F131FA8CCAD00097345 /* encoder_vcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = encoder_vcp.h; path = VideoProcessing/encoder_vcp.h; sourceTree = "<group>"; };
416D2F141FA8CCAD00097345 /* encoder_vcp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = encoder_vcp.mm; path = VideoProcessing/encoder_vcp.mm; sourceTree = "<group>"; };
+ 417CF797201239AE001ADF3A /* VideoProcessingSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoProcessingSoftLink.cpp; path = VideoProcessing/VideoProcessingSoftLink.cpp; sourceTree = "<group>"; };
+ 417CF798201239AE001ADF3A /* VideoProcessingSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoProcessingSoftLink.h; path = VideoProcessing/VideoProcessingSoftLink.h; sourceTree = "<group>"; };
417DA4561EF9CD0A00E869DB /* RTCUIApplicationStatusObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RTCUIApplicationStatusObserver.h; path = Source/webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h; sourceTree = SOURCE_ROOT; };
41A391451EFC446E00C4516A /* sha1-586.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "sha1-586.pl"; sourceTree = "<group>"; };
41A391461EFC446E00C4516A /* sha1-armv4-large.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "sha1-armv4-large.pl"; sourceTree = "<group>"; };
@@ -5653,6 +5657,8 @@
children = (
416D2F131FA8CCAD00097345 /* encoder_vcp.h */,
416D2F141FA8CCAD00097345 /* encoder_vcp.mm */,
+ 417CF797201239AE001ADF3A /* VideoProcessingSoftLink.cpp */,
+ 417CF798201239AE001ADF3A /* VideoProcessingSoftLink.h */,
);
name = VideoProcessing;
sourceTree = "<group>";
@@ -10940,6 +10946,7 @@
5C4B49071E42C1E3002651C8 /* videocommon.h in Headers */,
5CD286251E6A666D0094FDC8 /* videodecodersoftwarefallbackwrapper.h in Headers */,
5C4B488A1E42C1BA002651C8 /* videoencodersoftwarefallbackwrapper.h in Headers */,
+ 417CF79A201239AF001ADF3A /* VideoProcessingSoftLink.h in Headers */,
5C4B490A1E42C1E3002651C8 /* videosinkinterface.h in Headers */,
5C4B490C1E42C1E3002651C8 /* videosourcebase.h in Headers */,
5C4B490D1E42C1E3002651C8 /* videosourceinterface.h in Headers */,
@@ -12641,6 +12648,7 @@
5C4B49061E42C1E3002651C8 /* videocommon.cc in Sources */,
5CD286241E6A666D0094FDC8 /* videodecodersoftwarefallbackwrapper.cc in Sources */,
5C4B48891E42C1BA002651C8 /* videoencodersoftwarefallbackwrapper.cc in Sources */,
+ 417CF799201239AF001ADF3A /* VideoProcessingSoftLink.cpp in Sources */,
5C4B490B1E42C1E3002651C8 /* videosourcebase.cc in Sources */,
5CD285161E6A60570094FDC8 /* videotrack.cc in Sources */,
5CD285181E6A60570094FDC8 /* videotracksource.cc in Sources */,
