<!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>[192101] 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/192101">192101</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-06 06:17:19 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Use MainThreadNotifier to send notifications to main thread in TrackPrivateGStreamer
https://bugs.webkit.org/show_bug.cgi?id=150889
Reviewed by Žan Doberšek.
Instead of the GThreadSafeMainLoopSources.
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
(WebCore::InbandTextTrackPrivateGStreamer::InbandTextTrackPrivateGStreamer):
(WebCore::InbandTextTrackPrivateGStreamer::handleSample):
(WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer):
(WebCore::TrackPrivateBaseGStreamer::disconnect):
(WebCore::TrackPrivateBaseGStreamer::activeChangedCallback):
(WebCore::TrackPrivateBaseGStreamer::tagsChangedCallback):
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):
(WebCore::TrackPrivateBaseGStreamer::~TrackPrivateBaseGStreamer): Deleted.
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged): Deleted.
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192100 => 192101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-06 13:07:32 UTC (rev 192100)
+++ trunk/Source/WebCore/ChangeLog 2015-11-06 14:17:19 UTC (rev 192101)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-11-06 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GStreamer] Use MainThreadNotifier to send notifications to main thread in TrackPrivateGStreamer
+ https://bugs.webkit.org/show_bug.cgi?id=150889
+
+ Reviewed by Žan Doberšek.
+
+ Instead of the GThreadSafeMainLoopSources.
+
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
+ (WebCore::InbandTextTrackPrivateGStreamer::InbandTextTrackPrivateGStreamer):
+ (WebCore::InbandTextTrackPrivateGStreamer::handleSample):
+ (WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer):
+ (WebCore::TrackPrivateBaseGStreamer::disconnect):
+ (WebCore::TrackPrivateBaseGStreamer::activeChangedCallback):
+ (WebCore::TrackPrivateBaseGStreamer::tagsChangedCallback):
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
+ (WebCore::TrackPrivateBaseGStreamer::~TrackPrivateBaseGStreamer): Deleted.
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged): Deleted.
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:
+
</ins><span class="cx"> 2015-11-06 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Suppress deprecated-declarations warning in WebCore/platform/URL.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp (192100 => 192101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-11-06 13:07:32 UTC (rev 192100)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-11-06 14:17:19 UTC (rev 192101)
</span><span class="lines">@@ -39,24 +39,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static GstPadProbeReturn textTrackPrivateEventCallback(GstPad*, GstPadProbeInfo* info, InbandTextTrackPrivateGStreamer* track)
-{
- GstEvent* event = gst_pad_probe_info_get_event(info);
- switch (GST_EVENT_TYPE(event)) {
- case GST_EVENT_STREAM_START:
- track->streamChanged();
- break;
- default:
- break;
- }
- return GST_PAD_PROBE_OK;
-}
-
</del><span class="cx"> InbandTextTrackPrivateGStreamer::InbandTextTrackPrivateGStreamer(gint index, GRefPtr<GstPad> pad)
</span><span class="cx"> : InbandTextTrackPrivate(WebVTT), TrackPrivateBaseGStreamer(this, index, pad)
</span><span class="cx"> {
</span><del>- m_eventProbe = gst_pad_add_probe(m_pad.get(), GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
- reinterpret_cast<GstPadProbeCallback>(textTrackPrivateEventCallback), this, 0);
</del><ins>+ m_eventProbe = gst_pad_add_probe(m_pad.get(), GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, [] (GstPad*, GstPadProbeInfo* info, gpointer userData) -> GstPadProbeReturn {
+ auto* track = static_cast<InbandTextTrackPrivateGStreamer*>(userData);
+ switch (GST_EVENT_TYPE(gst_pad_probe_info_get_event(info))) {
+ case GST_EVENT_STREAM_START:
+ track->streamChanged();
+ break;
+ default:
+ break;
+ }
+ return GST_PAD_PROBE_OK;
+ }, this, nullptr);
</ins><span class="cx">
</span><span class="cx"> notifyTrackOfStreamChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -68,29 +64,24 @@
</span><span class="cx">
</span><span class="cx"> gst_pad_remove_probe(m_pad.get(), m_eventProbe);
</span><span class="cx">
</span><del>- m_streamTimerHandler.cancel();
-
</del><span class="cx"> TrackPrivateBaseGStreamer::disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::handleSample(GRefPtr<GstSample> sample)
</span><span class="cx"> {
</span><del>- m_sampleTimerHandler.cancel();
</del><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_sampleMutex);
</span><span class="cx"> m_pendingSamples.append(sample);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
</span><del>- m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample",
- std::function<void()>([protector] { protector->notifyTrackOfSample(); }));
</del><ins>+ m_notifier.notify(MainThreadNotification::NewSample, [protector] { protector->notifyTrackOfSample(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::streamChanged()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
</span><del>- m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged",
- std::function<void()>([protector] { protector->notifyTrackOfStreamChanged(); }));
</del><ins>+ m_notifier.notify(MainThreadNotification::StreamChanged, [protector] { protector->notifyTrackOfStreamChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::notifyTrackOfSample()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h (192100 => 192101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2015-11-06 13:07:32 UTC (rev 192100)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2015-11-06 14:17:19 UTC (rev 192101)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "TrackPrivateBaseGStreamer.h"
</span><span class="cx"> #include <wtf/Lock.h>
</span><del>-#include <wtf/glib/GThreadSafeMainLoopSource.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,16 +54,15 @@
</span><span class="cx"> String streamId() const { return m_streamId; }
</span><span class="cx">
</span><span class="cx"> void handleSample(GRefPtr<GstSample>);
</span><ins>+
+private:
+ InbandTextTrackPrivateGStreamer(gint index, GRefPtr<GstPad>);
+
</ins><span class="cx"> void streamChanged();
</span><span class="cx">
</span><span class="cx"> void notifyTrackOfSample();
</span><span class="cx"> void notifyTrackOfStreamChanged();
</span><span class="cx">
</span><del>-private:
- InbandTextTrackPrivateGStreamer(gint index, GRefPtr<GstPad>);
-
- GThreadSafeMainLoopSource m_sampleTimerHandler;
- GThreadSafeMainLoopSource m_streamTimerHandler;
</del><span class="cx"> gulong m_eventProbe;
</span><span class="cx"> Vector<GRefPtr<GstSample> > m_pendingSamples;
</span><span class="cx"> String m_streamId;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (192100 => 192101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-11-06 13:07:32 UTC (rev 192100)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-11-06 14:17:19 UTC (rev 192101)
</span><span class="lines">@@ -43,16 +43,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void trackPrivateActiveChangedCallback(GObject*, GParamSpec*, TrackPrivateBaseGStreamer* track)
-{
- track->activeChanged();
-}
-
-static void trackPrivateTagsChangedCallback(GObject*, GParamSpec*, TrackPrivateBaseGStreamer* track)
-{
- track->tagsChanged();
-}
-
</del><span class="cx"> TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer(TrackPrivateBase* owner, gint index, GRefPtr<GstPad> pad)
</span><span class="cx"> : m_index(index)
</span><span class="cx"> , m_pad(pad)
</span><span class="lines">@@ -60,8 +50,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pad);
</span><span class="cx">
</span><del>- g_signal_connect(m_pad.get(), "notify::active", G_CALLBACK(trackPrivateActiveChangedCallback), this);
- g_signal_connect(m_pad.get(), "notify::tags", G_CALLBACK(trackPrivateTagsChangedCallback), this);
</del><ins>+ g_signal_connect_swapped(m_pad.get(), "notify::active", G_CALLBACK(activeChangedCallback), this);
+ g_signal_connect_swapped(m_pad.get(), "notify::tags", G_CALLBACK(tagsChangedCallback), this);
</ins><span class="cx">
</span><span class="cx"> // We can't call notifyTrackOfTagsChanged() directly, because we need tagsChanged()
</span><span class="cx"> // to setup m_tags.
</span><span class="lines">@@ -78,37 +68,33 @@
</span><span class="cx"> if (!m_pad)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- g_signal_handlers_disconnect_by_func(m_pad.get(),
- reinterpret_cast<gpointer>(trackPrivateActiveChangedCallback), this);
- g_signal_handlers_disconnect_by_func(m_pad.get(),
- reinterpret_cast<gpointer>(trackPrivateTagsChangedCallback), this);
</del><ins>+ m_notifier.cancelPendingNotifications();
+ g_signal_handlers_disconnect_matched(m_pad.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
</ins><span class="cx">
</span><del>- m_activeTimerHandler.cancel();
- m_tagTimerHandler.cancel();
-
</del><span class="cx"> m_pad.clear();
</span><span class="cx"> m_tags.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TrackPrivateBaseGStreamer::activeChanged()
</del><ins>+void TrackPrivateBaseGStreamer::activeChangedCallback(TrackPrivateBaseGStreamer* track)
</ins><span class="cx"> {
</span><del>- m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged",
- std::function<void()>([this] { notifyTrackOfActiveChanged(); }));
</del><ins>+ track->m_notifier.notify(MainThreadNotification::ActiveChanged, [track] { track->notifyTrackOfActiveChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void TrackPrivateBaseGStreamer::tagsChanged()
</del><ins>+void TrackPrivateBaseGStreamer::tagsChangedCallback(TrackPrivateBaseGStreamer* track)
</ins><span class="cx"> {
</span><del>- m_tagTimerHandler.cancel();
</del><ins>+ track->tagsChanged();
+}
</ins><span class="cx">
</span><ins>+void TrackPrivateBaseGStreamer::tagsChanged()
+{
</ins><span class="cx"> GRefPtr<GstTagList> tags;
</span><del>- g_object_get(m_pad.get(), "tags", &tags.outPtr(), NULL);
</del><ins>+ g_object_get(m_pad.get(), "tags", &tags.outPtr(), nullptr);
</ins><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_tagMutex);
</span><span class="cx"> m_tags.swap(tags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged",
- std::function<void()>([this] { notifyTrackOfTagsChanged(); }));
</del><ins>+ m_notifier.notify(MainThreadNotification::TagsChanged, [this] { notifyTrackOfTagsChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h (192100 => 192101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2015-11-06 13:07:32 UTC (rev 192100)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2015-11-06 14:17:19 UTC (rev 192101)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><ins>+#include "MainThreadNotifier.h"
</ins><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><del>-#include <wtf/glib/GThreadSafeMainLoopSource.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -50,15 +50,20 @@
</span><span class="cx">
</span><span class="cx"> void setIndex(int index) { m_index = index; }
</span><span class="cx">
</span><del>- void activeChanged();
- void tagsChanged();
</del><ins>+protected:
+ TrackPrivateBaseGStreamer(TrackPrivateBase* owner, gint index, GRefPtr<GstPad>);
</ins><span class="cx">
</span><span class="cx"> void notifyTrackOfActiveChanged();
</span><span class="cx"> void notifyTrackOfTagsChanged();
</span><span class="cx">
</span><del>-protected:
- TrackPrivateBaseGStreamer(TrackPrivateBase* owner, gint index, GRefPtr<GstPad>);
</del><ins>+ enum MainThreadNotification {
+ ActiveChanged = 1 << 0,
+ TagsChanged = 1 << 1,
+ NewSample = 1 << 2,
+ StreamChanged = 1 << 3
+ };
</ins><span class="cx">
</span><ins>+ MainThreadNotifier<MainThreadNotification> m_notifier;
</ins><span class="cx"> gint m_index;
</span><span class="cx"> AtomicString m_label;
</span><span class="cx"> AtomicString m_language;
</span><span class="lines">@@ -70,10 +75,12 @@
</span><span class="cx"> template<class StringType>
</span><span class="cx"> bool getTag(GstTagList* tags, const gchar* tagName, StringType& value);
</span><span class="cx">
</span><ins>+ static void activeChangedCallback(TrackPrivateBaseGStreamer*);
+ static void tagsChangedCallback(TrackPrivateBaseGStreamer*);
+
+ void tagsChanged();
+
</ins><span class="cx"> TrackPrivateBase* m_owner;
</span><del>- GThreadSafeMainLoopSource m_activeTimerHandler;
- GThreadSafeMainLoopSource m_tagTimerHandler;
-
</del><span class="cx"> Lock m_tagMutex;
</span><span class="cx"> GRefPtr<GstTagList> m_tags;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>