<!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>[210132] 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/210132">210132</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-12-23 01:15:07 -0800 (Fri, 23 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EME][GStreamer] Enable various code paths for ENCRYPTED_MEDIA
https://bugs.webkit.org/show_bug.cgi?id=166054
Reviewed by Xabier Rodriguez-Calvar.
Add ENABLE_ENCRYPTED_MEDIA build guards in various places in GStreamer
code to enable decryption-related GStreamer elements and the proper
decryptor handling in AppendPipeline.
* platform/GStreamer.cmake:
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
* platform/graphics/gstreamer/GStreamerUtilities.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::registerWebKitGStreamerElements):
(WebCore::MediaPlayerPrivateGStreamerBase::handleSyncMessage):
Only call needKey() if LEGACY_ENCRYPTED_MEDIA is enabled, since this is
the way the legacy EME system expects to be notified of key necessity.
It's very likely ENCRYPTED_MEDIA will do this differently.
* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h:
* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h:
* platform/graphics/gstreamer/mse/AppendPipeline.cpp:
(WebCore::AppendPipeline::parseDemuxerSrcPadCaps):
(WebCore::AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread):
(WebCore::AppendPipeline::disconnectDemuxerSrcPadFromAppsinkFromAnyThread):
* platform/graphics/gstreamer/mse/AppendPipeline.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformGStreamercmake">trunk/Source/WebCore/platform/GStreamer.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeWebKitClearKeyDecryptorGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeWebKitClearKeyDecryptorGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeWebKitCommonEncryptionDecryptorGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeWebKitCommonEncryptionDecryptorGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelinecpp">trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelineh">trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/ChangeLog 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-12-23 Zan Dobersek <zdobersek@igalia.com>
+
+ [EME][GStreamer] Enable various code paths for ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=166054
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Add ENABLE_ENCRYPTED_MEDIA build guards in various places in GStreamer
+ code to enable decryption-related GStreamer elements and the proper
+ decryptor handling in AppendPipeline.
+
+ * platform/GStreamer.cmake:
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ * platform/graphics/gstreamer/GStreamerUtilities.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::registerWebKitGStreamerElements):
+ (WebCore::MediaPlayerPrivateGStreamerBase::handleSyncMessage):
+ Only call needKey() if LEGACY_ENCRYPTED_MEDIA is enabled, since this is
+ the way the legacy EME system expects to be notified of key necessity.
+ It's very likely ENCRYPTED_MEDIA will do this differently.
+ * platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
+ * platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h:
+ * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+ * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h:
+ * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+ (WebCore::AppendPipeline::parseDemuxerSrcPadCaps):
+ (WebCore::AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread):
+ (WebCore::AppendPipeline::disconnectDemuxerSrcPadFromAppsinkFromAnyThread):
+ * platform/graphics/gstreamer/mse/AppendPipeline.h:
+
</ins><span class="cx"> 2016-12-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Eliminate the use of lastChild in TextIterator
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGStreamercmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GStreamer.cmake (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GStreamer.cmake 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/GStreamer.cmake 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
</del><ins>+if (ENABLE_LEGACY_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${LIBGCRYPT_INCLUDE_DIRS}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if GST_CHECK_VERSION(1, 5, 3) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if GST_CHECK_VERSION(1, 5, 3) && (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA))
</ins><span class="cx"> GstElement* createGstDecryptor(const gchar* protectionSystem)
</span><span class="cx"> {
</span><span class="cx"> GstElement* decryptor = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> GstClockTime toGstClockTime(float time);
</span><span class="cx"> bool gstRegistryHasElementForMediaType(GList* elementFactories, const char* capsString);
</span><span class="cx">
</span><del>-#if GST_CHECK_VERSION(1, 5, 3) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if GST_CHECK_VERSION(1, 5, 3) && (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA))
</ins><span class="cx"> GstElement* createGstDecryptor(const gchar* protectionSystem);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -90,13 +90,15 @@
</span><span class="cx"> #include <cairo-gl.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
+#include "WebKitClearKeyDecryptorGStreamer.h"
</ins><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><span class="cx"> #include "UUID.h"
</span><del>-#include "WebKitClearKeyDecryptorGStreamer.h"
</del><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> GST_DEBUG_CATEGORY(webkit_media_player_debug);
</span><span class="cx"> #define GST_CAT_DEFAULT webkit_media_player_debug
</span><span class="lines">@@ -107,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> void registerWebKitGStreamerElements()
</span><span class="cx"> {
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> if (!webkitGstCheckVersion(1, 6, 1))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -258,7 +260,7 @@
</span><span class="cx"> UNUSED_PARAM(message);
</span><span class="cx"> #endif // USE(GSTREAMER_GL)
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ELEMENT) {
</span><span class="cx"> const GstStructure* structure = gst_message_get_structure(message);
</span><span class="cx"> if (gst_structure_has_name(structure, "drm-key-needed")) {
</span><span class="lines">@@ -279,10 +281,13 @@
</span><span class="cx"> if (UNLIKELY(!valid || !gst_buffer_map(data.get(), &mapInfo, GST_MAP_READ)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> GST_DEBUG("scheduling keyNeeded event");
</span><span class="cx"> // FIXME: Provide a somehow valid sessionId.
</span><span class="cx"> RefPtr<Uint8Array> initData = Uint8Array::create(reinterpret_cast<const unsigned char *>(mapInfo.data), mapInfo.size);
</span><span class="cx"> needKey(initData);
</span><ins>+#endif
+
</ins><span class="cx"> gst_buffer_unmap(data.get(), &mapInfo);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeWebKitClearKeyDecryptorGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitClearKeyDecryptorGStreamer.h"
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#if (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins><span class="cx">
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include <gcrypt.h>
</span><span class="lines">@@ -269,4 +269,4 @@
</span><span class="cx"> gcry_cipher_close(priv->handle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#endif // (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeWebKitClearKeyDecryptorGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#if (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins><span class="cx">
</span><span class="cx"> #include "WebKitCommonEncryptionDecryptorGStreamer.h"
</span><span class="cx">
</span><span class="lines">@@ -51,4 +51,4 @@
</span><span class="cx">
</span><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><del>-#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#endif // (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeWebKitCommonEncryptionDecryptorGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitCommonEncryptionDecryptorGStreamer.h"
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#if (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins><span class="cx">
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include <wtf/Condition.h>
</span><span class="lines">@@ -370,5 +370,4 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#endif // (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeWebKitCommonEncryptionDecryptorGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && USE(GSTREAMER)
</del><ins>+#if (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins><span class="cx">
</span><span class="cx"> #include <gst/base/gstbasetransform.h>
</span><span class="cx"> #include <gst/gst.h>
</span><span class="lines">@@ -62,4 +62,4 @@
</span><span class="cx">
</span><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><del>-#endif
</del><ins>+#endif // (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)) && USE(GSTREAMER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> GstStructure* structure = gst_caps_get_structure(m_demuxerSrcPadCaps.get(), 0);
</span><span class="cx"> bool sizeConfigured = false;
</span><span class="cx">
</span><del>-#if GST_CHECK_VERSION(1, 5, 3) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if GST_CHECK_VERSION(1, 5, 3) && (ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA))
</ins><span class="cx"> if (gst_structure_has_name(structure, "application/x-cenc")) {
</span><span class="cx"> // Any previous decryptor should have been removed from the pipeline by disconnectFromAppSinkFromStreamingThread()
</span><span class="cx"> ASSERT(!m_decryptor);
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> if (!parent)
</span><span class="cx"> gst_bin_add(GST_BIN(m_pipeline.get()), m_appsink.get());
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> if (m_decryptor) {
</span><span class="cx"> gst_object_ref(m_decryptor.get());
</span><span class="cx"> gst_bin_add(GST_BIN(m_pipeline.get()), m_decryptor.get());
</span><span class="lines">@@ -942,7 +942,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> gst_pad_link(demuxerSrcPad, appsinkSinkPad.get());
</span><span class="cx"> gst_element_sync_state_with_parent(m_appsink.get());
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> gst_element_set_state(m_pipeline.get(), GST_STATE_PAUSED);
</span><span class="lines">@@ -1032,7 +1032,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG("Disconnecting appsink");
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> if (m_decryptor) {
</span><span class="cx"> gst_element_unlink(m_decryptor.get(), m_appsink.get());
</span><span class="cx"> gst_element_unlink(m_demux.get(), m_decryptor.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamermseAppendPipelineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h (210131 => 210132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h 2016-12-23 09:11:32 UTC (rev 210131)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h 2016-12-23 09:15:07 UTC (rev 210132)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> GRefPtr<GstBus> m_bus;
</span><span class="cx"> GRefPtr<GstElement> m_appsrc;
</span><span class="cx"> GRefPtr<GstElement> m_demux;
</span><del>-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> GRefPtr<GstElement> m_decryptor;
</span><span class="cx"> #endif
</span><span class="cx"> // The demuxer has one src stream only, so only one appsink is needed and linked to it.
</span></span></pre>
</div>
</div>
</body>
</html>