Title: [216493] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 216493
- Author
- carlo...@webkit.org
- Date
- 2017-05-09 03:00:05 -0700 (Tue, 09 May 2017)
Log Message
Merge r216240 - [GStreamer] Do not report more errors after the first one
https://bugs.webkit.org/show_bug.cgi?id=171722
Reviewed by Xabier Rodriguez-Calvar.
We can receive several error messages for the same error from different elements. That's not expected by the
media source selection algorithm implementation. I don't know if didn't happen with previous versions of GST,
but since the upgrade to 1.10.4 several tests are failing because of this.
Fixes: media/video-error-does-not-exist.html
media/video-load-networkState.html
media/video-source-error.html
media/video-source-none-supported.html
media/video-source-moved.html
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::handleMessage): Return early also when an error already occured.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (216492 => 216493)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-05-09 09:59:24 UTC (rev 216492)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-05-09 10:00:05 UTC (rev 216493)
@@ -1,5 +1,25 @@
2017-05-05 Carlos Garcia Campos <cgar...@igalia.com>
+ [GStreamer] Do not report more errors after the first one
+ https://bugs.webkit.org/show_bug.cgi?id=171722
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ We can receive several error messages for the same error from different elements. That's not expected by the
+ media source selection algorithm implementation. I don't know if didn't happen with previous versions of GST,
+ but since the upgrade to 1.10.4 several tests are failing because of this.
+
+ Fixes: media/video-error-does-not-exist.html
+ media/video-load-networkState.html
+ media/video-source-error.html
+ media/video-source-none-supported.html
+ media/video-source-moved.html
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage): Return early also when an error already occured.
+
+2017-05-05 Carlos Garcia Campos <cgar...@igalia.com>
+
[GStreamer] Fix handling of gst errors in MediaPlayerPrivateGStreamer::handleMessage
https://bugs.webkit.org/show_bug.cgi?id=171721
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (216492 => 216493)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-05-09 09:59:24 UTC (rev 216492)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-05-09 10:00:05 UTC (rev 216493)
@@ -901,10 +901,8 @@
GST_DEBUG("Message %s received from element %s", GST_MESSAGE_TYPE_NAME(message), GST_MESSAGE_SRC_NAME(message));
switch (GST_MESSAGE_TYPE(message)) {
case GST_MESSAGE_ERROR:
- if (m_resetPipeline)
+ if (m_resetPipeline || m_missingPluginsCallback || m_errorOccured)
break;
- if (m_missingPluginsCallback)
- break;
gst_message_parse_error(message, &err.outPtr(), &debug.outPtr());
GST_ERROR("Error %d: %s (url="" err->code, err->message, m_url.string().utf8().data());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
