Use VCP H264 encoder for platforms supporting it
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Nov 2017 23:21:47 +0000 (23:21 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Nov 2017 23:21:47 +0000 (23:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179076
rdar://problem/35180773

Unreviewed.

Patch by Youenn Fablet <youenn@apple.com> on 2017-11-03

* Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h: build fix for iOS.

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

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h

index cce62c0..f69dde1 100644 (file)
@@ -6,6 +6,16 @@
 
         Unreviewed.
 
+        * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h: build fix for iOS.
+
+2017-11-03  Youenn Fablet  <youenn@apple.com>
+
+        Use VCP H264 encoder for platforms supporting it
+        https://bugs.webkit.org/show_bug.cgi?id=179076
+        rdar://problem/35180773
+
+        Unreviewed.
+
         * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h: build fix.
 
 2017-11-03  Youenn Fablet  <youenn@apple.com>
index 78424da..2b7b85b 100644 (file)
 #include <AvailabilityMacros.h>
 #include <TargetConditionals.h>
 
-#define VCP_FOR_IOS (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300)
-#define VCP_FOR_IOS_SIMULATOR (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300)
-#define VCP_FOR_MAC_OS (defined(TARGET_OS_MAC)  && TARGET_OS_MAC && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
+#define IS_MAC_OS (defined(TARGET_OS_MAC)  && TARGET_OS_MAC)
+#define IS_IOS (defined(TARGET_OS_IPHONE)  && TARGET_OS_IPHONE)
+#define IS_IOS_SIMULATOR (defined(TARGET_IPHONE_SIMULATOR)  && TARGET_IPHONE_SIMULATOR)
 
 // FIXME: Activate VCP for iOS/iOS simulator
-#if VCP_FOR_MAC_OS
+#if IS_MAC_OS && !IS_IOS && !IS_IOS_SIMULATOR
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304
 #define ENABLE_VCP_ENCODER 1
 #else
 #define ENABLE_VCP_ENCODER 0
 #endif
 
+#endif
+
 #if ENABLE_VCP_ENCODER
 
 #include "webrtc/api/video/video_rotation.h"