Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 710c98ac50e2a103b0f5fea4cbb2c1179a25d986
https://github.com/WebKit/WebKit/commit/710c98ac50e2a103b0f5fea4cbb2c1179a25d986
Author: Jer Noble <[email protected]>
Date: 2024-11-03 (Sun, 03 Nov 2024)
Changed paths:
A
LayoutTests/http/tests/media/fairplay/legacy-fairplay-mse-muxed-nowait-expected.txt
A
LayoutTests/http/tests/media/fairplay/legacy-fairplay-mse-muxed-nowait.html
M LayoutTests/platform/mac/TestExpectations
M Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp
M Source/WebCore/platform/graphics/LegacyCDMSession.h
M
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h
M
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.cpp
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.h
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.messages.in
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.cpp
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.h
M Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMFactory.cpp
M Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMSession.cpp
M Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMSession.h
Log Message:
-----------
REGRESSION(282990@main) LegacyEME fails when appending media segment before
completing key exchange
https://bugs.webkit.org/show_bug.cgi?id=282252
rdar://138002160
Reviewed by Andy Estes.
When enabling the "modern AVContentKey support" path, we updated the modern EME
implementation
but neglected to update the LegacyEME implementation with similar changes. To
support the new
AVContentKeySession path, we must _not_ add the AVStreamDataParser to the
AVContentKeySession.
Additionally, when keys are added through the LegacyEME path, we must
explicitly signal the
SourceBufferPrivate to attempt to enqueue the protected samples for decode and
display.
*
LayoutTests/http/tests/media/fairplay/legacy-fairplay-mse-muxed-nowait-expected.txt:
Added.
* LayoutTests/http/tests/media/fairplay/legacy-fairplay-mse-muxed-nowait.html:
Added.
*
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
(WebCore::CDMSessionMediaSourceAVFObjC::addSourceBuffer):
(WebCore::CDMSessionMediaSourceAVFObjC::removeSourceBuffer):
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::keyAdded):
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
(WebCore::MediaSourcePrivateAVFObjC::keyAdded):
*
Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::setCDMSession):
(WebCore::SourceBufferPrivateAVFObjC::attemptToDecrypt):
Canonical link: https://commits.webkit.org/286068@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
