Changeset 151203 in webkit

Timestamp:

Jun 5, 2013, 2:17:24 AM (12 years ago)

Author:

Philippe Normand

Message:

Unreviewed, GStreamer 0.10 build fix after r151175.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (8 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-05  Philippe Normand  <pnormand@igalia.com>
+
+        Unreviewed, GStreamer 0.10 build fix after r151175.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
+        (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
+        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
 2013-06-05  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -116 +116 @@
 #endif
 {
-    g_mutex_init(&m_bufferMutex);
+#if GLIB_CHECK_VERSION(2, 31, 0)
+    m_bufferMutex = WTF::fastNew<GMutex>();
+    g_mutex_init(m_bufferMutex);
+#else
+    m_bufferMutex = g_mutex_new();
+#endif
 }
 
@@ -123 +128 @@
     g_signal_handler_disconnect(m_webkitVideoSink.get(), m_repaintHandler);
 
-    g_mutex_clear(&m_bufferMutex);
+#if GLIB_CHECK_VERSION(2, 31, 0)
+    g_mutex_clear(m_bufferMutex);
+    WTF::fastDelete(m_bufferMutex);
+#else
+    g_mutex_free(m_bufferMutex);
+#endif
 
     if (m_buffer)
@@ -169 +179 @@
     GRefPtr<GstCaps> caps = webkitGstGetPadCaps(m_videoSinkPad.get());
 #else
-    g_mutex_lock(&m_bufferMutex);
+    g_mutex_lock(m_bufferMutex);
     GRefPtr<GstCaps> caps = m_buffer ? GST_BUFFER_CAPS(m_buffer) : 0;
-    g_mutex_unlock(&m_bufferMutex);
+    g_mutex_unlock(m_bufferMutex);
 #endif
     if (!caps)
@@ -359 +369 @@
 #endif
     {
-        g_mutex_lock(&m_bufferMutex);
+        g_mutex_lock(m_bufferMutex);
         gst_buffer_replace(&m_buffer, buffer);
-        g_mutex_unlock(&m_bufferMutex);
+        g_mutex_unlock(m_bufferMutex);
         m_player->repaint();
     }
@@ -384 +394 @@
         return;
 
-    g_mutex_lock(&m_bufferMutex);
+    g_mutex_lock(m_bufferMutex);
     if (!m_buffer) {
-        g_mutex_unlock(&m_bufferMutex);
+        g_mutex_unlock(m_bufferMutex);
         return;
     }
@@ -400 +410 @@
 #endif
     if (!caps) {
-        g_mutex_unlock(&m_bufferMutex);
+        g_mutex_unlock(m_bufferMutex);
         return;
     }
@@ -406 +416 @@
     RefPtr<ImageGStreamer> gstImage = ImageGStreamer::createImage(m_buffer, caps.get());
     if (!gstImage) {
-        g_mutex_unlock(&m_bufferMutex);
+        g_mutex_unlock(m_bufferMutex);
         return;
     }
@@ -412 +422 @@
     context->drawImage(reinterpret_cast<Image*>(gstImage->image().get()), ColorSpaceSRGB,
         rect, gstImage->rect(), CompositeCopy, DoNotRespectImageOrientation, false);
-    g_mutex_unlock(&m_bufferMutex);
+    g_mutex_unlock(m_bufferMutex);
 }
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

@@ -124 +124 @@
     MediaPlayer::NetworkState m_networkState;
     IntSize m_size;
-    GMutex m_bufferMutex;
+    GMutex* m_bufferMutex;
     GstBuffer* m_buffer;
 #if USE(NATIVE_FULLSCREEN_VIDEO)