<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163907] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163907">163907</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 13:50:21 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EME][Mac] Move the implementation of CDMPrivateAVFoundation back into MediaPlayerPrivateAVFoundationObjC.
https://bugs.webkit.org/show_bug.cgi?id=128559
Reviewed by Dean Jackson.
To prepare for multiple simultaneous CDMs with muliple MediaPlayer types, move the implementation for
CDMPrivateAVFoundation back into its media engine.
* Modules/encryptedmedia/CDMPrivateAVFoundation.mm:
(WebCore::MediaKeyExceptionToErrorCode): Added.
(WebCore::CDMSessionAVFoundation::generateKeyRequest): Moved to MediaPlayerPrivateAVFoundationObjC.
(WebCore::CDMSessionAVFoundation::releaseKeys): Ditto.
(WebCore::CDMSessionAVFoundation::update): Ditto.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::generateKeyRequest): Added, pass through to MediaPlayerPrivate.
(WebCore::MediaPlayer::releaseKeys): Ditto.
(WebCore::MediaPlayer::update): Ditto.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::generateKeyRequest): Added.
(WebCore::MediaPlayerPrivateInterface::releaseKeys): Ditto.
(WebCore::MediaPlayerPrivateInterface::update): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::generateKeyRequest): Moved from CDMSessionAVFoundation.
(WebCore::MediaPlayerPrivateAVFoundationObjC::releaseKeys): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::update): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateAVFoundationmm">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateAVFoundation.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-10 Jer Noble <jer.noble@apple.com>
+
+ [EME][Mac] Move the implementation of CDMPrivateAVFoundation back into MediaPlayerPrivateAVFoundationObjC.
+ https://bugs.webkit.org/show_bug.cgi?id=128559
+
+ Reviewed by Dean Jackson.
+
+ To prepare for multiple simultaneous CDMs with muliple MediaPlayer types, move the implementation for
+ CDMPrivateAVFoundation back into its media engine.
+
+ * Modules/encryptedmedia/CDMPrivateAVFoundation.mm:
+ (WebCore::MediaKeyExceptionToErrorCode): Added.
+ (WebCore::CDMSessionAVFoundation::generateKeyRequest): Moved to MediaPlayerPrivateAVFoundationObjC.
+ (WebCore::CDMSessionAVFoundation::releaseKeys): Ditto.
+ (WebCore::CDMSessionAVFoundation::update): Ditto.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::generateKeyRequest): Added, pass through to MediaPlayerPrivate.
+ (WebCore::MediaPlayer::releaseKeys): Ditto.
+ (WebCore::MediaPlayer::update): Ditto.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::generateKeyRequest): Added.
+ (WebCore::MediaPlayerPrivateInterface::releaseKeys): Ditto.
+ (WebCore::MediaPlayerPrivateInterface::update): Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::generateKeyRequest): Moved from CDMSessionAVFoundation.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::releaseKeys): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::update): Ditto.
+
</ins><span class="cx"> 2014-01-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Run UserAgentScripts through jsmin rather than the css preprocessor
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateAVFoundationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateAVFoundation.mm (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateAVFoundation.mm 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateAVFoundation.mm 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -90,6 +90,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static unsigned short MediaKeyExceptionToErrorCode(MediaPlayer::MediaKeyException error)
+{
+ switch (error) {
+ case MediaPlayer::NoError:
+ return 0;
+ case MediaPlayer::InvalidPlayerState:
+ return INVALID_STATE_ERR;
+ case MediaPlayer::KeySystemNotSupported:
+ return NOT_SUPPORTED_ERR;
+ default:
+ ASSERT_NOT_REACHED();
+ return 0;
+ }
+}
+
</ins><span class="cx"> PassRefPtr<Uint8Array> CDMSessionAVFoundation::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="lines">@@ -97,48 +112,24 @@
</span><span class="cx"> MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
</span><span class="cx"> if (!mediaPlayer) {
</span><span class="cx"> errorCode = NOT_SUPPORTED_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- String keyURI;
- String keyID;
- RefPtr<Uint8Array> certificate;
- if (!MediaPlayerPrivateAVFoundationObjC::extractKeyURIKeyIDAndCertificateFromInitData(initData, keyURI, keyID, certificate)) {
- errorCode = INVALID_STATE_ERR;
- return 0;
- }
-
- m_request = MediaPlayerPrivateAVFoundationObjC::takeRequestForPlayerAndKeyURI(mediaPlayer, keyURI);
- if (!m_request) {
- errorCode = INVALID_STATE_ERR;
- return 0;
- }
-
</del><span class="cx"> m_sessionId = createCanonicalUUIDString();
</span><span class="cx">
</span><del>- RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:certificate->baseAddress() length:certificate->byteLength()]);
- NSString* assetStr = keyID;
- RetainPtr<NSData> assetID = [NSData dataWithBytes: [assetStr cStringUsingEncoding:NSUTF8StringEncoding] length:[assetStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
- NSError* error = 0;
- RetainPtr<NSData> keyRequest = [m_request.get() streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:assetID.get() options:nil error:&error];
-
- if (!keyRequest) {
- NSError* underlyingError = [[error userInfo] objectForKey:NSUnderlyingErrorKey];
- errorCode = CDM::DomainError;
- systemCode = [underlyingError code];
- return 0;
- }
-
- errorCode = 0;
- systemCode = 0;
- destinationURL = String();
-
- RefPtr<ArrayBuffer> keyRequestBuffer = ArrayBuffer::create([keyRequest.get() bytes], [keyRequest.get() length]);
- return Uint8Array::create(keyRequestBuffer, 0, keyRequestBuffer->byteLength());
</del><ins>+ MediaPlayer::MediaKeyException error;
+ RefPtr<Uint8Array> request = mediaPlayer->generateKeyRequest(m_sessionId, mimeType, initData, destinationURL, error, systemCode);
+ errorCode = MediaKeyExceptionToErrorCode(error);
+ return request;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CDMSessionAVFoundation::releaseKeys()
</span><span class="cx"> {
</span><ins>+ MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
+ if (!mediaPlayer)
+ return;
+
+ mediaPlayer->releaseKeys(m_sessionId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CDMSessionAVFoundation::update(Uint8Array* key, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode)
</span><span class="lines">@@ -146,15 +137,16 @@
</span><span class="cx"> if (!key)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RetainPtr<NSData> keyData = adoptNS([[NSData alloc] initWithBytes:key->baseAddress() length:key->byteLength()]);
- [[m_request.get() dataRequest] respondWithData:keyData.get()];
- [m_request.get() finishLoading];
- errorCode = 0;
- systemCode = 0;
- nextMessage = nullptr;
- m_request = nullptr;
</del><ins>+ MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
+ if (!mediaPlayer) {
+ errorCode = NOT_SUPPORTED_ERR;
+ return nullptr;
+ }
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ MediaPlayer::MediaKeyException error;
+ bool succeeded = mediaPlayer->update(m_sessionId, key, nextMessage, error, systemCode);
+ errorCode = MediaKeyExceptionToErrorCode(error);
+ return succeeded;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -523,6 +523,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+PassRefPtr<Uint8Array> MediaPlayer::generateKeyRequest(const String& sessionID, const String& mimeType, Uint8Array* initData, String& destinationURL, MediaKeyException& error, unsigned long& systemCode)
+{
+ return m_private->generateKeyRequest(sessionID, mimeType, initData, destinationURL, error, systemCode);
+}
+
+void MediaPlayer::releaseKeys(const String& sessionID)
+{
+ m_private->releaseKeys(sessionID);
+}
+
+bool MediaPlayer::update(const String& sessionID, Uint8Array* key, RefPtr<Uint8Array>& nextMessage, MediaKeyException& error, unsigned long& systemCode)
+{
+ return m_private->update(sessionID, key, nextMessage, error, systemCode);
+}
+#endif
+
</ins><span class="cx"> double MediaPlayer::duration() const
</span><span class="cx"> {
</span><span class="cx"> return m_private->durationDouble();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -315,16 +315,24 @@
</span><span class="cx"> void play();
</span><span class="cx"> void pause();
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> // Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
</span><span class="cx"> // This is different from the asynchronous MediaKeyError.
</span><span class="cx"> enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA)
</ins><span class="cx"> MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength);
</span><span class="cx"> MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId);
</span><span class="cx"> MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ PassRefPtr<Uint8Array> generateKeyRequest(const String& sessionID, const String& mimeType, Uint8Array* initData, String& destinationURL, MediaKeyException& error, unsigned long& systemCode);
+ void releaseKeys(const String& sessionID);
+ bool update(const String& sessionID, Uint8Array* key, RefPtr<Uint8Array>& nextMessage, MediaKeyException& error, unsigned long& systemCode);
+#endif
+
</ins><span class="cx"> bool paused() const;
</span><span class="cx"> bool seeking() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -207,6 +207,12 @@
</span><span class="cx"> virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ virtual PassRefPtr<Uint8Array> generateKeyRequest(const String&, const String&, Uint8Array*, String&, MediaPlayer::MediaKeyException&, unsigned long&) { return nullptr; }
+ virtual void releaseKeys(const String&) { }
+ virtual bool update(const String&, Uint8Array*, RefPtr<Uint8Array>&, MediaPlayer::MediaKeyException&, unsigned long&) { return false; }
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual bool requiresTextTrackRepresentation() const { return false; }
</span><span class="cx"> virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -198,6 +198,12 @@
</span><span class="cx"> virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ PassRefPtr<Uint8Array> generateKeyRequest(const String& sessionId, const String& mimeType, Uint8Array* initData, String& destinationURL, MediaPlayer::MediaKeyException& error, unsigned long& systemCode);
+ void releaseKeys(const String& sessionId);
+ bool update(const String& sessionId, Uint8Array* key, RefPtr<Uint8Array>& nextMessage, MediaPlayer::MediaKeyException& error, unsigned long& systemCode);
+#endif
+
</ins><span class="cx"> virtual String languageOfPrimaryAudioTrack() const override;
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -1597,15 +1597,70 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><del>-RetainPtr<AVAssetResourceLoadingRequest> MediaPlayerPrivateAVFoundationObjC::takeRequestForPlayerAndKeyURI(MediaPlayer* player, const String& keyURI)
</del><ins>+PassRefPtr<Uint8Array> MediaPlayerPrivateAVFoundationObjC::generateKeyRequest(const String& sessionId, const String& mimeType, Uint8Array* initData, String& destinationURL, MediaPlayer::MediaKeyException& error, unsigned long& systemCode)
</ins><span class="cx"> {
</span><del>- MediaPlayerPrivateAVFoundationObjC* _this = playerToPrivateMap().get(player);
- if (!_this)
- return nullptr;
</del><ins>+ UNUSED_PARAM(mimeType);
</ins><span class="cx">
</span><del>- return _this->m_keyURIToRequestMap.take(keyURI);
</del><ins>+ String keyURI;
+ String keyID;
+ RefPtr<Uint8Array> certificate;
+ if (!MediaPlayerPrivateAVFoundationObjC::extractKeyURIKeyIDAndCertificateFromInitData(initData, keyURI, keyID, certificate)) {
+ error = MediaPlayer::InvalidPlayerState;
+ return 0;
+ }
</ins><span class="cx">
</span><ins>+ RetainPtr<AVAssetResourceLoadingRequest> request = m_keyURIToRequestMap.take(keyURI);
+ if (!request) {
+ error = MediaPlayer::InvalidPlayerState;
+ return 0;
+ }
+
+ m_sessionIDToRequestMap.add(sessionId, request);
+
+ RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:certificate->baseAddress() length:certificate->byteLength()]);
+ NSString* assetStr = keyID;
+ RetainPtr<NSData> assetID = [NSData dataWithBytes: [assetStr cStringUsingEncoding:NSUTF8StringEncoding] length:[assetStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
+ NSError* nsError = 0;
+ RetainPtr<NSData> keyRequest = [request streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:assetID.get() options:nil error:&nsError];
+
+ if (!keyRequest) {
+ NSError* underlyingError = [[nsError userInfo] objectForKey:NSUnderlyingErrorKey];
+ systemCode = [underlyingError code];
+ return 0;
+ }
+
+ error = MediaPlayer::NoError;
+ systemCode = 0;
+ destinationURL = String();
+
+ RefPtr<ArrayBuffer> keyRequestBuffer = ArrayBuffer::create([keyRequest.get() bytes], [keyRequest.get() length]);
+ return Uint8Array::create(keyRequestBuffer, 0, keyRequestBuffer->byteLength());
</ins><span class="cx"> }
</span><ins>+
+void MediaPlayerPrivateAVFoundationObjC::releaseKeys(const String& sessionId)
+{
+ UNUSED_PARAM(sessionId);
+}
+
+bool MediaPlayerPrivateAVFoundationObjC::update(const String& sessionId, Uint8Array* key, RefPtr<Uint8Array>& nextMessage, MediaPlayer::MediaKeyException& error, unsigned long& systemCode)
+{
+ ASSERT(key);
+
+ RetainPtr<AVAssetResourceLoadingRequest> request = m_sessionIDToRequestMap.get(sessionId);
+ if (!request) {
+ error = MediaPlayer::InvalidPlayerState;
+ return false;
+ }
+
+ RetainPtr<NSData> keyData = adoptNS([[NSData alloc] initWithBytes:key->baseAddress() length:key->byteLength()]);
+ [[request dataRequest] respondWithData:keyData.get()];
+ [request finishLoading];
+ error = MediaPlayer::NoError;
+ systemCode = 0;
+ nextMessage = nullptr;
+
+ return true;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> void effectiveRateChanged();
</span><span class="cx"> void sizeChanged();
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ void keyNeeded(Uint8Array*);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> // MediaPlayerPrivateInterface
</span><span class="cx"> virtual void load(const String& url) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (163906 => 163907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-02-11 21:36:06 UTC (rev 163906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-02-11 21:50:21 UTC (rev 163907)
</span><span class="lines">@@ -534,6 +534,13 @@
</span><span class="cx"> m_player->sizeChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
+void MediaPlayerPrivateMediaSourceAVFObjC::keyNeeded(Uint8Array* initData)
+{
+ m_player->keyNeeded(initData);
+}
+#endif
+
</ins><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::setReadyState(MediaPlayer::ReadyState readyState)
</span><span class="cx"> {
</span><span class="cx"> if (m_readyState == readyState)
</span></span></pre>
</div>
</div>
</body>
</html>