Changeset 202462 in webkit

Timestamp:

Jun 24, 2016 4:54:22 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

MSE gets confused by in-band text tracks
​https://bugs.webkit.org/show_bug.cgi?id=159107
<rdar://problem/26871330>

Reviewed by Eric Carlson.

We can't currently handle text track samples in SourceBufferPrivateAVFObjC,
so don't pass them up to SourceBuffer.

• platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:

(WebCore::SourceBufferPrivateAVFObjC::didParseStreamDataAsAsset):
(WebCore::SourceBufferPrivateAVFObjC::processCodedFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-24  Jer Noble  <jer.noble@apple.com>
+
+        MSE gets confused by in-band text tracks
+        https://bugs.webkit.org/show_bug.cgi?id=159107
+        <rdar://problem/26871330>
+
+        Reviewed by Eric Carlson.
+
+        We can't currently handle text track samples in SourceBufferPrivateAVFObjC,
+        so don't pass them up to SourceBuffer.
+
+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+        (WebCore::SourceBufferPrivateAVFObjC::didParseStreamDataAsAsset):
+        (WebCore::SourceBufferPrivateAVFObjC::processCodedFrame):
+
 2016-06-24  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm

@@ -617 +617 @@
 
     for (AVAssetTrack* track in [m_asset tracks]) {
+        if ([track hasMediaCharacteristic:AVMediaCharacteristicLegible]) {
+            // FIXME(125161): Handle in-band text tracks.
+            continue;
+        }
+
         if ([track hasMediaCharacteristic:AVMediaCharacteristicVisual]) {
             SourceBufferPrivateClient::InitializationSegment::VideoTrackInformation info;
@@ -677 +682 @@
                 m_mediaSource->player()->sizeChanged();
         }
+    } else if (!m_audioRenderers.contains(trackID)) {
+        // FIXME(125161): We don't handle text tracks, and passing this sample up to SourceBuffer
+        // will just confuse its state. Drop this sample until we can handle text tracks properly.
+        return false;
     }