[webkit-changes] [WebKit/WebKit] 9ab66e: Use Ref<MediaSample> in SampleMap

Jean-Yves Avenard noreply at github.com
Thu Nov 30 18:49:04 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9ab66ea20d6d624cca45d03cda802d3497757a7f
      https://github.com/WebKit/WebKit/commit/9ab66ea20d6d624cca45d03cda802d3497757a7f
  Author: Jean-Yves Avenard <jya at apple.com>
  Date:   2023-11-30 (Thu, 30 Nov 2023)

  Changed paths:
    M Source/WebCore/Modules/mediasource/SampleMap.cpp
    M Source/WebCore/Modules/mediasource/SampleMap.h
    M Source/WebCore/platform/graphics/SourceBufferPrivate.cpp
    M Source/WebCore/platform/graphics/TrackBuffer.cpp
    M Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
    M Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm
    M Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp
    M Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.cpp
    M Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp

  Log Message:
  -----------
  Use Ref<MediaSample> in SampleMap
https://bugs.webkit.org/show_bug.cgi?id=265610
rdar://119005030

Reviewed by Eric Carlson.

The RefPtr<MediaSample> in the SampleMap could never be null. This further enforces that it is so.

* Source/WebCore/Modules/mediasource/SampleMap.cpp:
(WebCore::SampleMap::addSample):
(WebCore::SampleMap::removeSample):
(WebCore::PresentationOrderSampleMap::findSampleContainingPresentationTime):
(WebCore::PresentationOrderSampleMap::findSampleContainingOrAfterPresentationTime):
(WebCore::DecodeOrderSampleMap::findSyncSamplePriorToPresentationTime):
(WebCore::DecodeOrderSampleMap::findSyncSampleAfterPresentationTime):
(WebCore::PresentationOrderSampleMap::findSamplesBetweenPresentationTimesFromEnd):
(WebCore::DecodeOrderSampleMap::findDependentSamples):
* Source/WebCore/Modules/mediasource/SampleMap.h:
(WebCore::SampleMap::addRange):
* Source/WebCore/platform/graphics/SourceBufferPrivate.cpp:
(WebCore::SourceBufferPrivate::bufferedSamplesForTrackId):
(WebCore::SourceBufferPrivate::provideMediaData):
(WebCore::SourceBufferPrivate::processMediaSample):
* Source/WebCore/platform/graphics/TrackBuffer.cpp:
(WebCore::TrackBuffer::findSeekTimeForTargetTime):
(WebCore::TrackBuffer::removeSamples): Remove a potental UAF as MediaSample passed as argument may no longer exists
once it's been removed from the SampleMap.
(WebCore::TrackBuffer::removeCodedFrames):
* Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
(WebCore::toSample):
(WebCore::ImageDecoderAVFObjC::frameInfos const):
* Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm:
(WebCore::MediaPlayerPrivateWebM::provideMediaData):
(WebCore::MediaPlayerPrivateWebM::didProvideMediaDataForTrackId):
* Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.cpp:
(WebKit::assumedDecodeTime):
(WebKit::stepIterator):
(WebKit::stepTime):
(WebKit::MediaSampleCursor::setLocator const):
(WebKit::MediaSampleCursor::locateMediaSample const):
(WebKit::MediaSampleCursor::getPlayableHorizon const):
* Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp:
(WebKit::MediaTrackReader::greatestPresentationTime const):
(WebKit::MediaTrackReader::copyProperty):

Canonical link: https://commits.webkit.org/271365@main




More information about the webkit-changes mailing list