Changeset 125041 in webkit


Ignore:
Timestamp:
Aug 8, 2012 9:52:20 AM (12 years ago)
Author:
Philippe Normand
Message:

[GStreamer] 0.11 build broken (again)
​https://bugs.webkit.org/show_bug.cgi?id=93474

Reviewed by Martin Robinson.

.:

  • configure.ac: Disable media-stream build if GStreamer 0.11

support is enabled, due to farstream-0.1 still messing up with
gstreamer-0.10 include path.

Source/WebCore:

Adapt the GStreamer media player backend to the latest GStreamer
0.11 API changes.

  • platform/graphics/gstreamer/GRefPtrGStreamer.cpp:

(WTF::adoptGRef):

  • platform/graphics/gstreamer/GStreamerVersioning.cpp:

(gstObjectIsFloating):

  • platform/graphics/gstreamer/GStreamerVersioning.h:
  • platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(StreamingClient::didReceiveResponse):

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r124989 r125041  
     12012-08-08  Philippe Normand  <pnormand@igalia.com>
     2
     3        [GStreamer] 0.11 build broken (again)
     4        https://bugs.webkit.org/show_bug.cgi?id=93474
     5
     6        Reviewed by Martin Robinson.
     7
     8        * configure.ac: Disable media-stream build if GStreamer 0.11
     9        support is enabled, due to farstream-0.1 still messing up with
     10        gstreamer-0.10 include path.
     11
    1122012-08-07  YoungTaeck Song  <youngtaeck.song@samsung.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r125039 r125041  
     12012-08-08  Philippe Normand  <pnormand@igalia.com>
     2
     3        [GStreamer] 0.11 build broken (again)
     4        https://bugs.webkit.org/show_bug.cgi?id=93474
     5
     6        Reviewed by Martin Robinson.
     7
     8        Adapt the GStreamer media player backend to the latest GStreamer
     9        0.11 API changes.
     10
     11        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
     12        (WTF::adoptGRef):
     13        * platform/graphics/gstreamer/GStreamerVersioning.cpp:
     14        (gstObjectIsFloating):
     15        * platform/graphics/gstreamer/GStreamerVersioning.h:
     16        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
     17        (StreamingClient::didReceiveResponse):
     18
    1192012-08-08  Loïc Yhuel  <loic.yhuel@softathome.com>
    220

  • trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp

    r124617 r125041  
    2929template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
    3030{
    31     ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     31    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
    3232    return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
    3333}
    … …  
    4949template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
    5050{
    51     ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     51    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
    5252    return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
    5353}
    … …  
    6969template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
    7070{
    71     ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     71    ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
    7272    return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
    7373}
    … …  
    103103template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
    104104{
    105     ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     105    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
    106106    return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
    107107}
    … …  
    123123template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
    124124{
    125     ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     125    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
    126126    return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
    127127}
    … …  
    143143template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
    144144{
    145     ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
     145    ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
    146146    return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
    147147}

  • trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp

    r124617 r125041  
    2323
    2424#include "IntSize.h"
     25#include <wtf/UnusedParam.h>
    2526
    2627void webkitGstObjectRefSink(GstObject* gstObject)
    … …  
    106107#endif
    107108}
     109
     110bool gstObjectIsFloating(GstObject* gstObject)
     111{
     112#ifdef GST_API_VERSION_1
     113    return g_object_is_floating(G_OBJECT(gstObject));
     114#else
     115    return GST_OBJECT_IS_FLOATING(gstObject);
     116#endif
     117}
     118
     119void notifyGstTagsOnPad(GstElement* element, GstPad* pad, GstTagList* tags)
     120{
     121#ifdef GST_API_VERSION_1
     122    UNUSED_PARAM(element);
     123    gst_pad_push_event(GST_PAD_CAST(pad), gst_event_new_tag(tags));
     124#else
     125    gst_element_found_tags_for_pad(element, pad, tags);
     126#endif
     127}

  • trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h

    r124617 r125041  
    3333GstBuffer* createGstBuffer(GstBuffer*);
    3434void setGstElementClassMetadata(GstElementClass*, const char* name, const char* longName, const char* description, const char* author);
     35bool gstObjectIsFloating(GstObject*);
     36void notifyGstTagsOnPad(GstElement*, GstPad*, GstTagList*);
    3537#endif // GStreamerVersioning_h

  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r124617 r125041  
    854854#endif
    855855    else
    856 #ifdef GST_API_VERSION_1
    857         gst_pad_push_event(GST_PAD_CAST(m_src->priv->srcpad), gst_event_new_tag("WebKitWebSrc", tags));
    858 #else
    859         gst_element_found_tags_for_pad(GST_ELEMENT(m_src), m_src->priv->srcpad, tags);
    860 #endif
     856        notifyGstTagsOnPad(GST_ELEMENT(m_src), tags, m_src->priv->srcpad);
    861857}
    862858

  • trunk/configure.ac

    r124826 r125041  
    471471fi
    472472
     473# farstream-0.1 depends on gstreamer 0.10 currently. Disable
     474# media_stream if gstreamer 0.11 build support is enabled.
     475if test "$GST_API_VERSION" = "1.0"; then
     476   enable_media_stream=false
     477fi
    473478if test "$enable_media_stream" = "yes"; then
    474479   PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1],
Note: See TracChangeset for help on using the changeset viewer.