Title: [92308] trunk/Source/WebCore
- Revision
- 92308
- Author
- [email protected]
- Date
- 2011-08-03 13:15:53 -0700 (Wed, 03 Aug 2011)
Log Message
Generate WebCoreHeaderDetection.h on Windows to define HAVE_AVCF
https://bugs.webkit.org/show_bug.cgi?id=65634
AVFoundation support on Windows will (eventually) be predicated on the
availability of AVFoundationCF headers and libraries in the WebKit Support
Libraries, so we test for the existence of one of the header files (AVCFBase.h)
to determine whether to AVCF is available.
For now, even if AVFoundationCF is available, leave WTF_USE_AVFOUNDATION off, since
it's not ready to be turned on yet (which is covered by http://webkit.org/b/65400).
Ideally, we would generate WebCoreHeaderDetection.h on all platforms so we could
include it unconditionally in WebCore's config.h, but unfortunately the Mac-only file
ExportFileGenerator.cpp depends on WTF_USE_AVFOUNDATION being set correctly, and since this
.cpp file is also generated it doesn't have access to WebCoreHeaderDetection.h.
Reviewed by Adam Roben.
No change in functionality, so new tests.
* DerivedSources.make: Add rule to generate WebCoreHeaderDetection.h to set HAVE_AVCF on Windows.
* config.h: Include WebCoreHeaderDetection.h on Windows, check for HAVE(AVCF) but always leave WTF_USE_AVFOUNDATION off on Windows for now.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92307 => 92308)
--- trunk/Source/WebCore/ChangeLog 2011-08-03 20:13:59 UTC (rev 92307)
+++ trunk/Source/WebCore/ChangeLog 2011-08-03 20:15:53 UTC (rev 92308)
@@ -1,3 +1,28 @@
+2011-08-03 Jeff Miller <[email protected]>
+
+ Generate WebCoreHeaderDetection.h on Windows to define HAVE_AVCF
+ https://bugs.webkit.org/show_bug.cgi?id=65634
+
+ AVFoundation support on Windows will (eventually) be predicated on the
+ availability of AVFoundationCF headers and libraries in the WebKit Support
+ Libraries, so we test for the existence of one of the header files (AVCFBase.h)
+ to determine whether to AVCF is available.
+
+ For now, even if AVFoundationCF is available, leave WTF_USE_AVFOUNDATION off, since
+ it's not ready to be turned on yet (which is covered by http://webkit.org/b/65400).
+
+ Ideally, we would generate WebCoreHeaderDetection.h on all platforms so we could
+ include it unconditionally in WebCore's config.h, but unfortunately the Mac-only file
+ ExportFileGenerator.cpp depends on WTF_USE_AVFOUNDATION being set correctly, and since this
+ .cpp file is also generated it doesn't have access to WebCoreHeaderDetection.h.
+
+ Reviewed by Adam Roben.
+
+ No change in functionality, so new tests.
+
+ * DerivedSources.make: Add rule to generate WebCoreHeaderDetection.h to set HAVE_AVCF on Windows.
+ * config.h: Include WebCoreHeaderDetection.h on Windows, check for HAVE(AVCF) but always leave WTF_USE_AVFOUNDATION off on Windows for now.
+
2011-08-03 Tommy Widenflycht <[email protected]>
MediaStream API: Implement PeerConnection and SignalingCallback
Modified: trunk/Source/WebCore/DerivedSources.make (92307 => 92308)
--- trunk/Source/WebCore/DerivedSources.make 2011-08-03 20:13:59 UTC (rev 92307)
+++ trunk/Source/WebCore/DerivedSources.make 2011-08-03 20:15:53 UTC (rev 92308)
@@ -973,3 +973,16 @@
# --------
endif # MACOS
+
+# ------------------------
+
+# Header detection
+
+ifeq ($(OS),Windows_NT)
+
+all : WebCoreHeaderDetection.h
+
+WebCoreHeaderDetection.h : DerivedSources.make
+ if [ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFBase.h" ]; then echo "#define HAVE_AVCF 1" > $@; else echo > $@; fi
+
+endif # Windows_NT
Modified: trunk/Source/WebCore/config.h (92307 => 92308)
--- trunk/Source/WebCore/config.h 2011-08-03 20:13:59 UTC (rev 92307)
+++ trunk/Source/WebCore/config.h 2011-08-03 20:15:53 UTC (rev 92308)
@@ -29,6 +29,10 @@
#include <wtf/Platform.h>
+#if OS(WINDOWS)
+#include <WebCore/WebCoreHeaderDetection.h>
+#endif
+
/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
#if USE(EXPORT_MACROS)
@@ -221,3 +225,7 @@
#define WTF_USE_AVFOUNDATION 1
#endif
+#if PLATFORM(WIN) && HAVE(AVCF)
+/// FIXME: Adopt AVCF media back end on Windows http://webkit.org/b/65400
+#define WTF_USE_AVFOUNDATION 0
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
