Attachment 452964 Details for Bug 237078 – Patch

[patch] Patch

bug-237078-20220224001451.patch (text/plain), 30.99 KB, created by Jean-Yves Avenard [:jya] on 2022-02-23 05:14:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Yves Avenard [:jya]

Created: 2022-02-23 05:14:53 PST

Size: 30.99 KB

patch

obsolete

>Subversion Revision: 290223
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d437ba7bfa0543debcec119477eb96f88dce4013..52020f6cfea02794f45f7045551a99a052ddee23 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,41 @@
>+2022-02-23  Jean-Yves Avenard  <jya@apple.com>
>+
>+        Have SourceBufferParserWebM use SharedBuffer internally
>+        https://bugs.webkit.org/show_bug.cgi?id=237078
>+        rdar://89348752
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is a refactor to allow SourceBufferParser to return SharedBuffer
>+        rather than CMBlockBuffer.
>+
>+        No change in observable behaviours.
>+        Covered by existing tests.
>+
>+        * platform/graphics/SourceBufferPrivate.cpp:
>+        (WebCore::SourceBufferPrivate::reenqueueMediaForTime): Fly-by fix: typo.
>+        (WebCore::SourceBufferPrivate::didReceiveSample): Fly-by fix,  exit early
>+        if end time is lower than start time which can happen if the duration is
>+        smaller than contiguousFrameTolerance.
>+        * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
>+        (WebCore::SourceBufferParserWebM::TrackData::contiguousCompleteBlockBuffer const):
>+        (WebCore::SourceBufferParserWebM::TrackData::readFrameData):
>+        (WebCore::SourceBufferParserWebM::TrackData::createSampleBuffer):
>+        (WebCore::SourceBufferParserWebM::VideoTrackData::resetCompleted):
>+        (WebCore::SourceBufferParserWebM::VideoTrackData::consumeFrameData):
>+        (WebCore::SourceBufferParserWebM::VideoTrackData::postProcess):
>+        (WebCore::SourceBufferParserWebM::AudioTrackData::resetCompleted):
>+        (WebCore::SourceBufferParserWebM::AudioTrackData::consumeFrameData):
>+        (WebCore::SourceBufferParserWebM::flushPendingAudioBuffers):
>+        * platform/graphics/cocoa/SourceBufferParserWebM.h:
>+        (WebCore::SourceBufferParserWebM::TrackData::resetCompleted):
>+        (WebCore::SourceBufferParserWebM::TrackData::reset):
>+        (WebCore::SourceBufferParserWebM::TrackData::drainPendingSamples):
>+        (WebCore::SourceBufferParserWebM::TrackData::postProcess):
>+        * platform/graphics/cocoa/VP9UtilitiesCocoa.h:
>+        * platform/graphics/cocoa/VP9UtilitiesCocoa.mm:
>+        (WebCore::parseVP8FrameHeader): Make methods const.
>+
> 2022-02-23  Jean-Yves Avenard  <jya@apple.com>
> 
>         Add ability to convert FragmentedSharedBuffer to CMBlockBuffer
>diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp b/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp
>index 5499f37a7f3646bd5f395a48b09d9411d4c9b664..0f86f01434a0fa7ed55ebde464a12a5b157e55b4 100644
>--- a/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp
>+++ b/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp
>@@ -399,7 +399,7 @@ void SourceBufferPrivate::reenqueueMediaForTime(TrackBuffer& trackBuffer, const
>         || (currentSamplePTSIterator->first - time) > timeFudgeFactor())
>         return;
> 
>-    // Seach backward for the previous sync sample.
>+    // Search backward for the previous sync sample.
>     DecodeOrderSampleMap::KeyType decodeKey(currentSamplePTSIterator->second->decodeTime(), currentSamplePTSIterator->second->presentationTime());
>     auto currentSampleDTSIterator = trackBuffer.samples.decodeOrder().findSampleWithDecodeKey(decodeKey);
>     ASSERT(currentSampleDTSIterator != trackBuffer.samples.decodeOrder().end());
>@@ -1172,6 +1172,9 @@ void SourceBufferPrivate::didReceiveSample(Ref<MediaSample>&& originalSample)
>                 MediaTime eraseBeginTime = trackBuffer.highestPresentationTimestamp;
>                 MediaTime eraseEndTime = frameEndTimestamp - contiguousFrameTolerance;
> 
>+                if (eraseEndTime >= eraseBeginTime)
>+                    break;
>+                
>                 PresentationOrderSampleMap::iterator_range range;
>                 if (highestBufferedTime - trackBuffer.highestPresentationTimestamp < trackBuffer.lastFrameDuration) {
>                     // If the new frame is at the end of the buffered ranges, perform a sequential scan from end (O(1)).
>diff --git a/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp b/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp
>index ae16414f21c6846c1897709e1424e4a6a4b761a0..3c21c43076dc885fae7c19aa580bd5f9f3e0e1ed 100644
>--- a/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp
>+++ b/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp
>@@ -36,7 +36,6 @@
> #include "MediaSampleAVFObjC.h"
> #include "NotImplemented.h"
> #include "PlatformMediaSessionManager.h"
>-#include "SharedBuffer.h"
> #include "VP9UtilitiesCocoa.h"
> #include "VideoTrackPrivateWebM.h"
> #include "WebMAudioUtilitiesCocoa.h"
>@@ -365,21 +364,13 @@ public:
>         return Status(Status::kWouldBlock);
>     }
> 
>-    static void FreeSharedBuffer(void* refcon, void*, size_t)
>+    Status ReadInto(std::size_t numToRead, SharedBufferBuilder& outputBuffer, uint64_t* numActuallyRead)
>     {
>-        auto* buffer = reinterpret_cast<SharedBuffer*>(refcon);
>-        buffer->deref();
>-    }
>-
>-    Status ReadInto(std::size_t numToRead, CMBlockBufferRef outputBuffer, uint64_t* numActuallyRead)
>-    {
>-        ASSERT(outputBuffer && numActuallyRead);
>+        ASSERT(numActuallyRead);
>         if (!numActuallyRead)
>             return Status(Status::kNotEnoughMemory);
> 
>         *numActuallyRead = 0;
>-        if (!outputBuffer)
>-            return Status(Status::kNotEnoughMemory);
> 
>         while (numToRead && m_currentSegment != m_data.end()) {
>             auto& currentSegment = *m_currentSegment;
>@@ -389,44 +380,22 @@ public:
>                 continue;
>             }
>             RefPtr<SharedBuffer> sharedBuffer = currentSegment.getSharedBuffer();
>-            CMBlockBufferRef rawBlockBuffer = nullptr;
>-            uint64_t lastRead = 0;
>+            RefPtr<SharedBuffer> rawBlockBuffer;
>             if (!sharedBuffer) {
>                 // We could potentially allocate more memory than needed if the read is partial.
>-                auto err = PAL::CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, nullptr, numToRead, kCFAllocatorDefault, nullptr, 0, numToRead, kCMBlockBufferAssureMemoryNowFlag, &rawBlockBuffer);
>-                if (err != kCMBlockBufferNoErr)
>-                    return Status(Status::kNotEnoughMemory);
>-                uint8_t* blockBufferData = nullptr;
>-                size_t segmentSizeAtPosition = 0;
>-                err = PAL::CMBlockBufferGetDataPointer(rawBlockBuffer, 0, &segmentSizeAtPosition, nullptr, (char**)&blockBufferData);
>-                if (err != kCMBlockBufferNoErr)
>+                Vector<uint8_t> buffer;
>+                if (!buffer.tryReserveInitialCapacity(numToRead))
>                     return Status(Status::kNotEnoughMemory);
>-                auto readResult = currentSegment.read(m_positionWithinSegment, numToRead, blockBufferData);
>+                buffer.resize(numToRead);
>+                auto readResult = currentSegment.read(m_positionWithinSegment, numToRead, buffer.data());
>                 if (!readResult.has_value())
>                     return segmentReadErrorToWebmStatus(readResult.error());
>-                lastRead = readResult.value();
>-            } else {
>-                // TODO: could we only create a new CMBlockBuffer if the backend memory changed since the previous one?
>-                size_t canRead = std::min<size_t>(numToRead, sharedBuffer->size() - m_positionWithinSegment);
>-                // From CMBlockBufferCustomBlockSource documentation:
>-                // Note that for 64-bit architectures, this struct contains misaligned function pointers.
>-                // To avoid link-time issues, it is recommended that clients fill CMBlockBufferCustomBlockSource's function pointer fields
>-                // by using assignment statements, rather than declaring them as global or static structs.
>-                CMBlockBufferCustomBlockSource allocator;
>-                allocator.version = 0;
>-                allocator.AllocateBlock = nullptr;
>-                allocator.FreeBlock = FreeSharedBuffer;
>-                allocator.refCon = sharedBuffer.get();
>-                sharedBuffer->ref();
>-                auto err = PAL::CMBlockBufferCreateWithMemoryBlock(nullptr, static_cast<void*>(const_cast<uint8_t*>(sharedBuffer->data())), sharedBuffer->size(), nullptr, &allocator, m_positionWithinSegment, canRead, 0, &rawBlockBuffer);
>-                if (err != kCMBlockBufferNoErr)
>-                    return Status(Status::kNotEnoughMemory);
>-                lastRead = canRead;
>-            }
>-            auto blockBuffer = adoptCF(rawBlockBuffer);
>-            auto err = PAL::CMBlockBufferAppendBufferReference(outputBuffer, rawBlockBuffer, 0, 0, 0);
>-            if (err != kCMBlockBufferNoErr)
>-                return Status(Status::kNotEnoughMemory);
>+                buffer.resize(readResult.value());
>+                rawBlockBuffer = SharedBuffer::create(WTFMove(buffer));
>+            } else
>+                rawBlockBuffer = sharedBuffer->getContiguousData(m_positionWithinSegment, numToRead);
>+            auto lastRead = rawBlockBuffer->size();
>+            outputBuffer.append(*rawBlockBuffer);
>             m_position += lastRead;
>             *numActuallyRead += lastRead;
>             m_positionWithinSegment += lastRead;
>@@ -1201,16 +1170,10 @@ void SourceBufferParserWebM::provideMediaData(RetainPtr<CMSampleBufferRef> sampl
> 
> #define PARSER_LOG_ERROR_IF_POSSIBLE(...) if (parser().loggerPtr()) parser().loggerPtr()->error(logChannel(), Logger::LogSiteIdentifier(logClassName(), __func__, parser().logIdentifier()), __VA_ARGS__)
> 
>-RetainPtr<CMBlockBufferRef> SourceBufferParserWebM::TrackData::contiguousCompleteBlockBuffer(size_t offset, size_t length) const
>+Ref<SharedBuffer> SourceBufferParserWebM::TrackData::contiguousCompleteBlockBuffer(size_t offset, size_t length) const
> {
>-    if (!offset && !length && PAL::CMBlockBufferIsRangeContiguous(m_completeBlockBuffer.get(), 0, 0))
>-        return m_completeBlockBuffer;
>-    CMBlockBufferRef rawContiguousBuffer = nullptr;
>-    if (PAL::CMBlockBufferCreateContiguous(nullptr, m_completeBlockBuffer.get(), nullptr, nullptr, offset, length, 0, &rawContiguousBuffer) != kCMBlockBufferNoErr) {
>-        RELEASE_LOG_FAULT(WebAudio, "failed to create contiguous block buffer");
>-        return nullptr;
>-    }
>-    return adoptCF(rawContiguousBuffer);
>+    ASSERT(m_completeBlockBuffers && m_completeBlockBuffers.size() >= offset + length);
>+    return m_completeBlockBuffers.get()->getContiguousData(offset, length);
> }
> 
> webm::Status SourceBufferParserWebM::TrackData::readFrameData(webm::Reader& reader, const webm::FrameMetadata& metadata, uint64_t* bytesRemaining)
>@@ -1224,20 +1187,9 @@ webm::Status SourceBufferParserWebM::TrackData::readFrameData(webm::Reader& read
>     if (!m_completePacketSize)
>         m_completePacketSize = metadata.size;
> 
>-    if (!m_currentBlockBuffer) {
>-        ASSERT(!m_partialBytesRead);
>-        CMBlockBufferRef rawBlockBuffer = nullptr;
>-        auto err = PAL::CMBlockBufferCreateEmpty(kCFAllocatorDefault, mMaxBlockBufferCapacity, 0, &rawBlockBuffer);
>-        if (err != kCMBlockBufferNoErr || !rawBlockBuffer) {
>-            PARSER_LOG_ERROR_IF_POSSIBLE("CMBlockBufferCreateEmpty failed with error", err);
>-            return Skip(&reader, bytesRemaining);
>-        }
>-        m_currentBlockBuffer = adoptCF(rawBlockBuffer);
>-    }
>-
>     while (*bytesRemaining) {
>         uint64_t bytesRead;
>-        auto status = static_cast<SourceBufferParserWebM::SegmentReader&>(reader).ReadInto(*bytesRemaining, m_currentBlockBuffer.get(), &bytesRead);
>+        auto status = static_cast<SourceBufferParserWebM::SegmentReader&>(reader).ReadInto(*bytesRemaining, m_currentBlockBuffer, &bytesRead);
>         *bytesRemaining -= bytesRead;
>         m_partialBytesRead += bytesRead;
> 
>@@ -1249,68 +1201,60 @@ webm::Status SourceBufferParserWebM::TrackData::readFrameData(webm::Reader& read
>     if (m_partialBytesRead < *m_completePacketSize)
>         return webm::Status(webm::Status::kOkPartial);
> 
>-    if (!m_completeBlockBuffer)
>-        m_completeBlockBuffer = WTFMove(m_currentBlockBuffer);
>-    else {
>-        auto err = PAL::CMBlockBufferAppendBufferReference(m_completeBlockBuffer.get(), m_currentBlockBuffer.get(), 0, 0, 0);
>-        if (err) {
>-            PARSER_LOG_ERROR_IF_POSSIBLE("CMBlockBufferAppendBufferReference to complete block failed with error", err);
>-            return Status(Status::kNotEnoughMemory);
>-        }
>-        m_currentBlockBuffer = nullptr;
>-    }
>+    m_completeBlockBuffers.append(m_currentBlockBuffer.take());
>     m_partialBytesRead = 0;
> 
>     return webm::Status(webm::Status::kOkCompleted);
> }
> 
>-webm::Status SourceBufferParserWebM::VideoTrackData::consumeFrameData(webm::Reader& reader, const FrameMetadata& metadata, uint64_t* bytesRemaining, const CMTime& presentationTime, int sampleCount)
>+void SourceBufferParserWebM::TrackData::createSampleBuffer(std::optional<size_t> latestByteRangeOffset)
> {
>-#if ENABLE(VP9)
>-    auto status = readFrameData(reader, metadata, bytesRemaining);
>-    if (!status.completed_ok())
>-        return status;
>+    if (m_packetSizes.isEmpty())
>+        return;
> 
>-    createSampleBuffer(presentationTime, sampleCount, metadata);
>-    reset();
>-#else
>-    UNUSED_PARAM(metadata);
>-    UNUSED_PARAM(presentationTime);
>-    UNUSED_PARAM(sampleCount);
>-#endif
>+    CMSampleBufferRef rawSampleBuffer = nullptr;
>+    auto err = PAL::CMSampleBufferCreateReady(kCFAllocatorDefault, m_completeBlockBuffers.take()->createCMBlockBuffer().get(), formatDescription().get(), m_packetSizes.size(), m_packetTimings.size(), m_packetTimings.data(), m_packetSizes.size(), m_packetSizes.data(), &rawSampleBuffer);
>+    if (err) {
>+        PARSER_LOG_ERROR_IF_POSSIBLE("CMSampleBufferCreateReady failed with %d", err);
>+        return;
>+    }
> 
>-    return Skip(&reader, bytesRemaining);
>+    postProcess(rawSampleBuffer);
>+
>+    auto trackID = track().track_uid.value();
>+    parser().provideMediaData(adoptCF(rawSampleBuffer), trackID, latestByteRangeOffset);
>+}
>+
>+void SourceBufferParserWebM::VideoTrackData::resetCompleted()
>+{
>+    m_keyFrames.clear();
>+    TrackData::resetCompleted();
> }
> 
>-void SourceBufferParserWebM::VideoTrackData::createSampleBuffer(const CMTime& presentationTime, int sampleCount, const webm::FrameMetadata& metadata)
>+webm::Status SourceBufferParserWebM::VideoTrackData::consumeFrameData(webm::Reader& reader, const FrameMetadata& metadata, uint64_t* bytesRemaining, const CMTime& presentationTime, int)
> {
> #if ENABLE(VP9)
>-    uint8_t* blockBufferData = nullptr;
>+    auto status = readFrameData(reader, metadata, bytesRemaining);
>+    if (!status.completed_ok())
>+        return status;
>+
>     constexpr size_t maxHeaderSize = 32; // The maximum length of a VP9 uncompressed header is 144 bits and 11 bytes for VP8. Round high.
>     size_t segmentHeaderLength = std::min(maxHeaderSize, *m_completePacketSize);
>-    auto contiguousBuffer = contiguousCompleteBlockBuffer(0, segmentHeaderLength);
>-    if (!contiguousBuffer) {
>-        PARSER_LOG_ERROR_IF_POSSIBLE("VideoTrackData::createSampleBuffer failed to create contiguous data block");
>-        return;
>-    }
>-    auto err = PAL::CMBlockBufferGetDataPointer(contiguousBuffer.get(), 0, nullptr, nullptr, (char**)&blockBufferData);
>-    if (err) {
>-        PARSER_LOG_ERROR_IF_POSSIBLE("CMBlockBufferGetDataPointer failed with error", err);
>-        return;
>-    }
>+    auto contiguousBuffer = contiguousCompleteBlockBuffer(m_currentPacketByteOffset, segmentHeaderLength);
>+    const uint8_t* blockBufferData = contiguousBuffer->data();
> 
>     bool isKey = false;
>     RetainPtr<CMFormatDescriptionRef> formatDescription;
>     if (codec() == CodecType::VP9) {
>         if (!m_headerParser.ParseUncompressedHeader(blockBufferData, segmentHeaderLength))
>-            return;
>+            return Skip(&reader, bytesRemaining);
> 
>         if (m_headerParser.key()) {
>             isKey = true;
>             auto formatDescription = createFormatDescriptionFromVP9HeaderParser(m_headerParser, track().video.value().colour);
>             if (!formatDescription) {
>                 PARSER_LOG_ERROR_IF_POSSIBLE("failed to create format description from VPX header");
>-                return;
>+                return Skip(&reader, bytesRemaining);
>             }
>             setFormatDescription(WTFMove(formatDescription));
>         }
>@@ -1321,7 +1265,7 @@ void SourceBufferParserWebM::VideoTrackData::createSampleBuffer(const CMTime& pr
>             auto formatDescription = createFormatDescriptionFromVP8Header(*header, track().video.value().colour);
>             if (!formatDescription) {
>                 PARSER_LOG_ERROR_IF_POSSIBLE("failed to create format description from VPX header");
>-                return;
>+                return Skip(&reader, bytesRemaining);
>             }
>             setFormatDescription(WTFMove(formatDescription));
>         }
>@@ -1336,44 +1280,44 @@ void SourceBufferParserWebM::VideoTrackData::createSampleBuffer(const CMTime& pr
>     if (track.default_duration.is_present())
>         duration = track.default_duration.value() * presentationTime.timescale / k_us_in_seconds;
> 
>-    CMSampleBufferRef rawSampleBuffer = nullptr;
>-    CMSampleTimingInfo timing = { PAL::CMTimeMake(duration, presentationTime.timescale), presentationTime, presentationTime };
>-    err = PAL::CMSampleBufferCreateReady(kCFAllocatorDefault, m_completeBlockBuffer.get(), this->formatDescription().get(), sampleCount, 1, &timing, 1, &*m_completePacketSize, &rawSampleBuffer);
>-    if (err) {
>-        PARSER_LOG_ERROR_IF_POSSIBLE("CMSampleBufferCreateReady failed with error", err);
>-        return;
>-    }
>-    auto sampleBuffer = adoptCF(rawSampleBuffer);
>+    m_keyFrames.append(isKey);
>+    m_packetSizes.append(*m_completePacketSize);
>+    m_packetTimings.append({ PAL::CMTimeMake(duration, presentationTime.timescale), presentationTime, presentationTime });
>+    m_currentPacketByteOffset += *m_completePacketSize;
>+    m_completePacketSize = std::nullopt;
>+
>+    drainPendingSamples();
>+
>+    ASSERT(!*bytesRemaining);
>+    return webm::Status(webm::Status::kOkCompleted);
>+#else
>+    UNUSED_PARAM(presentationTime);
>+    UNUSED_PARAM(sampleCount);
>+    UNUSED_PARAM(metadata);
>+    return Skip(&reader, bytesRemaining);
>+#endif
>+}
> 
>-    auto attachmentsArray = PAL::CMSampleBufferGetSampleAttachmentsArray(sampleBuffer.get(), true);
>+void SourceBufferParserWebM::VideoTrackData::postProcess(CMSampleBufferRef rawSampleBuffer)
>+{
>+    auto attachmentsArray = PAL::CMSampleBufferGetSampleAttachmentsArray(rawSampleBuffer, true);
>     ASSERT(attachmentsArray);
>     if (!attachmentsArray) {
>         PARSER_LOG_ERROR_IF_POSSIBLE("CMSampleBufferGetSampleAttachmentsArray returned NULL");
>         return;
>     }
> 
>-    if (!isKey) {
>-        for (CFIndex i = 0, count = CFArrayGetCount(attachmentsArray); i < count; ++i) {
>-            CFMutableDictionaryRef attachments = checked_cf_cast<CFMutableDictionaryRef>(CFArrayGetValueAtIndex(attachmentsArray, i));
>+    ASSERT(size_t(CFArrayGetCount(attachmentsArray)) == m_keyFrames.size());
>+    for (CFIndex i = 0, count = CFArrayGetCount(attachmentsArray); i < count; ++i) {
>+        CFMutableDictionaryRef attachments = checked_cf_cast<CFMutableDictionaryRef>(CFArrayGetValueAtIndex(attachmentsArray, i));
>+        if (!m_keyFrames[i])
>             CFDictionarySetValue(attachments, PAL::kCMSampleAttachmentKey_NotSync, kCFBooleanTrue);
>-        }
>     }
>-
>-    auto trackID = track.track_uid.value();
>-    parser().provideMediaData(WTFMove(sampleBuffer), trackID, metadata.position);
>-#else
>-    UNUSED_PARAM(presentationTime);
>-    UNUSED_PARAM(sampleCount);
>-    UNUSED_PARAM(metadata);
>-#endif // ENABLE(VP9)
> }
> 
> void SourceBufferParserWebM::AudioTrackData::resetCompleted()
> {
>     mNumFramesInCompleteBlock = 0;
>-    m_packetSizes.clear();
>-    m_packetTimings.clear();
>-    m_currentPacketByteOffset = 0;
>     TrackData::resetCompleted();
> }
> 
>@@ -1383,8 +1327,7 @@ webm::Status SourceBufferParserWebM::AudioTrackData::consumeFrameData(webm::Read
>         auto& lastTiming = m_packetTimings.last();
>         if (PAL::CMTimeCompare(PAL::CMTimeAdd(lastTiming.duration, lastTiming.presentationTimeStamp), presentationTime)) {
>             // Discontinuity encountered, emit the previously demuxed samples.
>-            createSampleBuffer(metadata.position);
>-            reset();
>+            drainPendingSamples();
>         }
>     }
> 
>@@ -1392,11 +1335,6 @@ webm::Status SourceBufferParserWebM::AudioTrackData::consumeFrameData(webm::Read
>     if (!status.completed_ok())
>         return status;
> 
>-    // Attempts to minimise the amount of memory allocations due to repetitve CMBlockBufferAppendBufferReference calls in readFrameData.
>-    mNumFramesInCompleteBlock++;
>-    if (mNumFramesInCompleteBlock > mMaxBlockBufferCapacity)
>-        mMaxBlockBufferCapacity = mNumFramesInCompleteBlock;
>-
>     if (m_packetSizes.isEmpty())
>         m_samplePresentationTime = presentationTime;
> 
>@@ -1412,16 +1350,7 @@ webm::Status SourceBufferParserWebM::AudioTrackData::consumeFrameData(webm::Read
>             formatDescription = createVorbisAudioFormatDescription(privateData.size(), privateData.data());
>         else if (codec() == CodecType::Opus) {
>             auto contiguousBuffer = contiguousCompleteBlockBuffer(m_currentPacketByteOffset, *m_completePacketSize);
>-            if (!contiguousBuffer) {
>-                PARSER_LOG_ERROR_IF_POSSIBLE("AudioTrackData::consumeFrameData: unable to create contiguous data block");
>-                return Skip(&reader, bytesRemaining);
>-            }
>-            uint8_t* blockBufferData = nullptr;
>-            auto err = PAL::CMBlockBufferGetDataPointer(contiguousBuffer.get(), 0, nullptr, nullptr, (char**)&blockBufferData);
>-            if (err) {
>-                PARSER_LOG_ERROR_IF_POSSIBLE("CMBlockBufferGetDataPointer failed with error", err);
>-                return Skip(&reader, bytesRemaining);
>-            }
>+            const uint8_t* blockBufferData = contiguousBuffer->data();
>             OpusCookieContents cookieContents;
>             if (!parseOpusPrivateData(privateData.size(), privateData.data(), *m_completePacketSize, blockBufferData, cookieContents)) {
>                 PARSER_LOG_ERROR_IF_POSSIBLE("Failed to parse Opus private data");
>@@ -1456,16 +1385,7 @@ webm::Status SourceBufferParserWebM::AudioTrackData::consumeFrameData(webm::Read
>         OpusCookieContents cookieContents;
>         auto& privateData = track().codec_private.value();
>         auto contiguousBuffer = contiguousCompleteBlockBuffer(m_currentPacketByteOffset, *m_completePacketSize);
>-        if (!contiguousBuffer) {
>-            PARSER_LOG_ERROR_IF_POSSIBLE("AudioTrackData::consumeFrameData: unable to create contiguous data block");
>-            return Skip(&reader, bytesRemaining);
>-        }
>-        uint8_t* blockBufferData = nullptr;
>-        auto err = PAL::CMBlockBufferGetDataPointer(contiguousBuffer.get(), 0, nullptr, nullptr, (char**)&blockBufferData);
>-        if (err) {
>-            PARSER_LOG_ERROR_IF_POSSIBLE("CMBlockBufferGetDataPointer failed with error", err);
>-            return Skip(&reader, bytesRemaining);
>-        }
>+        const uint8_t* blockBufferData = contiguousBuffer->data();
>         if (!parseOpusPrivateData(privateData.size(), privateData.data(), *m_completePacketSize, blockBufferData, cookieContents)
>             || cookieContents.framesPerPacket != m_framesPerPacket
>             || cookieContents.frameDuration != m_frameDuration) {
>@@ -1481,40 +1401,18 @@ webm::Status SourceBufferParserWebM::AudioTrackData::consumeFrameData(webm::Read
> 
>     auto sampleDuration = PAL::CMTimeGetSeconds(PAL::CMTimeSubtract(presentationTime, m_samplePresentationTime)) + PAL::CMTimeGetSeconds(m_packetDuration) * sampleCount;
> 
>-    if (sampleDuration >= m_minimumSampleDuration) {
>-        createSampleBuffer(metadata.position);
>-        reset();
>-    }
>+    if (sampleDuration >= m_minimumSampleDuration)
>+        drainPendingSamples();
> 
>     ASSERT(!*bytesRemaining);
>     return webm::Status(webm::Status::kOkCompleted);
> }
> 
>-void SourceBufferParserWebM::AudioTrackData::createSampleBuffer(std::optional<size_t> latestByteRangeOffset)
>-{
>-    if (m_packetSizes.isEmpty())
>-        return;
>-
>-    CMSampleBufferRef rawSampleBuffer = nullptr;
>-    auto err = PAL::CMSampleBufferCreateReady(kCFAllocatorDefault, m_completeBlockBuffer.get(), formatDescription().get(), m_packetSizes.size(), m_packetTimings.size(), m_packetTimings.data(), m_packetSizes.size(), m_packetSizes.data(), &rawSampleBuffer);
>-    if (err) {
>-        PARSER_LOG_ERROR_IF_POSSIBLE("CMAudioSampleBufferCreateWithPacketDescriptions failed with %d", err);
>-        return;
>-    }
>-    auto sampleBuffer = adoptCF(rawSampleBuffer);
>-
>-    auto trackID = track().track_uid.value();
>-    parser().provideMediaData(WTFMove(sampleBuffer), trackID, latestByteRangeOffset);
>-}
>-
> void SourceBufferParserWebM::flushPendingAudioBuffers()
> {
>     for (auto& track : m_tracks) {
>-        if (track->trackType() == SourceBufferParserWebM::TrackData::Type::Audio) {
>-            AudioTrackData& audioTrack = downcast<AudioTrackData>(track.get());
>-            audioTrack.createSampleBuffer();
>-            audioTrack.resetCompleted();
>-        }
>+        if (track->trackType() == SourceBufferParserWebM::TrackData::Type::Audio)
>+            track->drainPendingSamples();
>     }
> }
> 
>diff --git a/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h b/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h
>index e876ab414a4abb33d518c37b41fe5a14776ab496..911b95148fc2356c0bf8de1dac9cd9a79c2355a8 100644
>--- a/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h
>+++ b/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h
>@@ -27,6 +27,7 @@
> 
> #if ENABLE(MEDIA_SOURCE)
> 
>+#include "SharedBuffer.h"
> #include "SourceBufferParser.h"
> #include <CoreAudio/CoreAudioTypes.h>
> #include <CoreMedia/CMTime.h>
>@@ -39,7 +40,6 @@
> #include <wtf/Vector.h>
> 
> typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef;
>-typedef struct OpaqueCMBlockBuffer *CMBlockBufferRef;
> 
> namespace webm {
> class WebmParser;
>@@ -157,30 +157,42 @@ public:
> 
>         virtual void resetCompleted()
>         {
>-            m_completeBlockBuffer = nullptr;
>+            m_completeBlockBuffers.reset();
>+            m_packetSizes.clear();
>+            m_packetTimings.clear();
>+            m_currentPacketByteOffset = 0;
>         }
>         void reset()
>         {
>             resetCompleted();
>             m_completePacketSize = std::nullopt;
>             m_partialBytesRead = 0;
>-            m_currentBlockBuffer = nullptr;
>+            m_currentBlockBuffer.reset();
>+        }
>+
>+        virtual void drainPendingSamples(std::optional<size_t> latestByteRangeOffset = std::nullopt)
>+        {
>+            createSampleBuffer(latestByteRangeOffset);
>+            reset();
>         }
> 
>     protected:
>-        RetainPtr<CMBlockBufferRef> contiguousCompleteBlockBuffer(size_t offset, size_t length) const;
>+        void createSampleBuffer(std::optional<size_t>);
>+        virtual void postProcess(CMSampleBufferRef) { };
>+        Ref<SharedBuffer> contiguousCompleteBlockBuffer(size_t offset, size_t length) const;
>         webm::Status readFrameData(webm::Reader&, const webm::FrameMetadata&, uint64_t* bytesRemaining);
>-        RetainPtr<CMBlockBufferRef> m_completeBlockBuffer;
>+        SharedBufferBuilder m_completeBlockBuffers;
>         std::optional<size_t> m_completePacketSize;
>-        // Initial allocation size of empty CMBlockBuffer.
>-        size_t mMaxBlockBufferCapacity { 0 };
>+        size_t m_currentPacketByteOffset { 0 };
>+        Vector<size_t> m_packetSizes;
>+        Vector<CMSampleTimingInfo> m_packetTimings;
> 
>     private:
>         CodecType m_codec;
>         webm::TrackEntry m_track;
>         Type m_trackType;
>         RetainPtr<CMFormatDescriptionRef> m_formatDescription;
>-        RetainPtr<CMBlockBufferRef> m_currentBlockBuffer;
>+        SharedBufferBuilder m_currentBlockBuffer;
>         SourceBufferParserWebM& m_parser;
>         // Size of the currently incomplete parsed packet.
>         size_t m_partialBytesRead { 0 };
>@@ -198,14 +210,14 @@ public:
>         {
>         }
> 
>-        webm::Status consumeFrameData(webm::Reader&, const webm::FrameMetadata&, uint64_t*, const CMTime&, int) final;
>-
>     private:
>-        void createSampleBuffer(const CMTime&, int, const webm::FrameMetadata&);
>         const char* logClassName() const { return "VideoTrackData"; }
>-
>+        webm::Status consumeFrameData(webm::Reader&, const webm::FrameMetadata&, uint64_t*, const CMTime&, int) final;
>+        void postProcess(CMSampleBufferRef) final;
>+        void resetCompleted() final;
> #if ENABLE(VP9)
>         vp9_parser::Vp9HeaderParser m_headerParser;
>+        Vector<bool> m_keyFrames;
> #endif
>     };
> 
>@@ -222,20 +234,15 @@ public:
>         {
>         }
> 
>+    private:
>         webm::Status consumeFrameData(webm::Reader&, const webm::FrameMetadata&, uint64_t*, const CMTime&, int) final;
>         void resetCompleted() final;
>-        void createSampleBuffer(std::optional<size_t> latestByteRangeOffset = std::nullopt);
>-
>-    private:
>         const char* logClassName() const { return "AudioTrackData"; }
> 
>         CMTime m_samplePresentationTime;
>         CMTime m_packetDuration;
>-        size_t m_currentPacketByteOffset { 0 };
>         uint8_t m_framesPerPacket { 0 };
>         Seconds m_frameDuration { 0_s };
>-        Vector<size_t> m_packetSizes;
>-        Vector<CMSampleTimingInfo> m_packetTimings;
>         size_t mNumFramesInCompleteBlock { 0 };
>         // FIXME: 0.5 - 1.0 seconds is a better duration per sample buffer, but use 2 seconds so at least the first
>         // sample buffer will play until we fix MediaSampleCursor::createSampleBuffer to deal with `endCursor`.
>diff --git a/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.h b/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.h
>index 9410a7c479634704eb59c9996034844b69a8876d..9544d9c257fe0bd5582803ae1a808450173c50b5 100644
>--- a/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.h
>+++ b/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.h
>@@ -65,7 +65,7 @@ struct VP8FrameHeader {
>     bool needsClamping { false };
> };
> 
>-std::optional<VP8FrameHeader> parseVP8FrameHeader(uint8_t* frameData, size_t frameSize);
>+std::optional<VP8FrameHeader> parseVP8FrameHeader(const uint8_t* frameData, size_t frameSize);
> RetainPtr<CMFormatDescriptionRef> createFormatDescriptionFromVP8Header(const VP8FrameHeader&, const webm::Element<webm::Colour>&);
> 
> class WEBCORE_EXPORT VP9TestingOverrides {
>diff --git a/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm b/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm
>index 5c0dfafdb2e67f0480505feac66a4ed544a29e33..dd1779f263892695944f42376fcdae5b6d30b26c 100644
>--- a/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/VP9UtilitiesCocoa.mm
>@@ -609,7 +609,7 @@ RetainPtr<CMFormatDescriptionRef> createFormatDescriptionFromVP9HeaderParser(con
>     return createFormatDescriptionFromVPCodecConfigurationRecord(record, parser.width(), parser.height());
> }
> 
>-std::optional<VP8FrameHeader> parseVP8FrameHeader(uint8_t* frameData, size_t frameSize)
>+std::optional<VP8FrameHeader> parseVP8FrameHeader(const uint8_t* frameData, size_t frameSize)
> {
>     // VP8 frame headers are defined in RFC 6386: <https://tools.ietf.org/html/rfc6386>.
>

Actions: View | Formatted Diff | Diff

Attachments on bug 237078: 452964 | 452967 | 453094 | 453095 | 453138 | 453139 | 453163 | 453164