Merge branch 'development' into task/segement-template-util

Author: littlespex

.github/workflows/deploy.yml

@@ -50,7 +50,7 @@ jobs:
                     done
             -   name: Copy to deploy directory for deployment
                 run: |
-                    mkdir ${{inputs.envname}}
+                    mkdir -p ${{inputs.envname}}
                     cp -R contrib dist samples ${{inputs.envname}}
             -   name: Install SSH Key
                 uses: shimataro/ssh-key-action@v2
@@ -59,4 +59,5 @@ jobs:
                     known_hosts: unnecessary
             -   name: Deploy with scp
                 run: |
-                    scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}
+                    ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{ secrets.USER }}@${{ secrets.HOST }} "mkdir -p ${{ inputs.deploy_path }}/${{inputs.envname}}"
+                    scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}

.github/workflows/deploy_build.yml

@@ -0,0 +1,49 @@
+name: deploy_build
+
+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@v4
+            -   name: Use Node.js
+                uses: actions/setup-node@v4
+                with:
+                    node-version: "20.x"
+            -   name: Install dependencies
+                run: npm install
+            -   name: Build dist files
+                run: npm run build
+            -   name: Build JSDoc
+                run: npm run doc
+                continue-on-error: true
+            -   name: Copy to deploy directory for deployment
+                run: |
+                    mkdir -p ${{inputs.envname}}
+                    cp -R docs/jsdoc ${{inputs.envname}}/jsdoc && cp -R dist/modern/umd/* ${{inputs.envname}} && cp -R dist/* index.d.ts ${{inputs.envname}}
+            -   name: Install SSH Key
+                uses: shimataro/ssh-key-action@v2
+                with:
+                    key: ${{ secrets.private_key }}
+                    known_hosts: unnecessary
+            -   name: Deploy with scp
+                run: |
+                    ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{ secrets.USER }}@${{ secrets.HOST }} "mkdir -p ${{ inputs.deploy_path }}/${{inputs.envname}}"
+                    scp -r -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}

.github/workflows/deploy_build_latest.yml

@@ -0,0 +1,18 @@
+name: deploy_latest
+
+on:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    deploy_latest:
+        if: github.repository == 'Dash-Industry-Forum/dash.js'
+        uses: ./.github/workflows/deploy_build.yml
+        with:
+            envname: latest
+            deploy_path: '/377335'
+        secrets:
+            host: ${{secrets.HOST}}
+            user: ${{secrets.USER}}
+            private_key: ${{secrets.PRIVATE_KEY}}

.github/workflows/deploy_build_latest_as_version_folder.yml

@@ -0,0 +1,38 @@
+name: deploy_build_latest_as_version_folder
+
+on:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    get_version_number:
+        if: github.repository == 'Dash-Industry-Forum/dash.js'
+        runs-on: ubuntu-latest
+        outputs:
+            version: ${{ steps.set_version.outputs.version }}
+        steps:
+            -   name: Check out repository
+                uses: actions/checkout@v4
+
+            -   name: Read version from package.json
+                id: set_version
+                run: |
+                    echo "version=$(jq -r .version package.json)" >> $GITHUB_OUTPUT
+                shell: bash
+
+            -   name: Print version
+                run: |
+                    echo "Version: ${{ steps.set_version.outputs.version }}"
+
+    deploy:
+        if: github.repository == 'Dash-Industry-Forum/dash.js'
+        needs: get_version_number
+        uses: ./.github/workflows/deploy_build.yml
+        with:
+            envname: v${{ needs.get_version_number.outputs.version }}
+            deploy_path: '/377335'
+        secrets:
+            host: ${{ secrets.HOST }}
+            user: ${{ secrets.USER }}
+            private_key: ${{ secrets.PRIVATE_KEY }}

.github/workflows/deploy_latest.yml

@@ -6,7 +6,7 @@ on:
             - 'master'
 
 jobs:
-    deploy_staging:
+    deploy_latest:
         if: github.repository == 'Dash-Industry-Forum/dash.js'
         uses: ./.github/workflows/deploy.yml
         with:

.github/workflows/deploy_latest_as_version_folder.yml

@@ -0,0 +1,38 @@
+name: deploy_latest_as_version_folder
+
+on:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    get_version_number:
+        if: github.repository == 'Dash-Industry-Forum/dash.js'
+        runs-on: ubuntu-latest
+        outputs:
+            version: ${{ steps.set_version.outputs.version }}
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v4
+
+            - name: Read version from package.json
+              id: set_version
+              run: |
+                  echo "version=$(jq -r .version package.json)" >> $GITHUB_OUTPUT
+              shell: bash
+
+            - name: Print version
+              run: |
+                  echo "Version: ${{ steps.set_version.outputs.version }}"
+
+    deploy:
+        if: github.repository == 'Dash-Industry-Forum/dash.js'
+        needs: get_version_number
+        uses: ./.github/workflows/deploy.yml
+        with:
+            envname: v${{ needs.get_version_number.outputs.version }}
+            deploy_path: '/377335/dash.js'
+        secrets:
+            host: ${{ secrets.HOST }}
+            user: ${{ secrets.USER }}
+            private_key: ${{ secrets.PRIVATE_KEY }}

index.d.ts

@@ -1768,8 +1768,9 @@ declare namespace dashjs {
             trackSwitchMode?: {
                 video?: TrackSwitchMode;
                 audio?: TrackSwitchMode;
-            }
-            selectionModeForInitialTrack?: TrackSelectionMode
+            };
+            ignoreSelectionPriority?: boolean;
+            selectionModeForInitialTrack?: TrackSelectionMode;
             fragmentRequestTimeout?: number;
             fragmentRequestProgressTimeout?: number;
             manifestRequestTimeout?: number;
@@ -2845,7 +2846,6 @@ declare namespace dashjs {
         TRACK_SELECTION_MODE_HIGHEST_BITRATE: 'highestBitrate',
         TRACK_SELECTION_MODE_HIGHEST_EFFICIENCY: 'highestEfficiency',
         TRACK_SELECTION_MODE_WIDEST_RANGE: 'widestRange',
-        TRACK_SELECTION_MODE_HIGHEST_SELECTION_PRIORITY: 'highestSelectionPriority',
         CMCD_MODE_QUERY: 'query',
         CMCD_MODE_HEADER: 'header',
         CMCD_AVAILABLE_KEYS: ['br', 'd', 'ot', 'tb', 'bl', 'dl', 'mtp', 'nor', 'nrr', 'su', 'bs', 'rtp', 'cid', 'pr', 'sf', 'sid', 'st', 'v'],

src/core/Settings.js

@@ -188,7 +188,8 @@ import Events from './events/Events.js';
  *                audio: Constants.TRACK_SWITCH_MODE_ALWAYS_REPLACE,
  *                video: Constants.TRACK_SWITCH_MODE_NEVER_REPLACE
  *            },
- *            selectionModeForInitialTrack: Constants.TRACK_SELECTION_MODE_HIGHEST_SELECTION_PRIORITY,
+ *            ignoreSelectionPriority: false,
+ *            selectionModeForInitialTrack: Constants.TRACK_SELECTION_MODE_HIGHEST_EFFICIENCY,
  *            fragmentRequestTimeout: 20000,
  *            fragmentRequestProgressTimeout: -1,
  *            manifestRequestTimeout: 10000,
@@ -998,14 +999,14 @@ import Events from './events/Events.js';
  * - Constants.TRACK_SWITCH_MODE_NEVER_REPLACE
  * Do not replace existing segments in the buffer
  *
- * @property {string} [selectionModeForInitialTrack="highestSelectionPriority"]
+ * @property {} [ignoreSelectionPriority: false]
+ * provides the option to disregard any signalled selectionPriority attribute. If disabled and if no initial media settings are set, track selection is accomplished as defined by selectionModeForInitialTrack.
+ *
+ * @property {string} [selectionModeForInitialTrack="highestEfficiency"]
  * Sets the selection mode for the initial track. This mode defines how the initial track will be selected if no initial media settings are set. If initial media settings are set this parameter will be ignored. Available options are:
  *
  * Possible values
  *
- * - Constants.TRACK_SELECTION_MODE_HIGHEST_SELECTION_PRIORITY
- * This mode makes the player select the track with the highest selectionPriority as defined in the manifest. If not selectionPriority is given we fallback to TRACK_SELECTION_MODE_HIGHEST_BITRATE. This mode is a default mode.
- *
  * - Constants.TRACK_SELECTION_MODE_HIGHEST_BITRATE
  * This mode makes the player select the track with a highest bitrate.
  *
@@ -1230,7 +1231,8 @@ function Settings() {
                 audio: Constants.TRACK_SWITCH_MODE_ALWAYS_REPLACE,
                 video: Constants.TRACK_SWITCH_MODE_NEVER_REPLACE
             },
-            selectionModeForInitialTrack: Constants.TRACK_SELECTION_MODE_HIGHEST_SELECTION_PRIORITY,
+            ignoreSelectionPriority: false,
+            selectionModeForInitialTrack: Constants.TRACK_SELECTION_MODE_HIGHEST_EFFICIENCY,
             fragmentRequestTimeout: 20000,
             fragmentRequestProgressTimeout: -1,
             manifestRequestTimeout: 10000,

src/core/Utils.js

@@ -250,6 +250,11 @@ class Utils {
         return Utils.toDataView(bufferSource, Uint8Array)
     }
 
+    static uint8ArrayToString(uint8Array) {
+        const decoder = new TextDecoder('utf-8');
+        return decoder.decode(uint8Array);
+    }
+
     static bufferSourceToHex(data) {
         const arr = Utils.bufferSourceToInt8(data)
         let hex = '';

src/dash/controllers/ContentSteeringController.js

@@ -282,7 +282,6 @@ function ContentSteeringController() {
 
         const additionalQueryParameter = [];
 
-
         const serviceLocations = serviceLocationList.baseUrl.all.concat(serviceLocationList.location.all);
         if (serviceLocations.length > 0) {
 
@@ -295,26 +294,18 @@ function ContentSteeringController() {
                 }
             })
 
-            // Sort in descending order to put all elements without throughput (-1) in the end
-            data.sort((a, b) => {
-                return b.throughput - a.throughput
-            })
-
             let pathwayString = '';
             let throughputString = '';
 
             data.forEach((entry, index) => {
                 if (index !== 0) {
-                    pathwayString = `${pathwayString},`;
-                    if (entry.throughput > -1) {
-                        throughputString = `${throughputString},`;
-                    }
+                    pathwayString += ',';
+                    throughputString += ',';
                 }
-                pathwayString = `${pathwayString}${entry.serviceLocation}`;
-                if (entry.throughput > -1) {
-                    throughputString = `${throughputString}${entry.throughput}`;
-                }
-            })
+
+                pathwayString += entry.serviceLocation;
+                throughputString += entry.throughput > -1 ? entry.throughput : '';
+            });
 
             additionalQueryParameter.push({
                 key: QUERY_PARAMETER_KEYS.PATHWAY,