Changeset 96940 in webkit

Timestamp:

Oct 7, 2011 8:47:54 AM (13 years ago)

Author:

Philippe Normand

Message:

[GStreamer] avoid direct access to GstMessage structure field
​https://bugs.webkit.org/show_bug.cgi?id=69629

Reviewed by Martin Robinson.

Use gst_message_get_structure() instead of direct access to the
structure field. No direct benefit apart from compatibility with
GStreamer 0.11.

• platform/graphics/gstreamer/GStreamerGWorld.cpp:

(WebCore::gstGWorldSyncMessageCallback):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::mediaLocationChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerGWorld.cpp (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-07  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] avoid direct access to GstMessage structure field
+        https://bugs.webkit.org/show_bug.cgi?id=69629
+
+        Reviewed by Martin Robinson.
+
+        Use gst_message_get_structure() instead of direct access to the
+        structure field. No direct benefit apart from compatibility with
+        GStreamer 0.11.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::gstGWorldSyncMessageCallback):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+        (WebCore::MediaPlayerPrivateGStreamer::mediaLocationChanged):
+
 2011-10-07  Pavel Feldman  <pfeldman@google.com>
 

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

@@ -43 +43 @@
 
     GStreamerGWorld* gstGWorld = static_cast<GStreamerGWorld*>(data);
-
-    if (gst_structure_has_name(message->structure, "prepare-xwindow-id")
-        || gst_structure_has_name(message->structure, "have-ns-view"))
+    const GstStructure* structure = gst_message_get_structure(message);
+
+    if (gst_structure_has_name(structure, "prepare-xwindow-id")
+        || gst_structure_has_name(structure, "have-ns-view"))
         gstGWorld->setWindowOverlay(message);
     return TRUE;

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

@@ -724 +724 @@
     bool issueError = true;
     bool attemptNextLocation = false;
-
-    if (message->structure) {
-        const gchar* messageTypeName = gst_structure_get_name(message->structure);
+    const GstStructure* structure = gst_message_get_structure(message);
+
+    if (structure) {
+        const gchar* messageTypeName = gst_structure_get_name(structure);
 
         // Redirect messages are sent from elements, like qtdemux, to
@@ -1214 +1215 @@
         gst_structure_free(m_mediaLocations);
 
-    if (message->structure) {
+    const GstStructure* structure = gst_message_get_structure(message);
+    if (structure) {
         // This structure can contain:
         // - both a new-location string and embedded locations structure
         // - or only a new-location string.
-        m_mediaLocations = gst_structure_copy(message->structure);
+        m_mediaLocations = gst_structure_copy(structure);
         const GValue* locations = gst_structure_get_value(m_mediaLocations, "locations");