Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 02963503fd1b3b0456000c1bfddf77c518f489f4
https://github.com/WebKit/WebKit/commit/02963503fd1b3b0456000c1bfddf77c518f489f4
Author: Jean-Yves Avenard <[email protected]>
Date: 2025-10-21 (Tue, 21 Oct 2025)
Changed paths:
M Source/WebCore/platform/PlatformMediaError.cpp
M Source/WebCore/platform/PlatformMediaError.h
M Source/WebCore/platform/graphics/AudioVideoRenderer.h
M Source/WebCore/platform/graphics/avfoundation/AudioVideoRendererAVFObjC.h
M Source/WebCore/platform/graphics/avfoundation/AudioVideoRendererAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
Log Message:
-----------
[MSE/FairPlay] Have AudioVideoRenderer manage CDMInstance/CDMSession
https://bugs.webkit.org/show_bug.cgi?id=300681
rdar://162583496
Reviewed by Andy Estes.
Move MediaSample's CDM management from SourceBufferPrivateAVFObjC to
AudioVideoRendererAVFObjC.
No change in observable behaviour. Covered by existing tests.
Manually tested with Netflix and Disney+
* Source/WebCore/platform/PlatformMediaError.cpp:
(WebCore::convertEnumerationToString):
* Source/WebCore/platform/PlatformMediaError.h:
* Source/WebCore/platform/graphics/AudioVideoRenderer.h:
(WebCore::TracksRendererManager::setInitData):
(WebCore::TracksRendererManager::attemptToDecrypt):
(WebCore::TracksRendererManager::initData const):
(WebCore::TracksRendererManager::setCDMSession):
* Source/WebCore/platform/graphics/avfoundation/AudioVideoRendererAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/AudioVideoRendererAVFObjC.mm:
(WebCore::AudioVideoRendererAVFObjC::AudioVideoRendererAVFObjC):
(WebCore::AudioVideoRendererAVFObjC::enqueueSample):
(WebCore::AudioVideoRendererAVFObjC::setCDMInstance):
(WebCore::AudioVideoRendererAVFObjC::setInitData):
(WebCore::AudioVideoRendererAVFObjC::attemptToDecrypt):
(WebCore::AudioVideoRendererAVFObjC::tryToEnqueueBlockedSamples):
(WebCore::AudioVideoRendererAVFObjC::canEnqueueSample):
(WebCore::AudioVideoRendererAVFObjC::attachContentKeyToSampleIfNeeded):
(WebCore::AudioVideoRendererAVFObjC::setCDMSession):
*
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC):
(WebCore::SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID):
(WebCore::SourceBufferPrivateAVFObjC::setCDMSession):
(WebCore::SourceBufferPrivateAVFObjC::setCDMInstance):
(WebCore::SourceBufferPrivateAVFObjC::attemptToDecrypt):
(WebCore::SourceBufferPrivateAVFObjC::canEnqueueSample):
(WebCore::SourceBufferPrivateAVFObjC::enqueueSample):
(WebCore::SourceBufferPrivateAVFObjC::didBecomeReadyForMoreSamples):
(WebCore::supportsAttachContentKey): Deleted.
(WebCore::m_streamDataParser): Deleted.
(WebCore::m_logIdentifier): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::trackIsBlocked const): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::tryToEnqueueBlockedSamples): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::attachContentKeyToSampleIfNeeded):
Deleted.
Canonical link: https://commits.webkit.org/301865@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
