Changeset 269121 in webkit

Timestamp:

Oct 28, 2020 1:42:59 PM (3 years ago)

Author:

jer.noble@apple.com

Message:

[MSE] Handle trackId changing across Initialization Segments
​https://bugs.webkit.org/show_bug.cgi?id=218294
<rdar://problem/70771306>

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-source/media-source-trackid-change.html

When appending an initialization segment after the receivedFirstInitializationSegment flag is
true, and when the number of video or audio tracks is 1, the trackId is allowed to change across
initialiaztion segments. When this occurs, move the TrackBuffer inside the trackBufferMap to
refer to the new trackId, so that when MediaSamples are parsed, they're put into the correct
TrackBuffer.

• Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):

• html/track/AudioTrack.cpp:

(WebCore::AudioTrack::setPrivate):

• html/track/InbandTextTrack.cpp:

(WebCore::InbandTextTrack::setPrivate):

• html/track/VideoTrack.cpp:

(WebCore::VideoTrack::setPrivate):

LayoutTests:

• media/media-source/media-source-trackid-change-expected.txt: Added.
• media/media-source/media-source-trackid-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-trackid-change-expected.txt (added)
• LayoutTests/media/media-source/media-source-trackid-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (4 diffs)
• Source/WebCore/html/track/AudioTrack.cpp (modified) (1 diff)
• Source/WebCore/html/track/InbandTextTrack.cpp (modified) (1 diff)
• Source/WebCore/html/track/VideoTrack.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-28  Jer Noble  <jer.noble@apple.com>
+
+        [MSE] Handle trackId changing across Initialization Segments
+        https://bugs.webkit.org/show_bug.cgi?id=218294
+        <rdar://problem/70771306>
+
+        Reviewed by Eric Carlson.
+
+        * media/media-source/media-source-trackid-change-expected.txt: Added.
+        * media/media-source/media-source-trackid-change.html: Added.
+
 2020-10-28  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-28  Jer Noble  <jer.noble@apple.com>
+
+        [MSE] Handle trackId changing across Initialization Segments
+        https://bugs.webkit.org/show_bug.cgi?id=218294
+        <rdar://problem/70771306>
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-source/media-source-trackid-change.html
+
+        When appending an initialization segment after the receivedFirstInitializationSegment flag is
+        true, and when the number of video or audio tracks is 1, the trackId is allowed to change across
+        initialiaztion segments. When this occurs, move the TrackBuffer inside the trackBufferMap to
+        refer to the new trackId, so that when MediaSamples are parsed, they're put into the correct
+        TrackBuffer.
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):
+        * html/track/AudioTrack.cpp:
+        (WebCore::AudioTrack::setPrivate):
+        * html/track/InbandTextTrack.cpp:
+        (WebCore::InbandTextTrack::setPrivate):
+        * html/track/VideoTrack.cpp:
+        (WebCore::VideoTrack::setPrivate):
+
 2020-10-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@ -1112 +1112 @@
             return;
         }
+
+        Vector<std::pair<AtomString, TrackBuffer>> newTrackBuffers;
+
         // 3.2 Add the appropriate track descriptions from this initialization segment to each of the track buffers.
         ASSERT(segment.audioTracks.size() == audioTracks().length());
         for (auto& audioTrackInfo : segment.audioTracks) {
             if (audioTracks().length() == 1) {
-                audioTracks().item(0)->setPrivate(*audioTrackInfo.track);
+                auto* track = audioTracks().item(0);
+                auto oldId = track->id();
+                auto newId = audioTrackInfo.track->id();
+                track->setPrivate(*audioTrackInfo.track);
+                if (newId != oldId) {
+                    auto trackBuffer = m_trackBufferMap.take(oldId);
+                    newTrackBuffers.append(std::make_pair(newId, WTFMove(trackBuffer)));
+                }
                 break;
             }
@@ -1128 +1138 @@
         for (auto& videoTrackInfo : segment.videoTracks) {
             if (videoTracks().length() == 1) {
-                videoTracks().item(0)->setPrivate(*videoTrackInfo.track);
+                auto* track = videoTracks().item(0);
+                auto oldId = track->id();
+                auto newId = videoTrackInfo.track->id();
+                track->setPrivate(*videoTrackInfo.track);
+                if (newId != oldId) {
+                    auto trackBuffer = m_trackBufferMap.take(oldId);
+                    newTrackBuffers.append(std::make_pair(newId, WTFMove(trackBuffer)));
+                }
                 break;
             }
@@ -1140 +1157 @@
         for (auto& textTrackInfo : segment.textTracks) {
             if (textTracks().length() == 1) {
-                downcast<InbandTextTrack>(*textTracks().item(0)).setPrivate(*textTrackInfo.track);
+                auto* track = downcast<InbandTextTrack>(textTracks().item(0));
+                auto oldId = track->id();
+                auto newId = textTrackInfo.track->id();
+                track->setPrivate(*textTrackInfo.track);
+                if (newId != oldId) {
+                    auto trackBuffer = m_trackBufferMap.take(oldId);
+                    newTrackBuffers.append(std::make_pair(newId, WTFMove(trackBuffer)));
+                }
                 break;
             }
@@ -1147 +1171 @@
             ASSERT(textTrack);
             downcast<InbandTextTrack>(*textTrack).setPrivate(*textTrackInfo.track);
+        }
+
+        while (!newTrackBuffers.isEmpty()) {
+            auto trackPair = newTrackBuffers.takeLast();
+            m_trackBufferMap.add(trackPair.first, WTFMove(trackPair.second));
         }
 

trunk/Source/WebCore/html/track/AudioTrack.cpp

@@ -105 +105 @@
 
     updateKindFromPrivate();
+    setId(m_private->id());
 }
 

trunk/Source/WebCore/html/track/InbandTextTrack.cpp

@@ -78 +78 @@
     setModeInternal(mode());
     updateKindFromPrivate();
+    setId(m_private->id());
 }
 

trunk/Source/WebCore/html/track/VideoTrack.cpp

@@ -110 +110 @@
     m_private->setSelected(m_selected);
     updateKindFromPrivate();
+    setId(m_private->id());
 }