Title: [203113] trunk/Source/WebCore
Revision
203113
Author
[email protected]
Date
2016-07-12 06:04:38 -0700 (Tue, 12 Jul 2016)

Log Message

Unreviewed, rolling out r203059.
https://bugs.webkit.org/show_bug.cgi?id=159673

B and R channels now swapped on desktop GL builds (Requested
by philn on #webkit).

Reverted changeset:

"Red and blue colors are swapped in video rendered through
WebGL when GSTREAMER_GL is enabled"
https://bugs.webkit.org/show_bug.cgi?id=159621
http://trac.webkit.org/changeset/203059

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (203112 => 203113)


--- trunk/Source/WebCore/ChangeLog	2016-07-12 11:29:16 UTC (rev 203112)
+++ trunk/Source/WebCore/ChangeLog	2016-07-12 13:04:38 UTC (rev 203113)
@@ -1,3 +1,18 @@
+2016-07-12  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r203059.
+        https://bugs.webkit.org/show_bug.cgi?id=159673
+
+        B and R channels now swapped on desktop GL builds (Requested
+        by philn on #webkit).
+
+        Reverted changeset:
+
+        "Red and blue colors are swapped in video rendered through
+        WebGL when GSTREAMER_GL is enabled"
+        https://bugs.webkit.org/show_bug.cgi?id=159621
+        http://trac.webkit.org/changeset/203059
+
 2016-07-12  Yoav Weiss  <[email protected]>
 
         js/dom/global-constructors-attributes.html is flaky: ResourceTiming runtime feature leaks between tests

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (203112 => 203113)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2016-07-12 11:29:16 UTC (rev 203112)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2016-07-12 13:04:38 UTC (rev 203113)
@@ -85,12 +85,6 @@
 #include <cairo-gl.h>
 #endif
 
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GST_GL_CAPS_FORMAT "BGRA"
-#else
-#define GST_GL_CAPS_FORMAT "ARGB"
-#endif
-
 GST_DEBUG_CATEGORY(webkit_media_player_debug);
 #define GST_CAT_DEFAULT webkit_media_player_debug
 
@@ -842,7 +836,7 @@
 
     gst_bin_add_many(GST_BIN(videoSink), upload, colorconvert, appsink, nullptr);
 
-    GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw(" GST_CAPS_FEATURE_MEMORY_GL_MEMORY "), format = (string) { " GST_GL_CAPS_FORMAT " }"));
+    GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw(" GST_CAPS_FEATURE_MEMORY_GL_MEMORY "), format = (string) { RGBA }"));
 
     result &= gst_element_link_pads(upload, "src", colorconvert, "sink");
     result &= gst_element_link_pads_filtered(colorconvert, "src", appsink, "sink", caps.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to