<!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>[245119] releases/WebKitGTK/webkit-2.24/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/245119">245119</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-05-09 02:38:29 -0700 (Thu, 09 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/243644">r243644</a> - [GStreamer] imxvpudecoder detection and handling
https://bugs.webkit.org/show_bug.cgi?id=196346

Reviewed by Xabier Rodriguez-Calvar.

When the imxvpudecoder is used, the texture sampling of the
directviv-uploaded texture returns an RGB value, so there's no need
to convert it. This patch also includes a refactoring of the
ImageRotation flag handling. The flag is now computed once only
and stored in an instance variable.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
(WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::pushTextureToCompositor):
(WebCore::MediaPlayerPrivateGStreamerBase::flushCurrentBuffer):
(WebCore::MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture):
(WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
(WebCore::MediaPlayerPrivateGStreamerBase::setVideoSourceOrientation):
(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
(WebCore::texMapFlagFromOrientation): Deleted.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (245118 => 245119)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-05-09 09:38:25 UTC (rev 245118)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-05-09 09:38:29 UTC (rev 245119)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2019-03-29  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] imxvpudecoder detection and handling
+        https://bugs.webkit.org/show_bug.cgi?id=196346
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        When the imxvpudecoder is used, the texture sampling of the
+        directviv-uploaded texture returns an RGB value, so there's no need
+        to convert it. This patch also includes a refactoring of the
+        ImageRotation flag handling. The flag is now computed once only
+        and stored in an instance variable.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::GstVideoFrameHolder::GstVideoFrameHolder):
+        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::pushTextureToCompositor):
+        (WebCore::MediaPlayerPrivateGStreamerBase::flushCurrentBuffer):
+        (WebCore::MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture):
+        (WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
+        (WebCore::MediaPlayerPrivateGStreamerBase::setVideoSourceOrientation):
+        (WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
+        (WebCore::texMapFlagFromOrientation): Deleted.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
</ins><span class="cx"> 2019-04-24  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] Crash in AudioTrackPrivate with playbin3 enabled
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (245118 => 245119)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2019-05-09 09:38:25 UTC (rev 245118)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp   2019-05-09 09:38:29 UTC (rev 245119)
</span><span class="lines">@@ -2459,7 +2459,12 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         GUniquePtr<char> elementName(gst_element_get_name(element));
</span><del>-        player->m_isVideoDecoderVideo4Linux = g_str_has_prefix(elementName.get(), "v4l2");
</del><ins>+        if (g_str_has_prefix(elementName.get(), "v4l2"))
+            player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::Video4Linux;
+        else if (g_str_has_prefix(elementName.get(), "imxvpudecoder"))
+            player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::ImxVPU;
+
+        player->updateTextureMapperFlags();
</ins><span class="cx">     }), this);
</span><span class="cx"> 
</span><span class="cx">     g_signal_connect_swapped(m_pipeline.get(), "source-setup", G_CALLBACK(sourceSetupCallback), this);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (245118 => 245119)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp    2019-05-09 09:38:25 UTC (rev 245118)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp       2019-05-09 09:38:29 UTC (rev 245119)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> #include "BitmapTexturePool.h"
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "TextureMapperContextAttributes.h"
</span><del>-#include "TextureMapperGL.h"
</del><span class="cx"> #include "TextureMapperPlatformLayerBuffer.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerProxy.h"
</span><span class="cx"> #if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="lines">@@ -150,26 +149,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><del>-static inline TextureMapperGL::Flags texMapFlagFromOrientation(const ImageOrientation& orientation)
-{
-    switch (orientation) {
-    case DefaultImageOrientation:
-        return 0;
-    case OriginRightTop:
-        return TextureMapperGL::ShouldRotateTexture90;
-    case OriginBottomRight:
-        return TextureMapperGL::ShouldRotateTexture180;
-    case OriginLeftBottom:
-        return TextureMapperGL::ShouldRotateTexture270;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-
-    return 0;
-}
-#endif
-
-#if USE(TEXTURE_MAPPER_GL)
</del><span class="cx"> class GstVideoFrameHolder : public TextureMapperPlatformLayerBuffer::UnmanagedBufferDataHolder {
</span><span class="cx"> public:
</span><span class="cx">     explicit GstVideoFrameHolder(GstSample* sample, TextureMapperGL::Flags flags, bool gstGLEnabled)
</span><span class="lines">@@ -185,7 +164,7 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><del>-        m_flags = flags | (m_hasAlphaChannel ? TextureMapperGL::ShouldBlend : 0) | TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
</del><ins>+        m_flags = flags | (m_hasAlphaChannel ? TextureMapperGL::ShouldBlend : 0);
</ins><span class="cx"> 
</span><span class="cx">         if (gstGLEnabled) {
</span><span class="cx">             m_isMapped = gst_video_frame_map(&m_videoFrame, &videoInfo, m_buffer, static_cast<GstMapFlags>(GST_MAP_READ | GST_MAP_GL));
</span><span class="lines">@@ -274,7 +253,7 @@
</span><span class="cx"> MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase()
</span><span class="cx"> {
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><del>-    if (m_isVideoDecoderVideo4Linux)
</del><ins>+    if (m_videoDecoderPlatform == WebKitGstVideoDecoderPlatform::Video4Linux)
</ins><span class="cx">         flushCurrentBuffer();
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && USE(NICOSIA)
</span><span class="lines">@@ -733,7 +712,7 @@
</span><span class="cx">             if (!proxy.isActive())
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><del>-            std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), !m_usingFallbackVideoSink);
</del><ins>+            std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), m_textureMapperFlags, !m_usingFallbackVideoSink);
</ins><span class="cx"> 
</span><span class="cx">             GLuint textureID = frameHolder->textureID();
</span><span class="cx">             std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer;
</span><span class="lines">@@ -748,7 +727,7 @@
</span><span class="cx">                     layerBuffer = std::make_unique<TextureMapperPlatformLayerBuffer>(WTFMove(texture));
</span><span class="cx">                 }
</span><span class="cx">                 frameHolder->updateTexture(layerBuffer->textureGL());
</span><del>-                layerBuffer->setExtraFlags(texMapFlagFromOrientation(m_videoSourceOrientation) | (frameHolder->hasAlphaChannel() ? TextureMapperGL::ShouldBlend : 0));
</del><ins>+                layerBuffer->setExtraFlags(m_textureMapperFlags | (frameHolder->hasAlphaChannel() ? TextureMapperGL::ShouldBlend : 0));
</ins><span class="cx">             }
</span><span class="cx">             proxy.pushNextBuffer(WTFMove(layerBuffer));
</span><span class="cx">         };
</span><span class="lines">@@ -874,15 +853,14 @@
</span><span class="cx">             gst_sample_get_segment(m_sample.get()), info ? gst_structure_copy(info) : nullptr));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto proxyOperation =
-        [shouldWait = m_isVideoDecoderVideo4Linux, pipeline = pipeline()](TextureMapperPlatformLayerProxy& proxy)
-        {
-            GST_DEBUG_OBJECT(pipeline, "Flushing video sample %s", shouldWait ? "synchronously" : "");
-            LockHolder locker(!shouldWait ? &proxy.lock() : nullptr);
</del><ins>+    bool shouldWait = m_videoDecoderPlatform == WebKitGstVideoDecoderPlatform::Video4Linux;
+    auto proxyOperation = [shouldWait, pipeline = pipeline()](TextureMapperPlatformLayerProxy& proxy) {
+        GST_DEBUG_OBJECT(pipeline, "Flushing video sample %s", shouldWait ? "synchronously" : "");
+        LockHolder locker(!shouldWait ? &proxy.lock() : nullptr);
</ins><span class="cx"> 
</span><del>-            if (proxy.isActive())
-                proxy.dropCurrentBufferWhilePreservingTexture(shouldWait);
-        };
</del><ins>+        if (proxy.isActive())
+            proxy.dropCurrentBufferWhilePreservingTexture(shouldWait);
+    };
</ins><span class="cx"> 
</span><span class="cx"> #if USE(NICOSIA)
</span><span class="cx">     proxyOperation(downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).proxy());
</span><span class="lines">@@ -936,7 +914,7 @@
</span><span class="cx">     if (!GST_IS_SAMPLE(m_sample.get()))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), true);
</del><ins>+    std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), m_textureMapperFlags, true);
</ins><span class="cx"> 
</span><span class="cx">     auto textureID = frameHolder->textureID();
</span><span class="cx">     if (!textureID)
</span><span class="lines">@@ -963,7 +941,7 @@
</span><span class="cx">     if (!GST_IS_SAMPLE(m_sample.get()))
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), true);
</del><ins>+    std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), m_textureMapperFlags, true);
</ins><span class="cx"> 
</span><span class="cx">     auto textureID = frameHolder->textureID();
</span><span class="cx">     if (!textureID)
</span><span class="lines">@@ -995,8 +973,41 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_videoSourceOrientation = orientation;
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+    updateTextureMapperFlags();
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
+{
+    switch (m_videoSourceOrientation) {
+    case DefaultImageOrientation:
+        m_textureMapperFlags = 0;
+        break;
+    case OriginRightTop:
+        m_textureMapperFlags = TextureMapperGL::ShouldRotateTexture90;
+        break;
+    case OriginBottomRight:
+        m_textureMapperFlags = TextureMapperGL::ShouldRotateTexture180;
+        break;
+    case OriginLeftBottom:
+        m_textureMapperFlags = TextureMapperGL::ShouldRotateTexture270;
+        break;
+    default:
+        // FIXME: Handle OriginTopRight, OriginBottomLeft, OriginLeftTop and OriginRightBottom?
+        m_textureMapperFlags = 0;
+        break;
+    }
+
+    // When the imxvpudecoder is used, the texture sampling of the
+    // directviv-uploaded texture returns an RGB value, so there's no need to
+    // convert it.
+    if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
+        m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
+}
+#endif
+
</ins><span class="cx"> bool MediaPlayerPrivateGStreamerBase::supportsFullscreen() const
</span><span class="cx"> {
</span><span class="cx">     return true;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (245118 => 245119)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h      2019-05-09 09:38:25 UTC (rev 245118)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2019-05-09 09:38:29 UTC (rev 245119)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> 
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><ins>+#include "TextureMapperGL.h"
</ins><span class="cx"> #if USE(NICOSIA)
</span><span class="cx"> #include "NicosiaContentLayerTextureMapperImpl.h"
</span><span class="cx"> #else
</span><span class="lines">@@ -221,6 +222,11 @@
</span><span class="cx">     static void volumeChangedCallback(MediaPlayerPrivateGStreamerBase*);
</span><span class="cx">     static void muteChangedCallback(MediaPlayerPrivateGStreamerBase*);
</span><span class="cx"> 
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
+    void updateTextureMapperFlags();
+    TextureMapperGL::Flags m_textureMapperFlags;
+#endif
+
</ins><span class="cx">     enum MainThreadNotification {
</span><span class="cx">         VideoChanged = 1 << 0,
</span><span class="cx">         VideoCapsChanged = 1 << 1,
</span><span class="lines">@@ -283,7 +289,9 @@
</span><span class="cx">     bool m_waitingForKey { false };
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    mutable bool m_isVideoDecoderVideo4Linux { false };
</del><ins>+    enum class WebKitGstVideoDecoderPlatform { ImxVPU, Video4Linux };
+
+    WebKitGstVideoDecoderPlatform m_videoDecoderPlatform;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>