Changeset 166509 in webkit

Timestamp:

Mar 31, 2014 9:43:32 AM (10 years ago)

Author:

jer.noble@apple.com

Message:

[MSE][Mac] Support lease-renewal.
​https://bugs.webkit.org/show_bug.cgi?id=130919

Reviewed by Eric Carlson.

Trigger a new key request when receiving an update message containting "renew".

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

(WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest): Drive-by fix; generate a UTF-8

based array.

(WebCore::CDMSessionMediaSourceAVFObjC::update):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Jer Noble  <jer.noble@apple.com>
+
+        [MSE][Mac] Support lease-renewal.
+        https://bugs.webkit.org/show_bug.cgi?id=130919
+
+        Reviewed by Eric Carlson.
+
+        Trigger a new key request when receiving an update message containting "renew".
+
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+        (WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest): Drive-by fix; generate a UTF-8
+            based array.
+        (WebCore::CDMSessionMediaSourceAVFObjC::update):
+
 2014-03-31  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm

@@ -39 +39 @@
 #import <CoreMedia/CMBase.h>
 #import <objc/objc-runtime.h>
+#import <wtf/NeverDestroyed.h>
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
@@ -74 +75 @@
 
     String certificateString(ASCIILiteral("certificate"));
-    RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(certificateString.length(), 2);
-    RefPtr<JSC::Uint16Array> array = JSC::Uint16Array::create(buffer, 0, certificateString.length());
+    RefPtr<Uint8Array> array = Uint8Array::create(certificateString.length());
     for (unsigned i = 0, length = certificateString.length(); i < length; ++i)
         array->set(i, certificateString[i]);
-    return Uint8Array::create(buffer, 0, buffer->byteLength());
+    return array;
 }
 
@@ -111 +111 @@
     }
 
+    static NeverDestroyed<String> renewMessage("renew");
+    String keyAsString(key->data(), key->length());
+
+    if (keyAsString == renewMessage) {
+        [m_parent->parser() renewExpiringContentKeyResponseDataForTrackID:m_parent->protectedTrackID()];
+        return true;
+    }
+
     LOG(Media, "CDMSessionMediaSourceAVFObjC::update(%p) - key data", this);
     errorCode = MediaPlayer::NoError;