1 --- efl-webkit/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2013-12-18 13:27:22.000000000 +0100
2 +++ efl-webkit/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-11 21:52:28.072260360 +0200
4 WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
5 WebKitVideoSinkPrivate* priv = sink->priv;
7 - GMutexLocker lock(priv->bufferMutex);
8 + WebCore::GMutexLocker lock(priv->bufferMutex);
9 GstBuffer* buffer = priv->buffer;
13 WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
14 WebKitVideoSinkPrivate* priv = sink->priv;
16 - GMutexLocker lock(priv->bufferMutex);
17 + WebCore::GMutexLocker lock(priv->bufferMutex);
23 static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
25 - GMutexLocker lock(priv->bufferMutex);
26 + WebCore::GMutexLocker lock(priv->bufferMutex);
29 gst_buffer_unref(priv->buffer);
31 WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
34 - GMutexLocker lock(priv->bufferMutex);
35 + WebCore::GMutexLocker lock(priv->bufferMutex);
36 priv->unlocked = false;
41 WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
43 - GMutexLocker lock(priv->bufferMutex);
44 + WebCore::GMutexLocker lock(priv->bufferMutex);
45 priv->unlocked = false;
48 --- efl-webkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2014-01-29 00:06:51.000000000 +0100
49 +++ efl-webkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-11 21:52:40.316229122 +0200
53 case PROP_IRADIO_MODE: {
54 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
55 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
56 priv->iradioMode = g_value_get_boolean(value);
60 WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
61 WebKitWebSrcPrivate* priv = src->priv;
63 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
64 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
66 case PROP_IRADIO_MODE:
67 g_value_set_boolean(value, priv->iradioMode);
70 ASSERT(isMainThread());
72 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
73 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
75 bool seeking = priv->seekID;
79 ASSERT(isMainThread());
81 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
82 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
90 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
91 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
93 case GST_STATE_CHANGE_READY_TO_PAUSED:
94 GST_DEBUG_OBJECT(src, "READY->PAUSED");
96 gst_query_parse_duration(query, &format, NULL);
98 GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
99 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
100 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
101 if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
102 gst_query_set_duration(query, format, src->priv->size);
107 case GST_QUERY_URI: {
108 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
109 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
110 gst_query_set_uri(query, src->priv->uri);
114 WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
117 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
118 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
119 ret = g_strdup(src->priv->uri);
126 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
127 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
133 ASSERT(isMainThread());
135 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
136 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
138 if (!priv->needDataID)
142 GST_DEBUG_OBJECT(src, "Need more data: %u", length);
144 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
145 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
146 if (priv->needDataID || !priv->paused) {
151 ASSERT(isMainThread());
153 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
154 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
156 if (!priv->enoughDataID)
160 GST_DEBUG_OBJECT(src, "Have enough data");
162 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
163 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
164 if (priv->enoughDataID || priv->paused) {
169 ASSERT(isMainThread());
171 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
172 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
177 WebKitWebSrcPrivate* priv = src->priv;
179 GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
180 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
181 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
182 if (offset == priv->offset && priv->requestedOffset == priv->offset)
186 void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
189 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
190 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
191 src->priv->player = player;
196 mapGstBuffer(buffer);
198 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
199 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
200 priv->buffer = adoptGRef(buffer);
207 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
208 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
211 GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
213 WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
214 WebKitWebSrcPrivate* priv = src->priv;
216 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
217 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
219 GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
221 @@ -1011,7 +1011,7 @@
223 GST_DEBUG_OBJECT(src, "Have EOS");
225 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
226 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
229 gst_app_src_end_of_stream(priv->appsrc);
230 @@ -1156,7 +1156,7 @@
232 GST_ERROR_OBJECT(src, "Request was blocked");
234 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
235 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
236 uri.reset(g_strdup(src->priv->uri));
239 @@ -1170,7 +1170,7 @@
241 GST_ERROR_OBJECT(src, "Cannot show URL");
243 - GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
244 + WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
245 uri.reset(g_strdup(src->priv->uri));