<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166480] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166480">166480</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-03-30 23:39:51 -0700 (Sun, 30 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [TextureMapper] Weird brightness with some videos with acceletared compositing
https://bugs.webkit.org/show_bug.cgi?id=130665
Reviewed by Martin Robinson.
When we uploaded a video texture to the mapper we were not
considering that some videos could be decoded into a format
without alpha component. Now we check if the video has alpha and
if it does not, we remove the alpha flag when retrieving the
texture from the pool. For this, the method to get the texture
from the pool was modified to receive the flags, that is mapped to
have alpha by default in order not to break any other existing
code.
Though we have a problem with AC in WTR and that makes it
currently not testable, no new tests are needed because once this
is fixed the current test set suffices to detect a possible
regression in this.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::updateTexture): Check
the video format and decide if the texture shall be pulled with
alpha support or not.
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::TextureMapper::acquireTextureFromPool): Use the flags
when resetting the texture.
* platform/graphics/texmap/TextureMapper.h:
(WebCore::BitmapTexture::Flag::None): Added with 0x00.
(WebCore::TextureMapper::acquireTextureFromPool): Added flag
parameter to set up the texture with the default for including
alpha channel.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166479 => 166480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 06:39:25 UTC (rev 166479)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 06:39:51 UTC (rev 166480)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-03-30 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] [TextureMapper] Weird brightness with some videos with acceletared compositing
+ https://bugs.webkit.org/show_bug.cgi?id=130665
+
+ Reviewed by Martin Robinson.
+
+ When we uploaded a video texture to the mapper we were not
+ considering that some videos could be decoded into a format
+ without alpha component. Now we check if the video has alpha and
+ if it does not, we remove the alpha flag when retrieving the
+ texture from the pool. For this, the method to get the texture
+ from the pool was modified to receive the flags, that is mapped to
+ have alpha by default in order not to break any other existing
+ code.
+
+ Though we have a problem with AC in WTR and that makes it
+ currently not testable, no new tests are needed because once this
+ is fixed the current test set suffices to detect a possible
+ regression in this.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture): Check
+ the video format and decide if the texture shall be pulled with
+ alpha support or not.
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::TextureMapper::acquireTextureFromPool): Use the flags
+ when resetting the texture.
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::BitmapTexture::Flag::None): Added with 0x00.
+ (WebCore::TextureMapper::acquireTextureFromPool): Added flag
+ parameter to set up the texture with the default for including
+ alpha channel.
+
</ins><span class="cx"> 2014-03-30 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Adopt range-based for loops to TextCheckerEnchant
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (166479 => 166480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2014-03-31 06:39:25 UTC (rev 166479)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2014-03-31 06:39:51 UTC (rev 166480)
</span><span class="lines">@@ -324,8 +324,10 @@
</span><span class="cx"> if (!getVideoSizeAndFormatFromCaps(caps.get(), size, format, pixelAspectRatioNumerator, pixelAspectRatioDenominator, stride))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RefPtr<BitmapTexture> texture = textureMapper->acquireTextureFromPool(size);
</del><ins>+ const GstVideoFormatInfo* formatInfo = gst_video_format_get_info(format);
</ins><span class="cx">
</span><ins>+ RefPtr<BitmapTexture> texture = textureMapper->acquireTextureFromPool(size, GST_VIDEO_FORMAT_INFO_HAS_ALPHA(formatInfo) ? BitmapTexture::SupportsAlpha : BitmapTexture::NoFlag);
+
</ins><span class="cx"> #if GST_CHECK_VERSION(1, 1, 0)
</span><span class="cx"> GstVideoGLTextureUploadMeta* meta;
</span><span class="cx"> if ((meta = gst_buffer_get_video_gl_texture_upload_meta(m_buffer))) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (166479 => 166480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2014-03-31 06:39:25 UTC (rev 166479)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2014-03-31 06:39:51 UTC (rev 166480)
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx"> return selectedEntry->m_texture;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<BitmapTexture> TextureMapper::acquireTextureFromPool(const IntSize& size)
</del><ins>+PassRefPtr<BitmapTexture> TextureMapper::acquireTextureFromPool(const IntSize& size, const BitmapTexture::Flags flags)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapTexture> selectedTexture = m_texturePool->acquireTexture(size, this);
</span><del>- selectedTexture->reset(size, BitmapTexture::SupportsAlpha);
</del><ins>+ selectedTexture->reset(size, flags);
</ins><span class="cx"> return selectedTexture;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (166479 => 166480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2014-03-31 06:39:25 UTC (rev 166479)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2014-03-31 06:39:51 UTC (rev 166480)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class BitmapTexture : public RefCounted<BitmapTexture> {
</span><span class="cx"> public:
</span><span class="cx"> enum Flag {
</span><ins>+ NoFlag = 0,
</ins><span class="cx"> SupportsAlpha = 0x01
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -156,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> virtual IntSize maxTextureSize() const = 0;
</span><span class="cx">
</span><del>- virtual PassRefPtr<BitmapTexture> acquireTextureFromPool(const IntSize&);
</del><ins>+ virtual PassRefPtr<BitmapTexture> acquireTextureFromPool(const IntSize&, const BitmapTexture::Flags = BitmapTexture::SupportsAlpha);
</ins><span class="cx">
</span><span class="cx"> void setPatternTransform(const TransformationMatrix& p) { m_patternTransform = p; }
</span><span class="cx"> void setWrapMode(WrapMode m) { m_wrapMode = m; }
</span></span></pre>
</div>
</div>
</body>
</html>