Skip to content

ARRISEOS-48622: Don't release CDM when changing keys #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcin-mielczarczyk-red wants to merge 1 commit into
base: lgi-wpe-2.38-25Q3
Choose a base branch
from
Open

ARRISEOS-48622: Don't release CDM when changing keys #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ void MediaKeys::detachCDMClient(CDMClient& client)
{
ASSERT(m_cdmClients.contains(client));
m_cdmClients.remove(client);
}

void MediaKeys::releaseCDM()
{
if (m_cdmClients.computesEmpty()) {
m_instance->releaseCDM();
}
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/encryptedmedia/MediaKeys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class MediaKeys final

void attachCDMClient(CDMClient&);
void detachCDMClient(CDMClient&);
void releaseCDM();
void attemptToResumePlaybackOnClients();

bool hasOpenSessions() const;
Expand Down
3 changes: 3 additions & 0 deletions Source/WebCore/html/HTMLMediaElement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ HTMLMediaElement::~HTMLMediaElement()
#if ENABLE(ENCRYPTED_MEDIA)
if (m_mediaKeys) {
m_mediaKeys->detachCDMClient(*this);
m_mediaKeys->releaseCDM();
if (m_player)
m_player->cdmInstanceDetached(m_mediaKeys->cdmInstance());
}
Expand Down Expand Up @@ -2813,6 +2814,7 @@ void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys, Ref<DeferredPromise>&&
{
// https://w3c.github.io/encrypted-media/#dom-htmlmediaelement-setmediakeys
// W3C Editor's Draft 23 June 2017
INFO_LOG(LOGIDENTIFIER);

// 1. If this object's attaching media keys value is true, return a promise rejected with an InvalidStateError.
if (m_attachingMediaKeys) {
Expand Down Expand Up @@ -6100,6 +6102,7 @@ void HTMLMediaElement::stop()

if (m_mediaKeys) {
m_mediaKeys->detachCDMClient(*this);
m_mediaKeys->releaseCDM();
if (m_player)
m_player->cdmInstanceDetached(m_mediaKeys->cdmInstance());
}
Expand Down