Attachment 340003 Details for Bug 185252 – [GStreamer] Never call updateTracks if running on legacy pipeline

[patch] [GStreamer] Never call updateTracks if running on legacy pipeline

GStreamer-Never-call-updateTracks-if-running-on-le.patch (text/plain), 4.19 KB, created by Thibault Saunier on 2018-05-09 12:35:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-05-09 12:35:36 PDT

Size: 4.19 KB

patch

obsolete

>From b35808fdbebb9a6c64b1ab6786b5117c7febc5d3 Mon Sep 17 00:00:00 2001
>From: Thibault Saunier <tsaunier@igalia.com>
>Date: Wed, 9 May 2018 16:20:47 -0300
>Subject: [PATCH xserver] [GStreamer] Never call updateTracks if running on
> legacy pipeline
>
>https://bugs.webkit.org/show_bug.cgi?id=185252
>---
> LayoutTests/ChangeLog                          | 11 +++++++++++
> LayoutTests/platform/gtk/TestExpectations      |  2 --
> Source/WebCore/ChangeLog                       | 14 ++++++++++++++
> .../gstreamer/MediaPlayerPrivateGStreamer.cpp  | 18 ++++++++++--------
> 4 files changed, 35 insertions(+), 10 deletions(-)
>
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ec35bc67865..9bfbe470731 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-09  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GTK] [GStreamer] http/tests/media/hls/hls-audio-tracks.html is failing
>+        https://bugs.webkit.org/show_bug.cgi?id=185252
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [GStreamer] Never call updateTracks if running on legacy pipeline
>+
>+        * platform/gtk/TestExpectations:
>+
> 2018-05-09  Youenn Fablet  <youenn@apple.com>
> 
>         Unflake some additional AppCache tests
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 7aa206948ce..f065986e8e5 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -3358,8 +3358,6 @@ webkit.org/b/184778 inspector/canvas/setShaderProgramHighlighted.html [ Failure
> webkit.org/b/184779 transitions/clip-path-path-transitions.html [ Failure ]
> webkit.org/b/184779 transitions/clip-path-transitions.html [ Failure ]
> 
>-webkit.org/b/185252 http/tests/media/hls/hls-audio-tracks.html [ Failure ]
>-
> webkit.org/b/185254 http/tests/cache/disk-cache/redirect-chain-limits.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/onloadend-event-after-error.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/response-access-on-error.html [ Failure ]
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4136fb89b6d..45870c596e3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-09  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GStreamer] Never call updateTracks if running on legacy pipeline
>+        https://bugs.webkit.org/show_bug.cgi?id=185252
>+
>+        This makes sure failling code path is never reached in the conditions where it should not have been reached.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Re enables http/tests/media/hls/hls-audio-tracks.html after fixing
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
>+
> 2018-05-09  Tim Horton  <timothy_horton@apple.com>
> 
>         Fix the build by ignoring some deprecation warnings
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>index 223d43ee811..9b62c82961a 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>@@ -1285,14 +1285,16 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
>     }
> #if GST_CHECK_VERSION(1, 10, 0)
>     case GST_MESSAGE_STREAM_COLLECTION: {
>-        GRefPtr<GstStreamCollection> collection;
>-        gst_message_parse_stream_collection(message, &collection.outPtr());
>-
>-        if (collection) {
>-            m_streamCollection.swap(collection);
>-            m_notifier->notify(MainThreadNotification::StreamCollectionChanged, [this] {
>-                this->updateTracks();
>-            });
>+        if (!m_isLegacyPlaybin) {
>+            GRefPtr<GstStreamCollection> collection;
>+            gst_message_parse_stream_collection(message, &collection.outPtr());
>+
>+            if (collection) {
>+                m_streamCollection.swap(collection);
>+                m_notifier->notify(MainThreadNotification::StreamCollectionChanged, [this] {
>+                    this->updateTracks();
>+                });
>+            }
>         }
>         break;
>     }
>-- 
>2.17.0

Actions: View | Formatted Diff | Diff

Attachments on bug 185252: 340003