Diff
Modified: trunk/Source/WebCore/ChangeLog (163906 => 163907)
--- 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)
@@ -1,3 +1,33 @@
+2014-02-10 Jer Noble <[email protected]>
+
+ [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.
+
2014-01-24 Jer Noble <[email protected]>
Run UserAgentScripts through jsmin rather than the css preprocessor
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateAVFoundation.mm (163906 => 163907)
--- 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)
@@ -90,6 +90,21 @@
{
}
+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;
+ }
+}
+
PassRefPtr<Uint8Array> CDMSessionAVFoundation::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
{
UNUSED_PARAM(mimeType);
@@ -97,48 +112,24 @@
MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
if (!mediaPlayer) {
errorCode = NOT_SUPPORTED_ERR;
- return 0;
+ return nullptr;
}
- 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;
- }
-
m_sessionId = createCanonicalUUIDString();
- 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());
+ MediaPlayer::MediaKeyException error;
+ RefPtr<Uint8Array> request = mediaPlayer->generateKeyRequest(m_sessionId, mimeType, initData, destinationURL, error, systemCode);
+ errorCode = MediaKeyExceptionToErrorCode(error);
+ return request;
}
void CDMSessionAVFoundation::releaseKeys()
{
+ MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
+ if (!mediaPlayer)
+ return;
+
+ mediaPlayer->releaseKeys(m_sessionId);
}
bool CDMSessionAVFoundation::update(Uint8Array* key, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode)
@@ -146,15 +137,16 @@
if (!key)
return false;
- 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;
+ MediaPlayer* mediaPlayer = m_parent->cdm()->mediaPlayer();
+ if (!mediaPlayer) {
+ errorCode = NOT_SUPPORTED_ERR;
+ return nullptr;
+ }
- return true;
+ MediaPlayer::MediaKeyException error;
+ bool succeeded = mediaPlayer->update(m_sessionId, key, nextMessage, error, systemCode);
+ errorCode = MediaKeyExceptionToErrorCode(error);
+ return succeeded;
}
}
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (163906 => 163907)
--- 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)
@@ -523,6 +523,23 @@
}
#endif
+#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
+
double MediaPlayer::duration() const
{
return m_private->durationDouble();
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (163906 => 163907)
--- 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)
@@ -315,16 +315,24 @@
void play();
void pause();
-#if ENABLE(ENCRYPTED_MEDIA)
+#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
// Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
// This is different from the asynchronous MediaKeyError.
enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
+#endif
+#if ENABLE(ENCRYPTED_MEDIA)
MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength);
MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId);
MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId);
#endif
+#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
+
bool paused() const;
bool seeking() const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (163906 => 163907)
--- 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)
@@ -207,6 +207,12 @@
virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }
#endif
+#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
+
#if ENABLE(VIDEO_TRACK)
virtual bool requiresTextTrackRepresentation() const { return false; }
virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (163906 => 163907)
--- 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)
@@ -198,6 +198,12 @@
virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&);
#endif
+#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
+
virtual String languageOfPrimaryAudioTrack() const override;
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (163906 => 163907)
--- 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)
@@ -1597,15 +1597,70 @@
#endif
#if ENABLE(ENCRYPTED_MEDIA_V2)
-RetainPtr<AVAssetResourceLoadingRequest> MediaPlayerPrivateAVFoundationObjC::takeRequestForPlayerAndKeyURI(MediaPlayer* player, const String& keyURI)
+PassRefPtr<Uint8Array> MediaPlayerPrivateAVFoundationObjC::generateKeyRequest(const String& sessionId, const String& mimeType, Uint8Array* initData, String& destinationURL, MediaPlayer::MediaKeyException& error, unsigned long& systemCode)
{
- MediaPlayerPrivateAVFoundationObjC* _this = playerToPrivateMap().get(player);
- if (!_this)
- return nullptr;
+ UNUSED_PARAM(mimeType);
- return _this->m_keyURIToRequestMap.take(keyURI);
+ String keyURI;
+ String keyID;
+ RefPtr<Uint8Array> certificate;
+ if (!MediaPlayerPrivateAVFoundationObjC::extractKeyURIKeyIDAndCertificateFromInitData(initData, keyURI, keyID, certificate)) {
+ error = MediaPlayer::InvalidPlayerState;
+ return 0;
+ }
+ 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());
}
+
+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;
+}
#endif
#if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (163906 => 163907)
--- 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)
@@ -72,6 +72,10 @@
void effectiveRateChanged();
void sizeChanged();
+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ void keyNeeded(Uint8Array*);
+#endif
+
private:
// MediaPlayerPrivateInterface
virtual void load(const String& url) override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (163906 => 163907)
--- 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)
@@ -534,6 +534,13 @@
m_player->sizeChanged();
}
+#if ENABLE(ENCRYPTED_MEDIA_V2)
+void MediaPlayerPrivateMediaSourceAVFObjC::keyNeeded(Uint8Array* initData)
+{
+ m_player->keyNeeded(initData);
+}
+#endif
+
void MediaPlayerPrivateMediaSourceAVFObjC::setReadyState(MediaPlayer::ReadyState readyState)
{
if (m_readyState == readyState)
