Lines 1-200
Link Here
|
1 |
--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-02-12 01:22:42.081133000 +0100 |
|
|
2 |
+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-12 01:25:08.298076000 +0100 |
3 |
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj |
4 |
|
5 |
switch (propID) { |
6 |
case PROP_IRADIO_MODE: { |
7 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
8 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
9 |
priv->iradioMode = g_value_get_boolean(value); |
10 |
break; |
11 |
} |
12 |
@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj |
13 |
WebKitWebSrc* src = WEBKIT_WEB_SRC(object); |
14 |
WebKitWebSrcPrivate* priv = src->priv; |
15 |
|
16 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
17 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
18 |
switch (propID) { |
19 |
case PROP_IRADIO_MODE: |
20 |
g_value_set_boolean(value, priv->iradioMode); |
21 |
@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW |
22 |
|
23 |
ASSERT(isMainThread()); |
24 |
|
25 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
26 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
27 |
|
28 |
bool seeking = priv->seekID; |
29 |
|
30 |
@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit |
31 |
|
32 |
ASSERT(isMainThread()); |
33 |
|
34 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
35 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
36 |
|
37 |
priv->startID = 0; |
38 |
priv->corsAccessCheck = CORSNoCheck; |
39 |
@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc |
40 |
return ret; |
41 |
} |
42 |
|
43 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
44 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
45 |
switch (transition) { |
46 |
case GST_STATE_CHANGE_READY_TO_PAUSED: |
47 |
GST_DEBUG_OBJECT(src, "READY->PAUSED"); |
48 |
@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar |
49 |
gst_query_parse_duration(query, &format, NULL); |
50 |
|
51 |
GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); |
52 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
53 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
54 |
if (format == GST_FORMAT_BYTES && src->priv->size > 0) { |
55 |
gst_query_set_duration(query, format, src->priv->size); |
56 |
result = TRUE; |
57 |
@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar |
58 |
break; |
59 |
} |
60 |
case GST_QUERY_URI: { |
61 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
62 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
63 |
gst_query_set_uri(query, src->priv->uri); |
64 |
result = TRUE; |
65 |
break; |
66 |
@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH |
67 |
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); |
68 |
gchar* ret; |
69 |
|
70 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
71 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
72 |
ret = g_strdup(src->priv->uri); |
73 |
return ret; |
74 |
} |
75 |
@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR |
76 |
return FALSE; |
77 |
} |
78 |
|
79 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
80 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
81 |
|
82 |
g_free(priv->uri); |
83 |
priv->uri = 0; |
84 |
@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain |
85 |
|
86 |
ASSERT(isMainThread()); |
87 |
|
88 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
89 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
90 |
// already stopped |
91 |
if (!priv->needDataID) |
92 |
return FALSE; |
93 |
@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp |
94 |
|
95 |
GST_DEBUG_OBJECT(src, "Need more data: %u", length); |
96 |
|
97 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
98 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
99 |
if (priv->needDataID || !priv->paused) { |
100 |
return; |
101 |
} |
102 |
@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa |
103 |
|
104 |
ASSERT(isMainThread()); |
105 |
|
106 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
107 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
108 |
// already stopped |
109 |
if (!priv->enoughDataID) |
110 |
return FALSE; |
111 |
@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst |
112 |
|
113 |
GST_DEBUG_OBJECT(src, "Have enough data"); |
114 |
|
115 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
116 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
117 |
if (priv->enoughDataID || priv->paused) { |
118 |
return; |
119 |
} |
120 |
@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W |
121 |
|
122 |
ASSERT(isMainThread()); |
123 |
|
124 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
125 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
126 |
// already stopped |
127 |
if (!priv->seekID) |
128 |
return FALSE; |
129 |
@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G |
130 |
WebKitWebSrcPrivate* priv = src->priv; |
131 |
|
132 |
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); |
133 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
134 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
135 |
if (offset == priv->offset && priv->requestedOffset == priv->offset) |
136 |
return TRUE; |
137 |
|
138 |
@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G |
139 |
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) |
140 |
{ |
141 |
ASSERT(player); |
142 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
143 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
144 |
src->priv->player = player; |
145 |
} |
146 |
|
147 |
@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer( |
148 |
|
149 |
mapGstBuffer(buffer); |
150 |
|
151 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
152 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
153 |
priv->buffer = adoptGRef(buffer); |
154 |
locker.unlock(); |
155 |
|
156 |
@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece |
157 |
return; |
158 |
} |
159 |
|
160 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
161 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
162 |
|
163 |
priv->corsAccessCheck = corsAccessCheck; |
164 |
|
165 |
@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived |
166 |
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); |
167 |
WebKitWebSrcPrivate* priv = src->priv; |
168 |
|
169 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
170 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
171 |
|
172 |
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length); |
173 |
|
174 |
@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish |
175 |
|
176 |
GST_DEBUG_OBJECT(src, "Have EOS"); |
177 |
|
178 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
179 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
180 |
if (!priv->seekID) { |
181 |
locker.unlock(); |
182 |
gst_app_src_end_of_stream(priv->appsrc); |
183 |
@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB |
184 |
|
185 |
GST_ERROR_OBJECT(src, "Request was blocked"); |
186 |
|
187 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
188 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
189 |
uri.reset(g_strdup(src->priv->uri)); |
190 |
locker.unlock(); |
191 |
|
192 |
@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann |
193 |
|
194 |
GST_ERROR_OBJECT(src, "Cannot show URL"); |
195 |
|
196 |
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
197 |
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); |
198 |
uri.reset(g_strdup(src->priv->uri)); |
199 |
locker.unlock(); |
200 |
|