Make VCP encoder usage conditional on using internal SDK
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Mar 2018 18:36:37 +0000 (18:36 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Mar 2018 18:36:37 +0000 (18:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184009

Patch by Youenn Fablet <youennf@gmail.com> on 2018-03-26
Reviewed by Eric Carlson.

* Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229980 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h

index 5458329..d8f50f5 100644 (file)
@@ -1,3 +1,12 @@
+2018-03-26  Youenn Fablet  <youennf@gmail.com>
+
+        Make VCP encoder usage conditional on using internal SDK
+        https://bugs.webkit.org/show_bug.cgi?id=184009
+
+        Reviewed by Eric Carlson.
+
+        * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
+
 2018-03-23  Youenn Fablet  <youenn@apple.com>
 
         Add support for VCP encoder on MacOS and iOS
index 6d8c655..860a53f 100644 (file)
@@ -30,6 +30,9 @@
 #include <AvailabilityMacros.h>
 #include <TargetConditionals.h>
 
+// Macro taken from WTF/wtf/Platform.h
+#if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
+
 #if (defined(TARGET_IPHONE_SIMULATOR)  && TARGET_IPHONE_SIMULATOR)
 #define ENABLE_VCP_ENCODER 0
 #elif (defined(TARGET_OS_IPHONE)  && TARGET_OS_IPHONE)
@@ -38,6 +41,8 @@
 #define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
 #endif
 
+#endif
+
 #if ENABLE_VCP_ENCODER
 
 #include <VideoProcessing/VideoProcessing.h>