Title: [165891] trunk/Source/WebCore
- Revision
- 165891
- Author
- csaave...@igalia.com
- Date
- 2014-03-19 06:49:41 -0700 (Wed, 19 Mar 2014)
Log Message
[GStreamer] Clean timeout source ids
https://bugs.webkit.org/show_bug.cgi?id=130450
Reviewed by Philippe Normand.
Sources IDs need to be cleaned up if the callback removes the
source, otherwise we'll be attempting to remove an empty source at
some point.
* platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
(webKitMediaVideoSrcStart): Clean the source id.
(webKitMediaAudioSrcStart): Ditto.
(webKitMediaVideoSrcSeekMainCb): Ditto.
(webKitMediaAudioSrcSeekMainCb): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165890 => 165891)
--- trunk/Source/WebCore/ChangeLog 2014-03-19 12:38:51 UTC (rev 165890)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 13:49:41 UTC (rev 165891)
@@ -1,3 +1,20 @@
+2014-03-19 Claudio Saavedra <csaave...@igalia.com>
+
+ [GStreamer] Clean timeout source ids
+ https://bugs.webkit.org/show_bug.cgi?id=130450
+
+ Reviewed by Philippe Normand.
+
+ Sources IDs need to be cleaned up if the callback removes the
+ source, otherwise we'll be attempting to remove an empty source at
+ some point.
+
+ * platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
+ (webKitMediaVideoSrcStart): Clean the source id.
+ (webKitMediaAudioSrcStart): Ditto.
+ (webKitMediaVideoSrcSeekMainCb): Ditto.
+ (webKitMediaAudioSrcSeekMainCb): Ditto.
+
2014-03-19 Mihnea Ovidenie <mih...@adobe.com>
[CSSRegions] Compute region ranges for children of inline blocks
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp (165890 => 165891)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-03-19 12:38:51 UTC (rev 165890)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-03-19 13:49:41 UTC (rev 165891)
@@ -343,6 +343,8 @@
return FALSE;
}
+ priv->sourceVideo.startId = 0;
+
GST_OBJECT_UNLOCK(src);
GST_DEBUG_OBJECT(src, "Started request");
@@ -362,6 +364,8 @@
return FALSE;
}
+ priv->sourceAudio.startId = 0;
+
GST_OBJECT_UNLOCK(src);
GST_DEBUG_OBJECT(src, "Started request");
@@ -659,15 +663,17 @@
GST_OBJECT_UNLOCK(src);
}
-static gboolean webKitMediaVideoSrcSeekMainCb(WebKitMediaSrc*)
+static gboolean webKitMediaVideoSrcSeekMainCb(WebKitMediaSrc* src)
{
notImplemented();
+ src->priv->sourceVideo.seekId = 0;
return FALSE;
}
-static gboolean webKitMediaAudioSrcSeekMainCb(WebKitMediaSrc*)
+static gboolean webKitMediaAudioSrcSeekMainCb(WebKitMediaSrc* src)
{
notImplemented();
+ src->priv->sourceAudio.seekId = 0;
return FALSE;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
