Title: [224440] trunk/Source/ThirdParty/libwebrtc
- Revision
- 224440
- Author
- commit-qu...@webkit.org
- Date
- 2017-11-03 16:21:47 -0700 (Fri, 03 Nov 2017)
Log Message
Use VCP H264 encoder for platforms supporting it
https://bugs.webkit.org/show_bug.cgi?id=179076
rdar://problem/35180773
Unreviewed.
Patch by Youenn Fablet <you...@apple.com> on 2017-11-03
* Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h: build fix for iOS.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (224439 => 224440)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-11-03 23:09:28 UTC (rev 224439)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-11-03 23:21:47 UTC (rev 224440)
@@ -6,6 +6,16 @@
Unreviewed.
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h: build fix for iOS.
+
+2017-11-03 Youenn Fablet <you...@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 <you...@apple.com>
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h (224439 => 224440)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h 2017-11-03 23:09:28 UTC (rev 224439)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/encoder_vcp.h 2017-11-03 23:21:47 UTC (rev 224440)
@@ -17,17 +17,21 @@
#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"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
