Fix/robustness warnings (#4549)

* Set robustness level for Widevine check in Media Capabilities API to avoid warnings * Fix IMA test
Dash-Industry-Forum · Aug 16, 2024 · 5791060 · 5791060
1 parent d9454a1
commit 5791060
Show file tree

Hide file tree

Showing 7 changed files with 1,004 additions and 10 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -11,7 +11,8 @@
     "MediaSource": true,
     "WebKitMediaKeys": true,
     "MSMediaKeys": true,
-    "MediaKeys": true
+    "MediaKeys": true,
+    "google": true
   },
   "parserOptions": {
     "ecmaVersion": 2020,

diff --git a/src/streaming/constants/ProtectionConstants.js b/src/streaming/constants/ProtectionConstants.js
@@ -52,6 +52,15 @@ export default {
         LICENSE_RENEWAL: 'license-renewal',
         LICENSE_RELEASE: 'license-release',
         INDIVIDUALIZATION_REQUEST: 'individualization-request',
+    },
+    ROBUSTNESS_STRINGS: {
+        WIDEVINE: {
+            SW_SECURE_CRYPTO: 'SW_SECURE_CRYPTO',
+            SW_SECURE_DECODE: 'SW_SECURE_DECODE',
+            HW_SECURE_CRYPTO: 'HW_SECURE_CRYPTO',
+            HW_SECURE_DECODE: 'HW_SECURE_DECODE',
+            HW_SECURE_ALL: 'HW_SECURE_ALL'
+        }
     }
 }
 

diff --git a/src/streaming/utils/Capabilities.js b/src/streaming/utils/Capabilities.js
@@ -30,6 +30,7 @@
  */
 import FactoryMaker from '../../core/FactoryMaker.js';
 import Constants from '../constants/Constants.js';
+import ProtectionConstants from '../constants/ProtectionConstants.js';
 
 export function supportsMediaSource() {
     let hasManagedMediaSource = ('ManagedMediaSource' in window)
@@ -165,7 +166,7 @@ function Capabilities() {
             }
 
             const genericMediaCapabilitiesConfiguration = _getGenericMediaCapabilitiesConfig(inputConfig, type);
-            const configurationsToTest = _enhanceGenericConfigurationWithKeySystemConfiguration(genericMediaCapabilitiesConfiguration, inputConfig)
+            const configurationsToTest = _enhanceGenericConfigurationWithKeySystemConfiguration(genericMediaCapabilitiesConfiguration, inputConfig, type)
             const promises = configurationsToTest.map((configuration) => {
                 return navigator.mediaCapabilities.decodingInfo(configuration)
             })
@@ -229,7 +230,7 @@ function Capabilities() {
         return configuration
     }
 
-    function _enhanceGenericConfigurationWithKeySystemConfiguration(genericMediaCapabilitiesConfiguration, inputConfig) {
+    function _enhanceGenericConfigurationWithKeySystemConfiguration(genericMediaCapabilitiesConfiguration, inputConfig, type) {
         if (!inputConfig || !inputConfig.keySystemsMetadata || inputConfig.keySystemsMetadata.length === 0) {
             return [genericMediaCapabilitiesConfiguration];
         }
@@ -241,6 +242,10 @@ function Capabilities() {
                 if (keySystemMetadata.ks.systemString) {
                     curr.keySystemConfiguration.keySystem = keySystemMetadata.ks.systemString;
                 }
+                if (keySystemMetadata.ks.systemString === ProtectionConstants.WIDEVINE_KEYSTEM_STRING) {
+                    curr.keySystemConfiguration[type] = { robustness: ProtectionConstants.ROBUSTNESS_STRINGS.WIDEVINE.SW_SECURE_CRYPTO };
+
+                }
             }
             return curr
         })

diff --git a/test/functional/adapter/GoogleAdManagerAdapter.js b/test/functional/adapter/GoogleAdManagerAdapter.js
@@ -20,8 +20,7 @@ try {
     VAST_EVENTS_TO_VERIFY[google.ima.dai.api.StreamEvent.Type.COMPLETE] = {
         position: 4
     };
-}
-catch(e) {
+} catch (e) {
     console.log(e);
 }
 
@@ -89,13 +88,13 @@ class GoogleAdManagerAdapter {
         const data = event.event.messageData;
         const pts = event.event.calculatedPresentationTime;
         if ((data instanceof Uint8Array) && data.byteLength > 0) {
-            console.log(`Called streamManager.processMetadata using EMSG event at playback time ${this.playerAdapter.getCurrentTime()}`)
+            //console.log(`Called streamManager.processMetadata using EMSG event at playback time ${this.playerAdapter.getCurrentTime()}`)
             this.streamManager.processMetadata('ID3', data, pts);
         }
     }
 
     requestStream() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             const streamRequest = new google.ima.dai.api.PodStreamRequest();
             streamRequest.networkCode = NETWORK_CODE;
             streamRequest.customAssetKey = CUSTOM_ASSET_KEY;

diff --git a/test/functional/config/karma.functional.conf.cjs b/test/functional/config/karma.functional.conf.cjs
@@ -46,7 +46,7 @@ module.exports = function (config) {
         // list of files / patterns to load in the browser
         // https://github.com/webpack-contrib/karma-webpack#alternative-usage
         files: [
-            { pattern: 'https://imasdk.googleapis.com/js/sdkloader/ima3_dai.js', watched: false, nocache: true },
+            { pattern: 'test/functional/lib/ima3_dai.js', watched: false, nocache: true },
             { pattern: 'dist/dash.all.debug.js', watched: false, nocache: true },
             { pattern: 'dist/dash.mss.min.js', watched: false, nocache: true },
             { pattern: 'test/functional/content/**/*.mpd', watched: false, included: false, served: true }
@@ -110,7 +110,7 @@ module.exports = function (config) {
         client: {
             useIframe: false,
             mocha: {
-                timeout: 90000
+                timeout: 100000
             },
             testvectors
         },

diff --git a/test/functional/config/test-configurations/streams/smoke.json b/test/functional/config/test-configurations/streams/smoke.json
@@ -4,7 +4,6 @@
       "all"
     ],
     "excluded": [
-      "vendor/google-ad-manager-emsg"
     ]
   },
   "testvectors": [