Changeset 264773 in webkit

Timestamp:

Jul 23, 2020, 10:22:02 AM (6 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r264742. rdar://problem/65995985

[Cocoa|WebM] Decode error when seeking
​https://bugs.webkit.org/show_bug.cgi?id=214666

Reviewed by Eric Carlson.

A decoder error is hit when seeking because we think all samples coming out of the SourceBufferParserWebM are sync-samples.
This is because the attachment added with CMSetAttachment() is ignored; the correct way to set sample attachments is by
getting the sample attachments array with CMSampleBufferGetSampleAttachmentsArray(), and then iterating over the attachments
and adding keys to the underlying mutable CFDictionary.

• platform/graphics/cocoa/SourceBufferParserWebM.cpp: (WebCore::SourceBufferParserWebM::OnFrame):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@264742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610.1.23.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/SourceBufferParserWebM.cpp (modified) (2 diffs)

branches/safari-610.1.23.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r264742. rdar://problem/65995985
+
+    [Cocoa|WebM] Decode error when seeking
+    https://bugs.webkit.org/show_bug.cgi?id=214666
+    
+    Reviewed by Eric Carlson.
+    
+    A decoder error is hit when seeking because we think all samples coming out of the SourceBufferParserWebM are sync-samples.
+    This is because the attachment added with CMSetAttachment() is ignored; the correct way to set sample attachments is by
+    getting the sample attachments array with CMSampleBufferGetSampleAttachmentsArray(), and then iterating over the attachments
+    and adding keys to the underlying mutable CFDictionary.
+    
+    * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+    (WebCore::SourceBufferParserWebM::OnFrame):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-22  Jer Noble  <jer.noble@apple.com>
+
+            [Cocoa|WebM] Decode error when seeking
+            https://bugs.webkit.org/show_bug.cgi?id=214666
+
+            Reviewed by Eric Carlson.
+
+            A decoder error is hit when seeking because we think all samples coming out of the SourceBufferParserWebM are sync-samples.
+            This is because the attachment added with CMSetAttachment() is ignored; the correct way to set sample attachments is by
+            getting the sample attachments array with CMSampleBufferGetSampleAttachmentsArray(), and then iterating over the attachments
+            and adding keys to the underlying mutable CFDictionary.
+
+            * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+            (WebCore::SourceBufferParserWebM::OnFrame):
+
 2020-07-22  Alan Coon  <alancoon@apple.com>
 

branches/safari-610.1.23.1-branch/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp

@@ -43 +43 @@
 #include <wtf/Deque.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/cf/TypeCastsCF.h>
 #include <wtf/darwin/WeakLinking.h>
 
@@ -794 +795 @@
         trackData->currentBlockBufferPosition = 0;
 
-        if (!isSync)
-            CMSetAttachment(sampleBuffer.get(), kCMSampleAttachmentKey_NotSync, kCFBooleanTrue, kCMAttachmentMode_ShouldPropagate);
+        if (!isSync) {
+            auto attachmentsArray = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer.get(), true);
+            ASSERT(attachmentsArray);
+            if (!attachmentsArray)
+                return Skip(reader, bytesRemaining);
+            for (CFIndex i = 0, count = CFArrayGetCount(attachmentsArray); i < count; ++i) {
+                CFMutableDictionaryRef attachments = checked_cf_cast<CFMutableDictionaryRef>(CFArrayGetValueAtIndex(attachmentsArray, i));
+                CFDictionarySetValue(attachments, kCMSampleAttachmentKey_NotSync, kCFBooleanTrue);
+            }
+        }
 
         auto trackID = track.track_uid.value();