Changeset 255043 in webkit


Ignore:
Timestamp:
Jan 23, 2020 5:20:33 PM (4 years ago)
Author:
commit-queue@webkit.org
Message:

[EME] Key renewal fails when using AVContentKeyReportGroup
https://bugs.webkit.org/show_bug.cgi?id=206694
<rdar://problem/58628345>

Patch by Jer Noble <jer.noble@apple.com> on 2020-01-23
Reviewed by Eric Carlson.

When a CDMInstanceSession has a AVContentKeyReportGroup, it doesn't have an AVContentKeySession; it has
to get the session from it's parent CDMInstance to request key renewal.

  • platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:

(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r255037 r255043  
     12020-01-23  Jer Noble  <jer.noble@apple.com>
     2
     3        [EME] Key renewal fails when using AVContentKeyReportGroup
     4        https://bugs.webkit.org/show_bug.cgi?id=206694
     5        <rdar://problem/58628345>
     6
     7        Reviewed by Eric Carlson.
     8
     9        When a CDMInstanceSession has a AVContentKeyReportGroup, it doesn't have an AVContentKeySession; it has
     10        to get the session from it's parent CDMInstance to request key renewal.
     11
     12        * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
     13        (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):
     14
    1152020-01-23  David Kilzer  <ddkilzer@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm

    r254896 r255043  
    608608            return;
    609609        }
    610         [m_session renewExpiringResponseDataForContentKeyRequest:request];
     610        auto session = m_session ? m_session.get() : m_instance->contentKeySession();
     611        [session renewExpiringResponseDataForContentKeyRequest:request];
    611612        m_updateLicenseCallback = WTFMove(callback);
    612613        return;
Note: See TracChangeset for help on using the changeset viewer.