Merge branch 'main' into inBandKeyRotationMain

AUTHORS

@@ -70,6 +70,7 @@ SameGoal Inc. <*@samegoal.com>
 Sanborn Hilland <[email protected]>
 Sander Saares <[email protected]>
 Sanil Raut <[email protected]>
+Seongryun Jo <[email protected]>
 Swank Motion Pictures Inc. <*@swankmp.com>
 TalkTalk Plc <*@talktalkplc.com>
 Tatsiana Gelahova <[email protected]>
@@ -80,5 +81,6 @@ uStudio Inc. <*@ustudio.com>
 Verizon Digital Media Services <*@verizondigitalmedia.com>
 ViacomCBS <*@viacomcbs.com>
 Vincent Valot <[email protected]>
+V-Nova Limited <*@v-nova.com>
 Wayne Morgan <[email protected]>
 Raymond Cheng <[email protected]>

CONTRIBUTORS

@@ -105,6 +105,7 @@ Sandra Lokshina <[email protected]>
 Sanil Raut <[email protected]>
 Satheesh Velmurugan <[email protected]>
 Semih Gokceoglu <[email protected]>
+Seongryun Jo <[email protected]>
 Seth Madison <[email protected]>
 Tatsiana Gelahova <[email protected]>
 Theodore Abshire <[email protected]>
@@ -119,6 +120,7 @@ Toshihiro Suzuki <[email protected]>
 Vasanth Polipelli <[email protected]>
 Vignesh Venkatasubramanian <[email protected]>
 Vincent Valot <[email protected]>
+Vinod Balakrishnan <[email protected]>
 Wayne Morgan <[email protected]>
 Yohann Connell <[email protected]>
 Raymond Cheng <[email protected]>

build/types/complete

@@ -8,3 +8,4 @@
 +@polyfill
 +@text
 +@ui
++@lcevc

build/types/lcevc

@@ -0,0 +1,3 @@
+# LCEVC library.
+
++../../lib/lcevc/lcevc_dil.js

demo/common/assets.js

@@ -40,6 +40,7 @@ shakaAssets.Source = {
   APPLE: shakaDemo.MessageIds.APPLE,
   IRT: shakaDemo.MessageIds.IRT,
   MICROSOFT: shakaDemo.MessageIds.MICROSOFT,
+  VNOVA: shakaDemo.MessageIds.VNOVA,
 };
 
 
@@ -1283,5 +1284,32 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
       .addLicenseServer('com.microsoft.playready', 'http://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:false,ck:W31bfVt9W31bfVt9W31bfQ==,ckt:aescbc)'),
   // }}}
+
+  // MPEG-5 LCEVC assets {{{
+  /* LCEVC Enabled Content with LCEVC Encoded Stream */
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Big Buck Bunny (LCEVC H264)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/big_buck_bunny.png',
+      /* manifestUri= */ 'https://dyctis843rxh5.cloudfront.net/vnIAZIaowG1K7qOt/master.m3u8',
+      /* source= */ shakaAssets.Source.VNOVA)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.WEBM)
+      .addFeature(shakaAssets.Feature.OFFLINE)
+      .addDescription('H264 HLS stream with LCEVC enhancement')
+      .markAsFeatured('Big Buck Bunny (LCEVC H264)')
+      .setExtraConfig({
+        streaming: {
+          useNativeHlsOnSafari: false,
+          forceTransmuxTS: true,
+        },
+        lcevc: {
+          dynamicPerformanceScaling: true,
+          logLevel: 0,
+          drawLogo: false,
+        },
+      }),
+  // }}}
 ];
 /* eslint-enable max-len */

demo/common/message_ids.js

@@ -206,6 +206,10 @@ shakaDemo.MessageIds = {
   INACCURATE_MANIFEST_TOLERANCE: 'DEMO_INACCURATE_MANIFEST_TOLERANCE',
   INITIAL_SEGMENT_LIMIT: 'DEMO_INITIAL_SEGMENT_LIMIT',
   LANGUAGE_SECTION_HEADER: 'DEMO_LANGUAGE_SECTION_HEADER',
+  LCEVC_DRAW_LOGO: 'DEMO_LCEVC_DRAW_LOGO',
+  LCEVC_DYNAMIC_PERFORMANCE_SCALING: 'DEMO_LCEVC_DYNAMIC_PERFORMANCE_SCALING',
+  LCEVC_LOG_LEVEL: 'DEMO_LCEVC_LOG_LEVEL',
+  LCEVC_SECTION_HEADER: 'DEMO_LCEVC_SECTION_HEADER',
   LOG_LEVEL: 'DEMO_LOG_LEVEL',
   LOG_LEVEL_DEBUG: 'DEMO_LOG_LEVEL_DEBUG',
   LOG_LEVEL_INFO: 'DEMO_LOG_LEVEL_INFO',
@@ -270,6 +274,7 @@ shakaDemo.MessageIds = {
   USE_NATIVE_HLS_SAFARI: 'DEMO_USE_NATIVE_HLS_SAFARI',
   USE_PERSISTENT_LICENSES: 'DEMO_USE_PERSISTENT_LICENSES',
   VIDEO_ROBUSTNESS: 'DEMO_VIDEO_ROBUSTNESS',
+  VNOVA: 'DEMO_VNOVA',
   XLINK_FAIL_GRACEFULLY: 'DEMO_XLINK_FAIL_GRACEFULLY',
 };
 /* eslint-enable max-len */

demo/config.js

@@ -97,6 +97,7 @@ shakaDemo.Config = class {
     this.addRetrictionsSection_('',
         shakaDemo.MessageIds.RESTRICTIONS_SECTION_HEADER);
     this.addCmcdSection_();
+    this.addLcevcSection_();
   }
 
   /**
@@ -296,6 +297,17 @@ shakaDemo.Config = class {
         .addBoolInput_(MessageIds.USE_HEADERS, 'cmcd.useHeaders');
   }
 
+  /** @private */
+  addLcevcSection_() {
+    const MessageIds = shakaDemo.MessageIds;
+    const docLink = this.resolveExternLink_('.LcevcConfiguration');
+    this.addSection_(MessageIds.LCEVC_SECTION_HEADER, docLink)
+        .addBoolInput_(MessageIds.LCEVC_DYNAMIC_PERFORMANCE_SCALING,
+            'lcevc.dynamicPerformanceScaling')
+        .addNumberInput_(MessageIds.LCEVC_LOG_LEVEL, 'lcevc.logLevel')
+        .addBoolInput_(MessageIds.LCEVC_DRAW_LOGO, 'lcevc.drawLogo');
+  }
+
   /**
    * @param {string} category
    * @param {!shakaDemo.MessageIds} sectionName

demo/index.html

@@ -38,6 +38,8 @@
     <script defer src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js"></script>
     <!-- transmuxing support is enabled by including this: -->
     <script defer src="../node_modules/mux.js/dist/mux.min.js"></script>
+    <!-- MPEG-5 Part2 LCEVC support is enabled by including this: -->
+    <script defer src="../node_modules/lcevc_dil.js/dist/lcevc_dil.min.js"></script>
     <!-- MDL is enabled by including this: -->
     <script defer src="../node_modules/material-design-lite/dist/material.min.js"></script>
     <!-- MDL modal dialogs are enabled by including these: -->

demo/locales/en.json

@@ -115,6 +115,10 @@
   "DEMO_IRT": "IRT",
   "DEMO_JSDELIVR": "jsDelivr",
   "DEMO_LANGUAGE_SECTION_HEADER": "Language",
+  "DEMO_LCEVC_DRAW_LOGO": "Draw LCEVC Logo",
+  "DEMO_LCEVC_DYNAMIC_PERFORMANCE_SCALING": "LCEVC Dynamic Performance scaling",
+  "DEMO_LCEVC_LOG_LEVEL": "LCEVC Log Level",
+  "DEMO_LCEVC_SECTION_HEADER": "MPEG-5 Part-2 LCEVC",
   "DEMO_LIBRARIES": "Google Hosted Libraries",
   "DEMO_LICENSE": "Apache License",
   "DEMO_LICENSE_CERTIFICATE_URL": "Custom License Certificate URL",
@@ -244,6 +248,7 @@
   "DEMO_VISUALIZER_AUTO_SCREENSHOT_TOGGLE": "Take Screenshot On Stall",
   "DEMO_VISUALIZER_BUTTON": "Buffer Visualizer",
   "DEMO_VISUALIZER_SCREENSHOT_BUTTON": "Take Screenshot",
+  "DEMO_VNOVA": "V-Nova",
   "DEMO_VOD": "VOD",
   "DEMO_WEBM": "WebM",
   "DEMO_WIDEVINE": "Widevine DRM",

demo/locales/source.json

@@ -463,6 +463,22 @@
     "description": "The header for a section of configuration values.",
     "message": "Language"
   },
+  "DEMO_LCEVC_DRAW_LOGO": {
+    "description": "LCEVC Watermark on the top left hand corner of the canvas.",
+    "message": "Draw [PROPER_NAME:LCEVC] Logo"
+  },
+  "DEMO_LCEVC_DYNAMIC_PERFORMANCE_SCALING": {
+    "description": "Dynamic Performance scaling for enabling/disabling LCEVC decoding based on decode performance.",
+    "message": "[PROPER_NAME:LCEVC] [JARGON:Dynamic Performance scaling]"
+  },
+  "DEMO_LCEVC_LOG_LEVEL": {
+    "description": "Log Level for LCEVC Lib (0-5)",
+    "message": "[PROPER_NAME:LCEVC] Log Level"
+  },
+  "DEMO_LCEVC_SECTION_HEADER": {
+    "description": "The header for a section of configuration values.",
+    "message": "[PROPER_NAME:MPEG-5 Part-2 LCEVC]"
+  },
   "DEMO_LIBRARIES": {
     "description": "A link in the footer, to Shaka Player in the Google Hosted Libraries CDN.",
     "message": "[PROPER_NAME:Google Hosted Libraries]"
@@ -979,6 +995,10 @@
     "description": "A button that takes a screenshot of the current visualizer state.",
     "message": "Take Screenshot"
   },
+  "DEMO_VNOVA": {
+    "description": "Text that describes an asset that comes from V-Nova.",
+    "message": "[PROPER_NAME:V-Nova]"
+  },
   "DEMO_VOD": {
     "description": "Text that describes an asset that is a VOD (Video On Delivery).",
     "message": "[JARGON:VOD]"

docs/design/lcevc-integration.md

@@ -0,0 +1,72 @@
+
+# Shaka Player LCEVC integration
+
+# Introduction
+
+This article describes the V-Nova LCEVC Shaka Player integration.
+
+# LCEVC Integration
+
+## Adding V-Nova required files
+### Importing DIL - Decoder Integration Layer
+
+V-Nova LCEVC DIL Libraries are included using the same approach that the other external libraries are currently using. The necessary V-Nova LCEVC DIL files need to be imported in the HTML page that is going to be used by Shaka Player to decode LCEVC. Checks are inplace that make sure the necessary objects are available.
+
+Npm package : <https://www.npmjs.com/package/lcevc_dil.js>
+
+```javascript
+  <!-- MPEG-5 Part2 LCEVC support is enabled by including this: -->
+  <script defer src="../node_modules/lcevc_dil.js/dist/lcevc_dil.min.js"></script>
+```
+
+To allow the Closure compiler to use the objects and methods that are exported by the DIL.js a new `extern` is created.
+
+### Defining an Extern for LCEVC
+
+`externs/lcevc.js` exposes the functions from the LCEVC DIL library required for LCEVC Decoding.
+
+## Integration point
+
+### The shaka.lcevc.Dil class - (DIL : Decoder Integration Layer)
+
+The main logic of the LCEVC integration is located in the `lib/lcevc_dil.min.js` file. In this file the shaka.lcevc.Dil is exported to be used in the project. This class is in charge of creating the Dil object using the mentioned externs, checking if LCEVC DIL library is available, etc.
+
+### Modifications in the player
+
+The shaka.Player class, defined in the `lib/player.js` file, is the main player object for Shaka Player. There is a setter function for setting up a `canvas` element that is received from the user.
+If shaka.ui is used the `canvas` is created in line with the video element in the same container overlaying the video element. If user provides a custom canvas using the setter function, The user is responsible for placing the canvas element in the desired position and resizing it.
+
+`shaka.externs.LcevcConfiguration` is added to the `playerConfiguration` that is used as configuration for the LCEVC DIL Library.
+
+The Dil object is created in the `onLoad_()` event that is triggered when a new video is loaded in Shaka Player. Attaching to a media element is defined as:
+
+-   Registering error listeners to the media element.
+-   Catching the video element for use outside of the load graph.
+
+The Dil object is created only if LCEVC is supported (LCEVC libs are loaded on the page) and also when it was not already created in another `onLoad_()` event execution.
+
+
+### Feeding the Dil
+
+The logic that Shaka Player uses to communicate with the Media Source Extensions (MSE) is located in the `media/media_source_engine.js` file.
+
+![image.png](lcevc-architecture.png)
+
+ `append_()` function that is used to feed the MSE Source Buffer is intercepted and modified to pass the video buffers to the LCEVC DIL Libraries before appending to the MSE Source Buffers. 
+
+## Demo page
+
+The relevant libraries are added in the Demo Page like so: 
+
+```javascript
+  <!-- MPEG-5 Part2 LCEVC support is enabled by including this: -->
+  <script defer src="../node_modules/lcevc_dil.js/dist/lcevc_dil.min.js"></script>
+```
+
+And a new video sample with enhancement data is added to the `demo/common/assets.js` file under a new source `MPEG-5 Part 2 LCEVC`.
+
+After these changes the demo page looks like :
+
+![image.png](lcevc-demo.png)
+
+          

externs/lcevc.js

@@ -0,0 +1,81 @@
+/**
+* @fileoverview Externs for LcevcDil
+* compiler.
+*
+* @externs
+*/
+
+// This empty namespace is declared to check if LcevcDil libraries are loaded.
+var libDPIModule = {};
+var LcevcDil = {};
+
+/**
+* LCEVC DIL constructor
+* @constructor
+*/
+LcevcDil.LcevcDIL = class {
+  /**
+   * @param {HTMLVideoElement} media
+   * @param {HTMLCanvasElement} canvas
+   * @param {shaka.extern.LcevcConfiguration} dilConfig
+   */
+  constructor(media, canvas, dilConfig) {
+  }
+
+  /**
+   * Append the video buffers before they are appended to
+   * Media Source Extensions SourceBuffer. Here the lcevc data
+   * will be parsed and managed to enahnce frames based on timestamps.
+   *
+   * @param {!BufferSource} data Video Buffer Data.
+   * @param {string} type Type of Video Buffer Data.
+   * @param {number} variantId Variant that the fragment belongs to.
+   */
+  appendBuffer(data, type, variantId) {}
+
+  /**
+   * Set current variant as variantId to the LCEVC decoder
+   * @param {!number} variantId
+   * @param {!boolean} autoBufferSwitch is lcevcDil mode that switches variant
+   * when the downloaded buffer from last variant has finished playing and
+   * buffers from the new variant starts to play.
+   */
+  setLevelSwitching(variantId, autoBufferSwitch) {}
+
+  /**
+   * Set container Format for LCEVC Data Parsing.
+   * @param {!number} containerFormat container type of the stream.
+   */
+  setContainerFormat(containerFormat) {}
+
+  /**
+   * Close LCEVC DIL
+   */
+  close() {}
+};
+
+/**
+ * LCEVC Support Check
+ */
+LcevcDil.SupportObject = {
+
+  /**
+   * Check if canvas has WebGL support
+   * @param {HTMLCanvasElement} canvas
+   * @return {boolean} true if requirements are met.
+   */
+  webGLSupport(canvas) {},
+
+};
+
+/**
+ * LCEVC Support Checklist Result
+ * @type {boolean}
+ */
+LcevcDil.SupportObject.SupportStatus;
+
+/**
+ * LCEVC Support CheckList Error if any.
+ * @type {string}
+ */
+LcevcDil.SupportObject.SupportError;