Changeset 175615 in webkit

Timestamp:

Nov 5, 2014 1:56:37 AM (9 years ago)

Author:

jer.noble@apple.com

Message:

[EME][Mac] Allow the client to specify FPS protocol versions in the keySystem type field.
​https://bugs.webkit.org/show_bug.cgi?id=138380

Reviewed by Eric Carlson.

Parse out the requested FPS protocol version of the keySystem type string and pass it to
AVStreamDataParser as an options dictionary.

• platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:

(WebCore::validKeySystemRE): Added, match comma-separated version suffixes.
(WebCore::CDMPrivateMediaSourceAVFObjC::supportsKeySystem): Call above.
(WebCore::CDMPrivateMediaSourceAVFObjC::createSession): Parse out the version numbers

and pass into the session as a vector.

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

(WebCore::CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC): Take a vector of

protocol version numbers.

(WebCore::CDMSessionMediaSourceAVFObjC::update): Create an NSArray and pass into

the key request creation method in an options dictionary.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Jer Noble  <jer.noble@apple.com>
+
+        [EME][Mac] Allow the client to specify FPS protocol versions in the keySystem type field.
+        https://bugs.webkit.org/show_bug.cgi?id=138380
+
+        Reviewed by Eric Carlson.
+
+        Parse out the requested FPS protocol version of the keySystem type string and pass it to
+        AVStreamDataParser as an options dictionary.
+
+        * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
+        (WebCore::validKeySystemRE): Added, match comma-separated version suffixes.
+        (WebCore::CDMPrivateMediaSourceAVFObjC::supportsKeySystem): Call above.
+        (WebCore::CDMPrivateMediaSourceAVFObjC::createSession): Parse out the version numbers
+            and pass into the session as a vector.
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+        (WebCore::CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC): Take a vector of
+            protocol version numbers.
+        (WebCore::CDMSessionMediaSourceAVFObjC::update): Create an NSArray and pass into
+            the key request creation method in an options dictionary.
+
 2014-11-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm

@@ -35 +35 @@
 #import "MediaPlayerPrivateMediaSourceAVFObjC.h"
 #import "WebCoreSystemInterface.h"
+#import <wtf/NeverDestroyed.h>
+#import <yarr/RegularExpression.h>
+
+using JSC::Yarr::RegularExpression;
 
 namespace WebCore {
+
+static RegularExpression& validKeySystemRE()
+{
+    static NeverDestroyed<RegularExpression> keySystemRE("^com\\.apple\\.fps\\.2_\\d+(?:,\\d+)*$", TextCaseInsensitive);
+    return keySystemRE;
+}
 
 bool CDMPrivateMediaSourceAVFObjC::supportsKeySystem(const String& keySystem)
@@ -43 +53 @@
         return false;
 
-    if (!keySystem.isEmpty() && !equalIgnoringCase(keySystem, "com.apple.fps.2_0"))
+    if (!keySystem.isEmpty() && validKeySystemRE().match(keySystem) < 0)
         return false;
 
@@ -82 +92 @@
 std::unique_ptr<CDMSession> CDMPrivateMediaSourceAVFObjC::createSession()
 {
-    return std::make_unique<CDMSessionMediaSourceAVFObjC>();
+    String keySystem = m_cdm->keySystem();
+    ASSERT(validKeySystemRE().match(keySystem) >= 0);
+
+    Vector<String> protocolVersionsStrings;
+    keySystem.substring(16).split(',', false, protocolVersionsStrings);
+
+    Vector<int> protocolVersions;
+    for (auto& protocolVersionString : protocolVersionsStrings)
+        protocolVersions.append(protocolVersionString.toInt());
+
+    return std::make_unique<CDMSessionMediaSourceAVFObjC>(protocolVersions);
 }
 

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

@@ -41 +41 @@
 class CDMSessionMediaSourceAVFObjC : public CDMSession, public SourceBufferPrivateAVFObjCErrorClient {
 public:
-    CDMSessionMediaSourceAVFObjC();
+    CDMSessionMediaSourceAVFObjC(const Vector<int>& protocolVersions);
     virtual ~CDMSessionMediaSourceAVFObjC();
 
@@ -71 +71 @@
     RetainPtr<NSData> m_expiredSession;
     RetainPtr<CDMSessionMediaSourceAVFObjCObserver> m_dataParserObserver;
+    Vector<int> m_protocolVersions;
     String m_sessionId;
     enum { Normal, KeyRelease } m_mode;

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

@@ -46 +46 @@
 SOFT_LINK_CLASS(AVFoundation, AVStreamDataParser);
 SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVStreamSession);
-SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVStreamSessionContentProtectionSessionIdentifierChangedNotification, NSString *);
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVStreamDataParserContentKeyRequestProtocolVersionsKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVStreamSessionContentProtectionSessionIdentifierChangedNotification, NSString *)
 
 @interface AVStreamDataParser : NSObject
@@ -93 +94 @@
 namespace WebCore {
 
-CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC()
+CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC(const Vector<int>& protocolVersions)
     : m_client(nullptr)
     , m_dataParserObserver(adoptNS([[CDMSessionMediaSourceAVFObjCObserver alloc] initWithParent:this]))
+    , m_protocolVersions(protocolVersions)
     , m_mode(Normal)
 {
@@ -220 +222 @@
         RetainPtr<NSData> initData = adoptNS([[NSData alloc] initWithBytes:m_initData->data() length:m_initData->length()]);
 
+
+        RetainPtr<NSDictionary> options;
+        if (!m_protocolVersions.isEmpty() && canLoadAVStreamDataParserContentKeyRequestProtocolVersionsKey()) {
+            RetainPtr<NSMutableArray> protocolVersionsOption = adoptNS([[NSMutableArray alloc] init]);
+            for (auto& version : m_protocolVersions) {
+                if (!version)
+                    continue;
+                [protocolVersionsOption addObject:@(version)];
+            }
+
+            options = @{ getAVStreamDataParserContentKeyRequestProtocolVersionsKey(): protocolVersionsOption.get() };
+        }
+
         NSError* error = nil;
-        RetainPtr<NSData> request = [protectedSourceBuffer->parser() streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:initData.get() trackID:protectedSourceBuffer->protectedTrackID() options:nil error:&error];
+        RetainPtr<NSData> request = [protectedSourceBuffer->parser() streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:initData.get() trackID:protectedSourceBuffer->protectedTrackID() options:options.get() error:&error];
 
         if (![protectedSourceBuffer->parser() respondsToSelector:@selector(contentProtectionSessionIdentifier)])