Changeset 151203 in webkit


Ignore:
Timestamp:
Jun 5, 2013 2:17:24 AM (11 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r151202 r151203  
     12013-06-05  Philippe Normand  <pnormand@igalia.com>
     2
     3        Unreviewed, GStreamer 0.10 build fix after r151175.
     4
     5        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     6        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
     7        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
     8        (WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
     9        (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
     10        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
     11        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
     12
    1132013-06-05  Mihnea Ovidenie  <mihnea@adobe.com>
    214
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r151175 r151203  
    116116#endif
    117117{
    118     g_mutex_init(&m_bufferMutex);
     118#if GLIB_CHECK_VERSION(2, 31, 0)
     119    m_bufferMutex = WTF::fastNew<GMutex>();
     120    g_mutex_init(m_bufferMutex);
     121#else
     122    m_bufferMutex = g_mutex_new();
     123#endif
    119124}
    120125
     
    123128    g_signal_handler_disconnect(m_webkitVideoSink.get(), m_repaintHandler);
    124129
    125     g_mutex_clear(&m_bufferMutex);
     130#if GLIB_CHECK_VERSION(2, 31, 0)
     131    g_mutex_clear(m_bufferMutex);
     132    WTF::fastDelete(m_bufferMutex);
     133#else
     134    g_mutex_free(m_bufferMutex);
     135#endif
    126136
    127137    if (m_buffer)
     
    169179    GRefPtr<GstCaps> caps = webkitGstGetPadCaps(m_videoSinkPad.get());
    170180#else
    171     g_mutex_lock(&m_bufferMutex);
     181    g_mutex_lock(m_bufferMutex);
    172182    GRefPtr<GstCaps> caps = m_buffer ? GST_BUFFER_CAPS(m_buffer) : 0;
    173     g_mutex_unlock(&m_bufferMutex);
     183    g_mutex_unlock(m_bufferMutex);
    174184#endif
    175185    if (!caps)
     
    359369#endif
    360370    {
    361         g_mutex_lock(&m_bufferMutex);
     371        g_mutex_lock(m_bufferMutex);
    362372        gst_buffer_replace(&m_buffer, buffer);
    363         g_mutex_unlock(&m_bufferMutex);
     373        g_mutex_unlock(m_bufferMutex);
    364374        m_player->repaint();
    365375    }
     
    384394        return;
    385395
    386     g_mutex_lock(&m_bufferMutex);
     396    g_mutex_lock(m_bufferMutex);
    387397    if (!m_buffer) {
    388         g_mutex_unlock(&m_bufferMutex);
     398        g_mutex_unlock(m_bufferMutex);
    389399        return;
    390400    }
     
    400410#endif
    401411    if (!caps) {
    402         g_mutex_unlock(&m_bufferMutex);
     412        g_mutex_unlock(m_bufferMutex);
    403413        return;
    404414    }
     
    406416    RefPtr<ImageGStreamer> gstImage = ImageGStreamer::createImage(m_buffer, caps.get());
    407417    if (!gstImage) {
    408         g_mutex_unlock(&m_bufferMutex);
     418        g_mutex_unlock(m_bufferMutex);
    409419        return;
    410420    }
     
    412422    context->drawImage(reinterpret_cast<Image*>(gstImage->image().get()), ColorSpaceSRGB,
    413423        rect, gstImage->rect(), CompositeCopy, DoNotRespectImageOrientation, false);
    414     g_mutex_unlock(&m_bufferMutex);
     424    g_mutex_unlock(m_bufferMutex);
    415425}
    416426
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

    r151175 r151203  
    124124    MediaPlayer::NetworkState m_networkState;
    125125    IntSize m_size;
    126     GMutex m_bufferMutex;
     126    GMutex* m_bufferMutex;
    127127    GstBuffer* m_buffer;
    128128#if USE(NATIVE_FULLSCREEN_VIDEO)
Note: See TracChangeset for help on using the changeset viewer.