Changeset 216912 in webkit

Timestamp:

May 16, 2017 12:11:56 AM (7 years ago)

Author:

pvollan@apple.com

Message:

Compile error, include file is not found.
​https://bugs.webkit.org/show_bug.cgi?id=172105

Reviewed by Brent Fulgham.

Use has_include to detect if include file exists.

• platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-16  Per Arne Vollan  <pvollan@apple.com>
+
+        Compile error, include file is not found.
+        https://bugs.webkit.org/show_bug.cgi?id=172105
+
+        Reviewed by Brent Fulgham.
+
+        Use __has_include to detect if include file exists.
+
+        * platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm:
+
 2017-05-15  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm

@@ -29 +29 @@
 #if USE(LIBWEBRTC) && PLATFORM(COCOA)
 
-#if ENABLE(MAC_VIDEO_TOOLBOX)
+#if ENABLE(MAC_VIDEO_TOOLBOX) && USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/VideoToolBoxEncoderMac.mm>)
 #import <WebKitAdditions/VideoToolBoxEncoderMac.mm>
-#endif
+#else
 
 namespace WebCore {
 
-#if !ENABLE(MAC_VIDEO_TOOLBOX)
 int H264VideoToolboxEncoder::CreateCompressionSession(VTCompressionSessionRef& compressionSession, VTCompressionOutputCallback outputCallback, int32_t width, int32_t height)
 {
     return webrtc::H264VideoToolboxEncoder::CreateCompressionSession(compressionSession, outputCallback, width, height);
 }
+    
+}
 #endif
 
-}
-
 #endif