<!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>[192102] 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/192102">192102</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-06 06:51:48 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Use MainThreadNotifier to send notifications to main thread in WebKitWebSourceGStreamer
https://bugs.webkit.org/show_bug.cgi?id=150890
Reviewed by Žan Doberšek.
Instead of the GThreadSafeMainLoopSources.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStop):
(webKitWebSrcChangeState):
(webKitWebSrcNeedData):
(webKitWebSrcEnoughData):
(webKitWebSrcSeek):
(StreamingClient::handleResponseReceived):
(StreamingClient::handleDataReceived):
(StreamingClient::handleNotifyFinished):
(webKitWebSrcFinalize): Deleted.
(webKitWebSrcSetProperty): Deleted.
(webKitWebSrcGetProperty): Deleted.
(webKitWebSrcSetExtraHeader): Deleted.
(webKitWebSrcStart): Deleted.
(webKitWebSrcGetProtocols): Deleted.
(webKitWebSrcGetUri): Deleted.
(webKitWebSrcSetUri): Deleted.
(webKitWebSrcUriHandlerInit): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192101 => 192102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-06 14:17:19 UTC (rev 192101)
+++ trunk/Source/WebCore/ChangeLog 2015-11-06 14:51:48 UTC (rev 192102)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-11-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GStreamer] Use MainThreadNotifier to send notifications to main thread in WebKitWebSourceGStreamer
+ https://bugs.webkit.org/show_bug.cgi?id=150890
+
+ Reviewed by Žan Doberšek.
+
+ Instead of the GThreadSafeMainLoopSources.
+
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcStop):
+ (webKitWebSrcChangeState):
+ (webKitWebSrcNeedData):
+ (webKitWebSrcEnoughData):
+ (webKitWebSrcSeek):
+ (StreamingClient::handleResponseReceived):
+ (StreamingClient::handleDataReceived):
+ (StreamingClient::handleNotifyFinished):
+ (webKitWebSrcFinalize): Deleted.
+ (webKitWebSrcSetProperty): Deleted.
+ (webKitWebSrcGetProperty): Deleted.
+ (webKitWebSrcSetExtraHeader): Deleted.
+ (webKitWebSrcStart): Deleted.
+ (webKitWebSrcGetProtocols): Deleted.
+ (webKitWebSrcGetUri): Deleted.
+ (webKitWebSrcSetUri): Deleted.
+ (webKitWebSrcUriHandlerInit): Deleted.
+
+2015-11-06 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GStreamer] Use MainThreadNotifier to send notifications to main thread in TrackPrivateGStreamer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150889
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (192101 => 192102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-11-06 14:17:19 UTC (rev 192101)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-11-06 14:51:48 UTC (rev 192102)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "GStreamerUtilities.h"
</span><span class="cx"> #include "GUniquePtrGStreamer.h"
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><ins>+#include "MainThreadNotifier.h"
</ins><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PlatformMediaResourceLoader.h"
</span><span class="lines">@@ -42,7 +43,6 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/glib/GMutexLocker.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><del>-#include <wtf/glib/GThreadSafeMainLoopSource.h>
</del><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -105,6 +105,14 @@
</span><span class="cx"> RefPtr<ResourceHandle> m_resource;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum MainThreadSourceNotification {
+ Start = 1 << 0,
+ Stop = 1 << 1,
+ NeedData = 1 << 2,
+ EnoughData = 1 << 3,
+ Seek = 1 << 4
+};
+
</ins><span class="cx"> #define WEBKIT_WEB_SRC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SRC, WebKitWebSrcPrivate))
</span><span class="cx"> struct _WebKitWebSrcPrivate {
</span><span class="cx"> GstAppSrc* appsrc;
</span><span class="lines">@@ -126,16 +134,11 @@
</span><span class="cx"> guint64 size;
</span><span class="cx"> gboolean seekable;
</span><span class="cx"> gboolean paused;
</span><ins>+ bool isSeeking;
</ins><span class="cx">
</span><span class="cx"> guint64 requestedOffset;
</span><span class="cx">
</span><del>- gboolean pendingStart;
- GThreadSafeMainLoopSource startSource;
- GThreadSafeMainLoopSource stopSource;
- GThreadSafeMainLoopSource needDataSource;
- GThreadSafeMainLoopSource enoughDataSource;
- GThreadSafeMainLoopSource seekSource;
-
</del><ins>+ MainThreadNotifier<MainThreadSourceNotification> notifier;
</ins><span class="cx"> GRefPtr<GstBuffer> buffer;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -166,15 +169,61 @@
</span><span class="cx">
</span><span class="cx"> static gboolean webKitWebSrcQueryWithParent(GstPad*, GstObject*, GstQuery*);
</span><span class="cx">
</span><del>-static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData);
-static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData);
-static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer userData);
</del><ins>+static void webKitWebSrcNeedData(WebKitWebSrc*);
+static void webKitWebSrcEnoughData(WebKitWebSrc*);
+static void webKitWebSrcSeek(WebKitWebSrc*);
</ins><span class="cx">
</span><span class="cx"> static GstAppSrcCallbacks appsrcCallbacks = {
</span><del>- webKitWebSrcNeedDataCb,
- webKitWebSrcEnoughDataCb,
- webKitWebSrcSeekDataCb,
- { 0 }
</del><ins>+ // need_data
+ [](GstAppSrc*, guint, gpointer userData) {
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ {
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ if (!priv->paused)
+ return;
+ }
+
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->notifier.notify(MainThreadSourceNotification::NeedData, [protector] { webKitWebSrcNeedData(protector.get()); });
+ },
+ // enough_data
+ [](GstAppSrc*, gpointer userData) {
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ {
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ if (priv->paused)
+ return;
+ }
+
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->notifier.notify(MainThreadSourceNotification::EnoughData, [protector] { webKitWebSrcEnoughData(protector.get()); });
+ },
+ // seek_data
+ [](GstAppSrc*, guint64 offset, gpointer userData) -> gboolean {
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ {
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ if (offset == priv->offset && priv->requestedOffset == priv->offset)
+ return TRUE;
+
+ if (!priv->seekable)
+ return FALSE;
+
+ priv->isSeeking = true;
+ priv->requestedOffset = offset;
+ }
+
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->notifier.notify(MainThreadSourceNotification::Seek, [protector] { webKitWebSrcSeek(protector.get()); });
+ return TRUE;
+ },
+ { nullptr }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define webkit_web_src_parent_class parent_class
</span><span class="lines">@@ -358,17 +407,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void removeTimeoutSources(WebKitWebSrc* src)
-{
- WebKitWebSrcPrivate* priv = src->priv;
-
- if (!priv->pendingStart)
- priv->startSource.cancel();
- priv->needDataSource.cancel();
- priv->enoughDataSource.cancel();
- priv->seekSource.cancel();
-}
-
</del><span class="cx"> static void webKitWebSrcStop(WebKitWebSrc* src)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="lines">@@ -377,9 +415,9 @@
</span><span class="cx">
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="cx">
</span><del>- bool seeking = priv->seekSource.isActive();
</del><ins>+ bool wasSeeking = std::exchange(priv->isSeeking, false);
</ins><span class="cx">
</span><del>- removeTimeoutSources(src);
</del><ins>+ priv->notifier.cancelPendingNotifications(MainThreadSourceNotification::NeedData | MainThreadSourceNotification::EnoughData | MainThreadSourceNotification::Seek);
</ins><span class="cx">
</span><span class="cx"> if (priv->client) {
</span><span class="cx"> delete priv->client;
</span><span class="lines">@@ -399,7 +437,7 @@
</span><span class="cx"> priv->offset = 0;
</span><span class="cx"> priv->seekable = FALSE;
</span><span class="cx">
</span><del>- if (!seeking) {
</del><ins>+ if (!wasSeeking) {
</ins><span class="cx"> priv->size = 0;
</span><span class="cx"> priv->requestedOffset = 0;
</span><span class="cx"> priv->player = 0;
</span><span class="lines">@@ -409,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> if (priv->appsrc) {
</span><span class="cx"> gst_app_src_set_caps(priv->appsrc, 0);
</span><del>- if (!seeking)
</del><ins>+ if (!wasSeeking)
</ins><span class="cx"> gst_app_src_set_size(priv->appsrc, -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -475,7 +513,6 @@
</span><span class="cx">
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="cx">
</span><del>- priv->pendingStart = FALSE;
</del><span class="cx"> priv->didPassAccessControlCheck = false;
</span><span class="cx">
</span><span class="cx"> if (!priv->uri) {
</span><span class="lines">@@ -591,26 +628,20 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><span class="cx"> switch (transition) {
</span><span class="cx"> case GST_STATE_CHANGE_READY_TO_PAUSED:
</span><span class="cx"> {
</span><span class="cx"> GST_DEBUG_OBJECT(src, "READY->PAUSED");
</span><del>- priv->pendingStart = TRUE;
</del><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><del>- priv->startSource.schedule("[WebKit] webKitWebSrcStart",
- std::function<void()>([protector] { webKitWebSrcStart(protector.get()); }));
</del><ins>+ priv->notifier.notify(MainThreadSourceNotification::Start, [protector] { webKitWebSrcStart(protector.get()); });
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GST_STATE_CHANGE_PAUSED_TO_READY:
</span><span class="cx"> {
</span><span class="cx"> GST_DEBUG_OBJECT(src, "PAUSED->READY");
</span><del>- priv->pendingStart = FALSE;
- // cancel pending sources
- removeTimeoutSources(src);
</del><ins>+ priv->notifier.cancelPendingNotifications();
</ins><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><del>- priv->stopSource.schedule("[WebKit] webKitWebSrcStop",
- std::function<void()>([protector] { webKitWebSrcStop(protector.get()); }));
</del><ins>+ priv->notifier.notify(MainThreadSourceNotification::Stop, [protector] { webKitWebSrcStop(protector.get()); });
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -737,100 +768,54 @@
</span><span class="cx">
</span><span class="cx"> // appsrc callbacks
</span><span class="cx">
</span><del>-static void webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
</del><ins>+static void webKitWebSrcNeedData(WebKitWebSrc* src)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
- priv->paused = FALSE;
- locker.unlock();
</del><ins>+ GST_DEBUG_OBJECT(src, "Need more data");
</ins><span class="cx">
</span><ins>+ {
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ priv->paused = FALSE;
+ }
+
</ins><span class="cx"> if (priv->client)
</span><span class="cx"> priv->client->setDefersLoading(false);
</span><span class="cx"> if (priv->loader)
</span><span class="cx"> priv->loader->setDefersLoading(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
</del><ins>+static void webKitWebSrcEnoughData(WebKitWebSrc* src)
</ins><span class="cx"> {
</span><del>- WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
</del><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><del>- GST_DEBUG_OBJECT(src, "Need more data: %u", length);
-
- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
- if (priv->needDataSource.isScheduled() || !priv->paused)
- return;
-
- GRefPtr<WebKitWebSrc> protector(src);
- priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb",
- std::function<void()>([protector] { webKitWebSrcNeedDataMainCb(protector.get()); }));
-}
-
-static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
-{
- WebKitWebSrcPrivate* priv = src->priv;
-
</del><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
- priv->paused = TRUE;
- locker.unlock();
</del><ins>+ GST_DEBUG_OBJECT(src, "Have enough data");
</ins><span class="cx">
</span><ins>+ {
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ priv->paused = TRUE;
+ }
+
</ins><span class="cx"> if (priv->client)
</span><span class="cx"> priv->client->setDefersLoading(true);
</span><span class="cx"> if (priv->loader)
</span><span class="cx"> priv->loader->setDefersLoading(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
</del><ins>+static void webKitWebSrcSeek(WebKitWebSrc* src)
</ins><span class="cx"> {
</span><del>- WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
- WebKitWebSrcPrivate* priv = src->priv;
-
- GST_DEBUG_OBJECT(src, "Have enough data");
-
- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
- if (priv->enoughDataSource.isScheduled() || priv->paused)
- return;
-
- GRefPtr<WebKitWebSrc> protector(src);
- priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb",
- std::function<void()>([protector] { webKitWebSrcEnoughDataMainCb(protector.get()); }));
-}
-
-static void webKitWebSrcSeekMainCb(WebKitWebSrc* src)
-{
</del><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><ins>+ GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, src->priv->requestedOffset);
+
</ins><span class="cx"> webKitWebSrcStop(src);
</span><span class="cx"> webKitWebSrcStart(src);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer userData)
-{
- WebKitWebSrc* src = WEBKIT_WEB_SRC(userData);
- WebKitWebSrcPrivate* priv = src->priv;
-
- GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
- WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
- if (offset == priv->offset && priv->requestedOffset == priv->offset)
- return TRUE;
-
- if (!priv->seekable)
- return FALSE;
-
- GST_DEBUG_OBJECT(src, "Doing range-request seek");
- priv->requestedOffset = offset;
-
- GRefPtr<WebKitWebSrc> protector(src);
- priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb",
- std::function<void()>([protector] { webKitWebSrcSeekMainCb(WEBKIT_WEB_SRC(protector.get())); }));
- return TRUE;
-}
-
</del><span class="cx"> void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(player);
</span><span class="lines">@@ -888,7 +873,7 @@
</span><span class="cx">
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="cx">
</span><del>- if (priv->seekSource.isActive()) {
</del><ins>+ if (priv->isSeeking) {
</ins><span class="cx"> GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -940,7 +925,7 @@
</span><span class="cx"> if (priv->buffer)
</span><span class="cx"> unmapGstBuffer(priv->buffer.get());
</span><span class="cx">
</span><del>- if (priv->seekSource.isActive()) {
</del><ins>+ if (priv->isSeeking) {
</ins><span class="cx"> GST_DEBUG_OBJECT(src, "Seek in progress, ignoring data");
</span><span class="cx"> priv->buffer.clear();
</span><span class="cx"> return;
</span><span class="lines">@@ -1001,7 +986,7 @@
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Have EOS");
</span><span class="cx">
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><del>- if (!priv->seekSource.isActive()) {
</del><ins>+ if (!priv->isSeeking) {
</ins><span class="cx"> locker.unlock();
</span><span class="cx"> gst_app_src_end_of_stream(priv->appsrc);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>