Modified: trunk/Source/WebCore/ChangeLog (278977 => 278978)
--- trunk/Source/WebCore/ChangeLog 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/ChangeLog 2021-06-17 09:18:02 UTC (rev 278978)
@@ -1,3 +1,30 @@
+2021-06-17 Enrique Ocaña González <eoca...@igalia.com>
+
+ [GStreamer] Refactor MediaPlayerPrivateGStreamer::notifyPlayerOf*
+ https://bugs.webkit.org/show_bug.cgi?id=204686
+
+ Reviewed by Philippe Normand.
+
+ Refactored the notifyPlayerOf{Audio,Video,Text} family of methods into a single notifyPlayerOfTrack() one.
+ Some Variant variables are needed in order to make several incompatible types work together and to auto-detect the type of track as an enum.
+
+ Covered by existing tests.
+
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
+ (WebCore::InbandTextTrackPrivateGStreamer::create): Added method with a signature similar to the ones used by {Audio,Video}TrackPrivateGStreamer, so that it fits into the notifyPlayerOfTrack() template code.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfTrack): Template method that unifies the old notifyPlayerOf{Audio,Video,Text}() implementations.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Deleted. Refactored into notifyPlayerOfTrack().
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::audioChangedCallback): Call the new notifyPlayerOfTrack() refactored implementation.
+ (WebCore::MediaPlayerPrivateGStreamer::textChangedCallback): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::videoChangedCallback): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks): Deleted. Now implemented directly inside notifyPlayerOfTrack().
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks): Ditto.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Deleted notifyPlayerOf{Audio,Video,Text}(), added notifyPlayerOfTrack(), deleted purgeInvalid{Audio,Video,Text}Tracks().
+
2021-06-16 Myles C. Maxfield <mmaxfi...@apple.com>
Make FontFaceSet::Iterator's bounds check more robust
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (278977 => 278978)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-06-17 09:18:02 UTC (rev 278978)
@@ -962,31 +962,51 @@
setSyncOnClock(audioSink(), sync);
}
-void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
+template <typename TrackPrivateType>
+void MediaPlayerPrivateGStreamer::notifyPlayerOfTrack()
{
if (UNLIKELY(!m_pipeline || !m_source))
return;
ASSERT(m_isLegacyPlaybin || isMediaSource());
+ ASSERT(typeName);
+ enum TrackType { Audio = 0, Video = 1, Text = 2 };
+ Variant<HashMap<AtomString, RefPtr<AudioTrackPrivateGStreamer>>*, HashMap<AtomString, RefPtr<VideoTrackPrivateGStreamer>>*, HashMap<AtomString, RefPtr<InbandTextTrackPrivateGStreamer>>*> variantTracks = static_cast<HashMap<AtomString, RefPtr<TrackPrivateType>>*>(0);
+ auto type(static_cast<TrackType>(variantTracks.index()));
+ auto typeName = (const char*[]) { "audio", "video", "text" }[type];
+ auto* hasType = (bool*[]) { &m_hasAudio, &m_hasVideo, nullptr }[type];
+ switch (type) {
+ case Audio: variantTracks = &m_audioTracks; break;
+ case Video: variantTracks = &m_videoTracks; break;
+ case Text: variantTracks = &m_textTracks; break;
+ }
+ HashMap<AtomString, RefPtr<TrackPrivateType>>& tracks = *get<HashMap<AtomString, RefPtr<TrackPrivateType>>*>(variantTracks);
+
// Ignore notifications after a EOS. We don't want the tracks to disappear when the video is finished.
- if (m_isEndReached)
+ if (m_isEndReached && (type == Audio || type == Video))
return;
- unsigned numTracks = 0;
+ unsigned numberOfTracks = 0;
bool useMediaSource = isMediaSource();
+
+ StringPrintStream numberOfTracksProperty;
+ numberOfTracksProperty.printf("n-%s", typeName);
+
GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
- g_object_get(element, "n-video", &numTracks, nullptr);
+ g_object_get(element, numberOfTracksProperty.toCString().data(), &numberOfTracks, nullptr);
- GST_INFO_OBJECT(pipeline(), "Media has %d video tracks", numTracks);
+ GST_INFO_OBJECT(pipeline(), "Media has %d %s tracks", numberOfTracks, typeName);
- bool oldHasVideo = m_hasVideo;
- m_hasVideo = numTracks > 0;
- if (oldHasVideo != m_hasVideo)
- m_player->characteristicChanged();
+ if (hasType) {
+ bool oldHasType = *hasType;
+ *hasType = numberOfTracks > 0;
+ if (oldHasType != *hasType)
+ m_player->characteristicChanged();
- if (m_hasVideo)
- m_player->sizeChanged();
+ if (*hasType && type == Video)
+ m_player->sizeChanged();
+ }
if (useMediaSource) {
GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
@@ -994,16 +1014,20 @@
return;
}
- Vector<String> validVideoStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
+ Vector<String> validStreams;
+ StringPrintStream getPadProperty;
+ getPadProperty.printf("get-%s-pad", typeName);
+
+ for (unsigned i = 0; i < numberOfTracks; ++i) {
GRefPtr<GstPad> pad;
- g_signal_emit_by_name(m_pipeline.get(), "get-video-pad", i, &pad.outPtr(), nullptr);
+ g_signal_emit_by_name(m_pipeline.get(), getPadProperty.toCString().data(), i, &pad.outPtr(), nullptr);
ASSERT(pad);
- String streamId = "V" + String::number(i);
- validVideoStreams.append(streamId);
- if (i < m_videoTracks.size()) {
- RefPtr<VideoTrackPrivateGStreamer> existingTrack = m_videoTracks.get(streamId);
+ String streamId = String(typeName).substring(0, 1).convertToASCIIUppercase() + String::number(i);
+ validStreams.append(streamId);
+
+ if (i < tracks.size()) {
+ RefPtr<TrackPrivateType> existingTrack = tracks.get(streamId);
if (existingTrack) {
existingTrack->setIndex(i);
// If the video has been played twice, the track is still there, but we need
@@ -1014,18 +1038,28 @@
}
}
- auto track = VideoTrackPrivateGStreamer::create(makeWeakPtr(*this), i, pad);
- if (!track->trackIndex())
+ auto track = TrackPrivateType::create(makeWeakPtr(*this), i, pad);
+ if (!track->trackIndex() && (type == Audio || type == Video))
track->setActive(true);
ASSERT(streamId == track->id());
- m_videoTracks.add(streamId, track.copyRef());
- m_player->addVideoTrack(track.get());
+ tracks.add(streamId, track.copyRef());
+
+ Variant<AudioTrackPrivate&, VideoTrackPrivate&, InbandTextTrackPrivate&> variantTrack(track.get());
+ switch (variantTrack.index()) {
+ case Audio: m_player->addAudioTrack(get<AudioTrackPrivate&>(variantTrack)); break;
+ case Video: m_player->addVideoTrack(get<VideoTrackPrivate&>(variantTrack)); break;
+ case Text: m_player->addTextTrack(get<InbandTextTrackPrivate&>(variantTrack)); break;
+ }
}
- purgeInvalidVideoTracks(validVideoStreams);
+ // Purge invalid tracks
+ tracks.removeIf([validStreams](auto& keyAndValue) {
+ return !validStreams.contains(keyAndValue.key);
+ });
m_player->mediaEngineUpdated();
}
+
bool MediaPlayerPrivateGStreamer::hasFirstVideoSampleReachedSink() const
{
Locker sampleLocker { m_sampleMutex };
@@ -1060,127 +1094,17 @@
void MediaPlayerPrivateGStreamer::audioChangedCallback(MediaPlayerPrivateGStreamer* player)
{
player->m_notifier->notify(MainThreadNotification::AudioChanged, [player] {
- player->notifyPlayerOfAudio();
+ player->notifyPlayerOfTrack<AudioTrackPrivateGStreamer>();
});
}
-void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
-{
- if (UNLIKELY(!m_pipeline || !m_source))
- return;
-
- ASSERT(m_isLegacyPlaybin || isMediaSource());
-
- // Ignore notifications after a EOS. We don't want the tracks to disappear when the video is finished.
- if (m_isEndReached)
- return;
-
- unsigned numTracks = 0;
- bool useMediaSource = isMediaSource();
- GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
- g_object_get(element, "n-audio", &numTracks, nullptr);
-
- GST_INFO_OBJECT(pipeline(), "Media has %d audio tracks", numTracks);
- bool oldHasAudio = m_hasAudio;
- m_hasAudio = numTracks > 0;
- if (oldHasAudio != m_hasAudio)
- m_player->characteristicChanged();
-
- if (useMediaSource) {
- GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- m_player->mediaEngineUpdated();
- return;
- }
-
- Vector<String> validAudioStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
- GRefPtr<GstPad> pad;
- g_signal_emit_by_name(m_pipeline.get(), "get-audio-pad", i, &pad.outPtr(), nullptr);
- ASSERT(pad);
-
- String streamId = "A" + String::number(i);
- validAudioStreams.append(streamId);
- if (i < m_audioTracks.size()) {
- RefPtr<AudioTrackPrivateGStreamer> existingTrack = m_audioTracks.get(streamId);
- if (existingTrack) {
- existingTrack->setIndex(i);
- // If the video has been played twice, the track is still there, but we need
- // to update the pad pointer.
- if (existingTrack->pad() != pad)
- existingTrack->setPad(GRefPtr(pad));
- continue;
- }
- }
-
- auto track = AudioTrackPrivateGStreamer::create(makeWeakPtr(*this), i, pad);
- if (!track->trackIndex())
- track->setActive(true);
- ASSERT(streamId == track->id());
- m_audioTracks.add(streamId, track.copyRef());
- m_player->addAudioTrack(track.get());
- }
-
- purgeInvalidAudioTracks(validAudioStreams);
-
- m_player->mediaEngineUpdated();
-}
-
void MediaPlayerPrivateGStreamer::textChangedCallback(MediaPlayerPrivateGStreamer* player)
{
player->m_notifier->notify(MainThreadNotification::TextChanged, [player] {
- player->notifyPlayerOfText();
+ player->notifyPlayerOfTrack<InbandTextTrackPrivateGStreamer>();
});
}
-void MediaPlayerPrivateGStreamer::notifyPlayerOfText()
-{
- if (UNLIKELY(!m_pipeline || !m_source))
- return;
-
- ASSERT(m_isLegacyPlaybin || isMediaSource());
-
- unsigned numTracks = 0;
- bool useMediaSource = isMediaSource();
- GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
- g_object_get(element, "n-text", &numTracks, nullptr);
-
- GST_INFO_OBJECT(pipeline(), "Media has %d text tracks", numTracks);
-
- if (useMediaSource) {
- GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- return;
- }
-
- Vector<String> validTextStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
- GRefPtr<GstPad> pad;
- g_signal_emit_by_name(m_pipeline.get(), "get-text-pad", i, &pad.outPtr(), nullptr);
- ASSERT(pad);
-
- // We can't assume the pad has a sticky event here like implemented in
- // InbandTextTrackPrivateGStreamer because it might be emitted after the
- // track was created. So fallback to a dummy stream ID like in the Audio
- // and Video tracks.
- String streamId = "T" + String::number(i);
-
- validTextStreams.append(streamId);
- if (i < m_textTracks.size()) {
- RefPtr<InbandTextTrackPrivateGStreamer> existingTrack = m_textTracks.get(streamId);
- if (existingTrack) {
- existingTrack->setIndex(i);
- if (existingTrack->pad() == pad)
- continue;
- }
- }
-
- auto track = InbandTextTrackPrivateGStreamer::create(i, pad);
- m_textTracks.add(streamId, track.copyRef());
- m_player->addTextTrack(track.get());
- }
-
- purgeInvalidTextTracks(validTextStreams);
-}
-
void MediaPlayerPrivateGStreamer::handleTextSample(GstSample* sample, const char* streamId)
{
for (auto& track : m_textTracks.values()) {
@@ -1538,7 +1462,7 @@
void MediaPlayerPrivateGStreamer::videoChangedCallback(MediaPlayerPrivateGStreamer* player)
{
player->m_notifier->notify(MainThreadNotification::VideoChanged, [player] {
- player->notifyPlayerOfVideo();
+ player->notifyPlayerOfTrack<VideoTrackPrivateGStreamer>();
});
}
@@ -2153,27 +2077,6 @@
processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data));
}
-void MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks(Vector<String> validTrackIds)
-{
- m_audioTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
-void MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks(Vector<String> validTrackIds)
-{
- m_videoTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
-void MediaPlayerPrivateGStreamer::purgeInvalidTextTracks(Vector<String> validTrackIds)
-{
- m_textTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
void MediaPlayerPrivateGStreamer::uriDecodeBinElementAddedCallback(GstBin* bin, GstElement* element, MediaPlayerPrivateGStreamer* player)
{
if (g_strcmp0(G_OBJECT_TYPE_NAME(element), "GstDownloadBuffer"))
