Title: [235294] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 235294
- Author
- [email protected]
- Date
- 2018-08-24 01:08:17 -0700 (Fri, 24 Aug 2018)
Log Message
Merge r235112 - [GStreamer] Warn early about incomplete MSE track switching support
https://bugs.webkit.org/show_bug.cgi?id=188653
Patch by Philippe Normand <[email protected]> on 2018-08-21
Reviewed by Xabier Rodriguez-Calvar.
The proper track switching support shall be fixed at some point by:
https://bugs.webkit.org/show_bug.cgi?id=182531.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::updateTracks): Remove redundant test.
(WebCore::MediaPlayerPrivateGStreamer::enableTrack): Exit early if
this method is called by the MSE player.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (235293 => 235294)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-24 08:08:11 UTC (rev 235293)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-24 08:08:17 UTC (rev 235294)
@@ -1,5 +1,20 @@
2018-08-21 Philippe Normand <[email protected]>
+ [GStreamer] Warn early about incomplete MSE track switching support
+ https://bugs.webkit.org/show_bug.cgi?id=188653
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ The proper track switching support shall be fixed at some point by:
+ https://bugs.webkit.org/show_bug.cgi?id=182531.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::updateTracks): Remove redundant test.
+ (WebCore::MediaPlayerPrivateGStreamer::enableTrack): Exit early if
+ this method is called by the MSE player.
+
+2018-08-21 Philippe Normand <[email protected]>
+
[GStreamer][MSE] Generic main thread notification support
https://bugs.webkit.org/show_bug.cgi?id=188647
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (235293 => 235294)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-08-24 08:08:11 UTC (rev 235293)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-08-24 08:08:17 UTC (rev 235294)
@@ -724,12 +724,6 @@
if (m_hasVideo)
m_player->sizeChanged();
- if (useMediaSource) {
- GST_DEBUG("Tracks managed by source element. Bailing out now.");
- m_player->client().mediaPlayerEngineUpdated(m_player);
- return;
- }
-
m_player->client().mediaPlayerEngineUpdated(m_player);
}
#endif // GST_CHECK_VERSION(1, 10, 0)
@@ -736,6 +730,12 @@
void MediaPlayerPrivateGStreamer::enableTrack(TrackPrivateBaseGStreamer::TrackType trackType, unsigned index)
{
+ // FIXME: Remove isMediaSource() test below when fixing https://bugs.webkit.org/show_bug.cgi?id=182531.
+ if (isMediaSource()) {
+ GST_FIXME_OBJECT(m_pipeline.get(), "Audio/Video/Text track switching is not yet supported by the MSE backend.");
+ return;
+ }
+
const char* propertyName;
const char* trackTypeAsString;
Vector<String> selectedStreams;
@@ -801,11 +801,8 @@
}
GST_INFO("Enabling %s track with index: %u", trackTypeAsString, index);
- // FIXME: Remove isMediaSource() test below when fixing https://bugs.webkit.org/show_bug.cgi?id=182531
- if (m_isLegacyPlaybin || isMediaSource()) {
- GstElement* element = isMediaSource() ? m_source.get() : m_pipeline.get();
- g_object_set(element, propertyName, index, nullptr);
- }
+ if (m_isLegacyPlaybin)
+ g_object_set(m_pipeline.get(), propertyName, index, nullptr);
#if GST_CHECK_VERSION(1, 10, 0)
else {
GList* selectedStreamsList = nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
