Merge branch 'development'

.github/workflows/deploy.yml

@@ -0,0 +1,53 @@
+name: deploy
+
+on:
+    workflow_call:
+        inputs:
+            envname:
+                required: true
+                type: string
+            deploy_path:
+                required: true
+                type: string
+        secrets:
+            host:
+                required: true
+            user:
+                required: true
+            private_key:
+                required: true
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   uses: actions/checkout@v2
+            -   name: Use Node.js
+                uses: actions/setup-node@v2
+                with:
+                    node-version: "14.x"
+            -   name: Install dependencies
+                run: npm install
+            -   name: Run build
+                run: npm run build
+            -   name: Find and Replace
+                uses: jacobtomlinson/gha-find-replace@v2
+                env:
+                    replacement_string: ${{ format('{0} - commit <a href="https://github.com/Dash-Industry-Forum/dash.js/commit/{1}">{2}</a>', github.ref_name, github.sha, github.sha)}}
+                with:
+                    find: "<!-- commit-info -->"
+                    replace: ${{env.replacement_string}}
+                    include: "samples/dash-if-reference-player/index.html"
+            -   name: Copy to deploy directory for deployment
+                run: |
+                    mkdir ${{inputs.envname}}
+                    cp -R contrib dist samples test/functional/config test/functional/tests ${{inputs.envname}} 
+            -   name: Install SSH Key
+                uses: shimataro/ssh-key-action@v2
+                with:
+                    key: ${{ secrets.private_key }}
+                    known_hosts: unnecessary
+
+            -   name: Deploy with rsync
+                run: rsync -av -c -e "ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss" ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}

.github/workflows/deploy_latest.yml

@@ -0,0 +1,17 @@
+name: deploy
+
+on:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    deploy_staging:
+        uses: ./.github/workflows/deploy.yml
+        with:
+            envname: latest
+            deploy_path: '/377335/dash.js'
+        secrets:
+            host: ${{secrets.HOST}}
+            user: ${{secrets.USER}}
+            private_key: ${{secrets.PRIVATE_KEY}}

.github/workflows/deploy_nightly.yml

@@ -0,0 +1,17 @@
+name: deploy
+
+on:
+    push:
+        branches:
+            - 'development'
+
+jobs:
+    deploy_staging:
+        uses: ./.github/workflows/deploy.yml
+        with:
+            envname: nightly
+            deploy_path: '/377335/dash.js'
+        secrets:
+            host: ${{secrets.HOST}}
+            user: ${{secrets.USER}}
+            private_key: ${{secrets.PRIVATE_KEY}}

contrib/akamai/controlbar/ControlBar.js

@@ -359,7 +359,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
     };
 
     var seekLive = function () {
-        self.player.seek(self.player.duration());
+        self.player.seekToOriginalLive();
     };
 
     //************************************************************************************

index.d.ts

@@ -45,6 +45,8 @@ declare namespace dashjs {
 
         clearMediaInfoArray(): void;
 
+        handleKeySystemFromManifest(): void;
+
         createKeySession(ksInfo: KeySystemInfo): void;
 
         loadKeySession(ksInfo: KeySystemInfo): void;
@@ -69,10 +71,6 @@ declare namespace dashjs {
 
         setKeySystems(keySystems: KeySystem[]): void;
 
-        setLicenseRequestFilters(filters: RequestFilter[]): void;
-
-        setLicenseResponseFilters(filters: ResponseFilter[]): void;
-
         stop(): void;
 
         reset(): void;
@@ -153,6 +151,8 @@ declare namespace dashjs {
             wallclockTimeUpdateInterval?: number,
             manifestUpdateRetryInterval?: number,
             applyServiceDescription?: boolean,
+            applyProducerReferenceTime?: boolean,
+            applyContentSteering?: boolean,
             cacheInitSegments?: boolean,
             eventControllerRefreshDelay?: number,
             enableManifestDurationMismatchFix?: boolean,
@@ -192,6 +192,7 @@ declare namespace dashjs {
                 stallThreshold?: number,
                 useAppendWindow?: boolean,
                 setStallState?: boolean
+                avoidCurrentTimeRangePruning?: boolean
             },
             gaps?: {
                 jumpGaps?: boolean,
@@ -228,7 +229,6 @@ declare namespace dashjs {
             liveCatchup?: {
                 maxDrift?: number;
                 playbackRate?: number;
-                latencyThreshold?: number,
                 playbackBufferMin?: number,
                 enabled?: boolean
                 mode?: string
@@ -467,6 +467,8 @@ declare namespace dashjs {
 
         seek(value: number): void;
 
+        seekToOriginalLive(): void;
+
         setPlaybackRate(value: number): void;
 
         getPlaybackRate(): number;
@@ -607,6 +609,10 @@ declare namespace dashjs {
 
         getOfflineController(): OfflineController;
 
+        triggerSteeringRequest(): Promise<any>;
+
+        getCurrentSteeringResponseData(): object;
+
         getSettings(): MediaPlayerSettingClass;
 
         updateSettings(settings: MediaPlayerSettingClass): void;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dashjs",
-    "version": "4.4.1",
+    "version": "4.5.0",
     "description": "A reference client implementation for the playback of MPEG DASH via Javascript and compliant browsers.",
     "author": "Dash Industry Forum",
     "license": "BSD-3-Clause",
@@ -57,12 +57,15 @@
         "yargs": "16.0.3"
     },
     "dependencies": {
+        "bcp-47-match": "^1.0.3",
+        "bcp-47-normalize": "^1.1.1",
         "codem-isoboxer": "0.3.6",
         "es6-promise": "^4.2.8",
         "fast-deep-equal": "2.0.1",
         "html-entities": "^1.2.1",
         "imsc": "^1.0.2",
-        "localforage": "^1.7.1"
+        "localforage": "^1.7.1",
+        "ua-parser-js": "^1.0.2"
     },
     "repository": {
         "type": "git",