[webkit-changes] [167971] trunk

Tue, 29 Apr 2014 17:11:24 -0700

Title: [167971] trunk
Revision
167971
Author
commit-qu...@webkit.org
Date
2014-04-29 17:11:05 -0700 (Tue, 29 Apr 2014)

Log Message

[WinCairo] Switch video from GStreamer to Media Foundation.
https://bugs.webkit.org/show_bug.cgi?id=132358

Patch by Alex Christensen <achristen...@webkit.org> on 2014-04-29
Reviewed by Brent Fulgham.

Source/WebCore:
* WebCore.vcxproj/WebCore.vcxproj:
Removed dependencies on GStreamer.

Source/WebKit:
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
Removed dependencies on GStreamer.

Source/WTF:
* WTF.vcxproj/WTF.vcxproj:
Removed dependencies on GStreamer.
* wtf/Platform.h:
Use Media Foundation instead of GStreamer and GLib.

Websites/webkit.org:
* building/tools.html:
Removed requirement of installing GStreamer.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (167970 => 167971)


--- trunk/Source/WTF/ChangeLog	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WTF/ChangeLog	2014-04-30 00:11:05 UTC (rev 167971)
@@ -1,3 +1,15 @@
+2014-04-29  Alex Christensen  <achristen...@webkit.org>
+
+        [WinCairo] Switch video from GStreamer to Media Foundation.
+        https://bugs.webkit.org/show_bug.cgi?id=132358
+
+        Reviewed by Brent Fulgham.
+
+        * WTF.vcxproj/WTF.vcxproj:
+        Removed dependencies on GStreamer.
+        * wtf/Platform.h:
+        Use Media Foundation instead of GStreamer and GLib.
+
 2014-04-29  Filip Pizlo  <fpi...@apple.com>
 
         Unreviewed, fix cloop build.

Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (167970 => 167971)


--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj	2014-04-30 00:11:05 UTC (rev 167971)
@@ -413,14 +413,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WTFDebugWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WTFDebugWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -443,14 +439,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WTFReleaseWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WTFReleaseWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

Modified: trunk/Source/WTF/wtf/Platform.h (167970 => 167971)


--- trunk/Source/WTF/wtf/Platform.h	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WTF/wtf/Platform.h	2014-04-30 00:11:05 UTC (rev 167971)
@@ -870,9 +870,7 @@
 #endif
 
 #if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
-#define WTF_USE_GLIB 1
-#define WTF_USE_GSTREAMER 1
-#define GST_API_VERSION_1 1
+#define WTF_USE_MEDIA_FOUNDATION 1
 #endif
 
 #if PLATFORM(WIN_CAIRO)

Modified: trunk/Source/WebCore/ChangeLog (167970 => 167971)


--- trunk/Source/WebCore/ChangeLog	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WebCore/ChangeLog	2014-04-30 00:11:05 UTC (rev 167971)
@@ -1,3 +1,13 @@
+2014-04-29  Alex Christensen  <achristen...@webkit.org>
+
+        [WinCairo] Switch video from GStreamer to Media Foundation.
+        https://bugs.webkit.org/show_bug.cgi?id=132358
+
+        Reviewed by Brent Fulgham.
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        Removed dependencies on GStreamer.
+
 2014-04-29  Simon Fraser  <simon.fra...@apple.com>
 
         Remove some PLATFORM(IOS) #ifdefs related to hasAcceleratedTouchScrolling()

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (167970 => 167971)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2014-04-30 00:11:05 UTC (rev 167971)
@@ -131,14 +131,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebCoreReleaseWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebCoreReleaseWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -159,14 +155,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebCoreDebugWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebCoreDebugWinCairo.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

Modified: trunk/Source/WebKit/ChangeLog (167970 => 167971)


--- trunk/Source/WebKit/ChangeLog	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WebKit/ChangeLog	2014-04-30 00:11:05 UTC (rev 167971)
@@ -1,3 +1,13 @@
+2014-04-29  Alex Christensen  <achristen...@webkit.org>
+
+        [WinCairo] Switch video from GStreamer to Media Foundation.
+        https://bugs.webkit.org/show_bug.cgi?id=132358
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+        Removed dependencies on GStreamer.
+
 2014-04-22  Brent Fulgham  <bfulg...@apple.com>
 
         [Win] Support Python 2.7 in Cygwin

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (167970 => 167971)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj	2014-04-30 00:11:05 UTC (rev 167971)
@@ -131,14 +131,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebKitReleaseWinCairo.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebKitReleaseWinCairo.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -159,14 +155,10 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebKitDebugWinCairo.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebKitDebugWinCairo.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

Modified: trunk/Websites/webkit.org/ChangeLog (167970 => 167971)


--- trunk/Websites/webkit.org/ChangeLog	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Websites/webkit.org/ChangeLog	2014-04-30 00:11:05 UTC (rev 167971)
@@ -1,3 +1,13 @@
+2014-04-29  Alex Christensen  <achristen...@webkit.org>
+
+        [WinCairo] Switch video from GStreamer to Media Foundation.
+        https://bugs.webkit.org/show_bug.cgi?id=132358
+
+        Reviewed by Brent Fulgham.
+
+        * building/tools.html:
+        Removed requirement of installing GStreamer.
+
 2014-04-18  Bem Jones-Bey  <bjone...@adobe.com>
 
         Add mention of Safari Debug menu and finding out the WebProcess that corresponds to a tab

Modified: trunk/Websites/webkit.org/building/tools.html (167970 => 167971)


--- trunk/Websites/webkit.org/building/tools.html	2014-04-29 23:53:57 UTC (rev 167970)
+++ trunk/Websites/webkit.org/building/tools.html	2014-04-30 00:11:05 UTC (rev 167971)
@@ -62,11 +62,6 @@
 <li><p>Install QuickTime SDK and QuickTime or GStreamer</p>
 <p>Download QuickTime SDK for Windows from <a href="" and install it to the default location (\Program Files\QuickTime SDK). This is needed for media support for the AppleWin port.
 <p>You'll also want quicktime itself. You don't need it to build but without it media fallbacks won't work on the AppleWin port. </p>
-<p>The WinCairo port uses GStreamer for media support.  The following files from freedesktop.org are required:</p>
-<ul><li><a href=""
-<li><a href=""
-<li><a href=""
-<li><a href=""
 <li><p>Install DirectX SDK</p>
 <p>Download the <a href="" 2010 DirectX SDK</a>  This is needed for accelerated compositing.</p>
 </p>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to