live stream can switch from clear content to encrypted content #1094

CONTRIBUTORS

@@ -58,6 +58,7 @@ Rostislav Hejduk <[email protected]>
 Sam Dutton <[email protected]>
 Sanborn Hilland <[email protected]>
 Sandra Lokshina <[email protected]>
+Semih Gokceoglu <[email protected]>
 Seth Madison <[email protected]>
 Theodore Abshire <[email protected]>
 Thomas Stephens <[email protected]>

lib/media/drm_engine.js

@@ -465,6 +465,7 @@ shaka.media.DrmEngine.prototype.getDrmInfo = function() {
 shaka.media.DrmEngine.prototype.prepareMediaKeyConfigs_ =
     function(manifest, offline, configsByKeySystem, keySystemsInOrder) {
   var clearKeyDrmInfo = this.configureClearKey_();
+  var configDrmInfos = this.getDrmInfosByConfig_(manifest);
 
   manifest.periods.forEach(function(period) {
     period.variants.forEach(function(variant) {
@@ -474,6 +475,14 @@ shaka.media.DrmEngine.prototype.prepareMediaKeyConfigs_ =
         variant.drmInfos = [clearKeyDrmInfo];
       }
 
+      // If initial manifest contains unencrypted content,
+      // drm configuration overrides DrmInfo so drmEngine can be activated.
+      // Thus, player can play encrypted content if live stream switches from
+      // unencrypted content to encrypted content during live stream.
+      if (!!configDrmInfos) {
+        variant.drmInfos = configDrmInfos;
+      }
+
       variant.drmInfos.forEach(function(drmInfo) {
         this.fillInDrmInfoDefaults_(drmInfo);
 
@@ -774,6 +783,48 @@ shaka.media.DrmEngine.prototype.configureClearKey_ = function() {
 };
 
 
+/**
+ * Returns the DrmInfo that is generated by drm configation.
+ * It activates DrmEngine if drm configs have keySystems.
+ * @param {!shakaExtern.Manifest} manifest
+ * @return {(Array.<{object}>|null)}
+ * @private
+ */
+shaka.media.DrmEngine.prototype.getDrmInfosByConfig_ =
+    function(manifest) {
+  var config = this.config_;
+  if (!config) {
+    return null;
+  }
+
+  var serverKeys = Object.keys(config.servers || {});
+
+  if (!serverKeys.length) {
+    return null;
+  }
+
+  var isEncryptedContent = manifest.periods.every(function(period) {
+    period.variants.every(function(variant) {
+      return !!variant.drmInfos.length;
+    });
+  });
+
+  // Only creates for clear contents
+  if (isEncryptedContent) {
+    return null;
+  }
+
+  return serverKeys.map(function(keySystem) {
+    return {
+      // ignoring other properties
+      // since fillInDrmInfoDefaults_ fills default values
+      keySystem: keySystem,
+      licenseServerUri: config.servers[keySystem]
+    };
+  });
+};
+
+
 /**
  * Creates a DrmInfo object describing the settings used to initialize the
  * engine.

test/media/drm_engine_unit.js

@@ -374,18 +374,37 @@ describe('DrmEngine', function() {
       }).then(done);
     });
 
-    it('makes no queries for clear content', function(done) {
+    it('makes no queries for clear content if no key config', function(done) {
       requestMediaKeySystemAccessSpy.and.callFake(
           fakeRequestMediaKeySystemAccess.bind(null, []));
       manifest.periods[0].variants[0].drmInfos = [];
+      config.servers = {};
+      config.advanced = {};
 
+      drmEngine.configure(config);
       drmEngine.init(manifest, /* offline */ false).then(function() {
         expect(drmEngine.initialized()).toBe(true);
         expect(drmEngine.keySystem()).toBe('');
         expect(requestMediaKeySystemAccessSpy.calls.count()).toBe(0);
       }).catch(fail).then(done);
     });
 
+    it('makes queries for clear content if key is configured', function(done) {
+      requestMediaKeySystemAccessSpy.and.callFake(
+          fakeRequestMediaKeySystemAccess.bind(null, ['drm.abc']));
+      manifest.periods[0].variants[0].drmInfos = [];
+      config.servers = {
+        'drm.abc': 'http://abc.drm/license'
+      };
+
+      drmEngine.configure(config);
+      drmEngine.init(manifest, /* offline */ false).then(function() {
+        expect(drmEngine.initialized()).toBe(true);
+        expect(drmEngine.keySystem()).toBe('drm.abc');
+        expect(requestMediaKeySystemAccessSpy.calls.count()).toBe(1);
+      }).then(done);
+    });
+
     it('uses advanced config to override DrmInfo fields', function(done) {
       // Leave only one drmInfo
       manifest = new shaka.test.ManifestGenerator()
@@ -508,6 +527,8 @@ describe('DrmEngine', function() {
       requestMediaKeySystemAccessSpy.and.callFake(
           fakeRequestMediaKeySystemAccess.bind(null, []));
       manifest.periods[0].variants[0].drmInfos = [];
+      config.servers = {};
+      config.advanced = {};
 
       initAndAttach().then(function() {
         expect(mockVideo.setMediaKeys).not.toHaveBeenCalled();
@@ -775,6 +796,8 @@ describe('DrmEngine', function() {
 
       it('dispatches an error if manifest says unencrypted', function(done) {
         manifest.periods[0].variants[0].drmInfos = [];
+        config.servers = {};
+        config.advanced = {};
 
         onErrorSpy.and.stub();