Changeset 272822 in webkit

Timestamp:

Feb 12, 2021 4:29:35 PM (17 months ago)

Author:

jer.noble@apple.com

Message:

[Mac] Unable to play WebM/Opus generated from Chrome MediaRecorder
​https://bugs.webkit.org/show_bug.cgi?id=221808

Reviewed by Eric Carlson.

Source/WebCore:

Test: platform/mac-bigsur/media/media-webm-no-duration.html

In the absense of an explicit decode timestamp, CoreMedia convention is to use
the presentation timestamp instead.

All fields in the CoreAudioOpusHeader must be byte-swapped.

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

(WebCore::MediaSampleAVFObjC::decodeTime const):

• platform/graphics/cocoa/WebMAudioUtilitiesCocoa.mm:

(WebCore::cookieFromOpusCodecPrivate):

Source/WebKit:

In the absense of an explicit duration parsed from the InitializationSegment,
rely instead on the maximum presentation timestamp available in any MediaTrackReader
to generate an explicit duration.

• Shared/mac/MediaFormatReader/MediaFormatReader.cpp:

(WebKit::MediaFormatReader::finishParsing):
(WebKit::MediaFormatReader::copyProperty):

• Shared/mac/MediaFormatReader/MediaTrackReader.cpp:

(WebKit::MediaTrackReader::greatestPresentationTime const):

• Shared/mac/MediaFormatReader/MediaTrackReader.h:

LayoutTests:

• platform/mac-bigsur/media/media-webm-no-duration-expected.txt: Added.
• platform/mac-bigsur/media/media-webm-no-duration.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-bigsur/media (added)
• LayoutTests/platform/mac-bigsur/media/media-webm-no-duration-expected.txt (added)
• LayoutTests/platform/mac-bigsur/media/media-webm-no-duration.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/WebMAudioUtilitiesCocoa.mm (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp (modified) (2 diffs)
• Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp (modified) (1 diff)
• Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-12  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Unable to play WebM/Opus generated from Chrome MediaRecorder
+        https://bugs.webkit.org/show_bug.cgi?id=221808
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-bigsur/media/media-webm-no-duration-expected.txt: Added.
+        * platform/mac-bigsur/media/media-webm-no-duration.html: Added.
+
 2021-02-12  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-12  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Unable to play WebM/Opus generated from Chrome MediaRecorder
+        https://bugs.webkit.org/show_bug.cgi?id=221808
+
+        Reviewed by Eric Carlson.
+
+        Test: platform/mac-bigsur/media/media-webm-no-duration.html
+
+        In the absense of an explicit decode timestamp, CoreMedia convention is to use
+        the presentation timestamp instead.
+
+        All fields in the CoreAudioOpusHeader must be byte-swapped.
+
+        * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
+        (WebCore::MediaSampleAVFObjC::decodeTime const):
+        * platform/graphics/cocoa/WebMAudioUtilitiesCocoa.mm:
+        (WebCore::cookieFromOpusCodecPrivate):
+
 2021-02-12  Stephan Szabo  <stephan.szabo@sony.com>
 

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

@@ -88 +88 @@
 MediaTime MediaSampleAVFObjC::decodeTime() const
 {
-    return PAL::toMediaTime(CMSampleBufferGetDecodeTimeStamp(m_sample.get()));
+    auto timeStamp = CMSampleBufferGetDecodeTimeStamp(m_sample.get());
+    if (CMTIME_IS_INVALID(timeStamp))
+        return presentationTime();
+    return PAL::toMediaTime(timeStamp);
 }
 

trunk/Source/WebCore/platform/graphics/cocoa/WebMAudioUtilitiesCocoa.mm

@@ -298 +298 @@
         int packetBandwidth;
         unsigned packetStreamChannels;
-        unsigned useInbandFEC { 1 };
+        unsigned useInbandFEC;
         unsigned encFinalRange { 0 };
     };
@@ -308 +308 @@
         static_cast<int>(CFSwapInt32HostToBig(bandwidth)),
         CFSwapInt32HostToBig(channelCount),
+        CFSwapInt32HostToBig(1),
     };
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-12  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Unable to play WebM/Opus generated from Chrome MediaRecorder
+        https://bugs.webkit.org/show_bug.cgi?id=221808
+
+        Reviewed by Eric Carlson.
+
+        In the absense of an explicit duration parsed from the InitializationSegment,
+        rely instead on the maximum presentation timestamp available in any MediaTrackReader
+        to generate an explicit duration.
+
+        * Shared/mac/MediaFormatReader/MediaFormatReader.cpp:
+        (WebKit::MediaFormatReader::finishParsing):
+        (WebKit::MediaFormatReader::copyProperty):
+        * Shared/mac/MediaFormatReader/MediaTrackReader.cpp:
+        (WebKit::MediaTrackReader::greatestPresentationTime const):
+        * Shared/mac/MediaFormatReader/MediaTrackReader.h:
+
 2021-02-12  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp

@@ -218 +218 @@
         trackReader->finishParsing();
 
+    if (m_duration.isIndefinite()) {
+        MediaTime greatestPresentationTime { MediaTime::invalidTime() };
+        for (auto& trackReader : m_trackReaders) {
+            if (greatestPresentationTime.isInvalid() || trackReader->greatestPresentationTime() > greatestPresentationTime)
+                greatestPresentationTime = trackReader->greatestPresentationTime();
+        }
+        if (greatestPresentationTime.isValid())
+            m_duration = greatestPresentationTime;
+    }
+
     parser->setDidParseInitializationDataCallback(nullptr);
     parser->setDidEncounterErrorDuringParsingCallback(nullptr);
@@ -232 +242 @@
 
     if (CFEqual(key, PAL::get_MediaToolbox_kMTPluginFormatReaderProperty_Duration())) {
+        if (m_duration.isIndefinite())
+            return kCMBaseObjectError_ValueNotAvailable;
+
         if (auto leakedDuration = adoptCF(CMTimeCopyAsDictionary(PAL::toCMTime(m_duration), allocator)).leakRef()) {
             *reinterpret_cast<CFDictionaryRef*>(valueCopy) = leakedDuration;

trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp

@@ -86 +86 @@
 }
 
+MediaTime MediaTrackReader::greatestPresentationTime() const
+{
+    auto& sampleMap = m_sampleStorage->sampleMap;
+    if (sampleMap.empty())
+        return MediaTime::invalidTime();
+
+    auto& lastSample = *sampleMap.decodeOrder().rbegin()->second;
+    return lastSample.presentationTime() + lastSample.duration();
+}
+
 void MediaTrackReader::addSample(Ref<MediaSample>&& sample, MTPluginByteSourceRef byteSource)
 {

trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.h

@@ -62 +62 @@
     CMMediaType mediaType() const { return m_mediaType; }
     const MediaTime& duration() const { return m_duration; }
+    MediaTime greatestPresentationTime() const;
 
     void setEnabled(bool enabled) { m_isEnabled = enabled ? Enabled::True : Enabled::False; }