Changeset 193999 in webkit
- Timestamp:
- Dec 11, 2015 5:46:55 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r193995 r193999 1 2015-12-11 Jer Noble <jer.noble@apple.com> 2 3 [EME] Do not pass in the initialization data to AVContentKeyRequest as the contentIdentifier. 4 https://bugs.webkit.org/show_bug.cgi?id=152204 5 rdar://problem/23867877 6 7 Reviewed by Eric Carlson. 8 9 The AVContentKeyRequest API has been updated to no longer require a contentId parameter if the 10 ID can be derived from the initialization data. 11 12 * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm: 13 (WebCore::CDMSessionAVContentKeySession::update): 14 1 15 2015-12-11 Alexey Proskuryakov <ap@apple.com> 2 16 -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
r193972 r193999 268 268 RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]); 269 269 270 RetainPtr<NSData> initData = adoptNS([[NSData alloc] initWithBytes:m_initData->data() length:m_initData->length()]);271 272 270 RetainPtr<NSDictionary> options; 273 271 if (!m_protocolVersions.isEmpty() && canLoadAVContentKeyRequestProtocolVersionsKey()) { … … 284 282 errorCode = MediaPlayer::NoError; 285 283 systemCode = 0; 286 NSData* requestData = [m_keyRequest contentKeyRequestDataForApp:certificateData.get() contentIdentifier: initData.get()options:options.get() error:nil];284 NSData* requestData = [m_keyRequest contentKeyRequestDataForApp:certificateData.get() contentIdentifier:nil options:options.get() error:nil]; 287 285 nextMessage = Uint8Array::create(static_cast<const uint8_t*>([requestData bytes]), [requestData length]); 288 286
Note: See TracChangeset
for help on using the changeset viewer.