Merge remote-tracking branch 'origin/development'

Dash-Industry-Forum · Dec 8, 2023 · 8a1b7c0 · 8a1b7c0
2 parents b5a9ce1 + fcb89e1
commit 8a1b7c0
Show file tree

Hide file tree

Showing 42 changed files with 3,302 additions and 973 deletions.
diff --git a/README.md b/README.md
@@ -184,7 +184,7 @@ When it is all done, it should look similar to this:
     * ```npm run doc```
 
 ### Troubleshooting
-* In case the build process is failing make sure to use an up-to-date node.js version. The build process was successfully tested with node.js version 14.16.1.
+* In case the build process is failing make sure to use an up-to-date node.js version. The build process was successfully tested with node.js version 20.10.0.
 
 ### License
 dash.js is released under [BSD license](https://github.com/Dash-Industry-Forum/dash.js/blob/development/LICENSE.md)

diff --git a/build/jsdoc/jsdoc_conf.json b/build/jsdoc/jsdoc_conf.json
@@ -12,7 +12,8 @@
         "plugins/markdown"
     ],
     "markdown": {
-        "hardwrap": true
+        "hardwrap": true,
+        "idInHeadings": true
     },
     "templates": {
         "cleverLinks": true,
@@ -21,6 +22,7 @@
         "outputSourceFiles": true,
         "outputSourcePath": true,
         "systemName": "dash.js",
+        "systemSummary": "",
         "copyright": "<h3>DASH Industry Forum</h3>",
         "footer": "",
         "navType": "horizontal",
@@ -31,11 +33,20 @@
         "highlightTutorialCode": true
     },
     "opts": {
-        "template": "../../node_modules/ink-docstrap/template",
+        "template": "../../node_modules/clean-jsdoc-theme",
         "encoding": "utf8",
         "recurse": true,
         "query": "value",
         "private": false,
-        "lenient": true
+        "lenient": true,
+        "verbose": true,
+        "destination": "docs/",
+        "theme_opts": {
+            "default_theme": "light",
+            "include_css": ["./build/style_jsdoc/jsdoc-custom.css"],
+            "favicon": "https://dashif.org/img/favicon.ico",
+            "includeFilesListInHomepage": true,
+            "homepageTitle": "dash.js API Docs"
+        }
     }
 }
diff --git a/build/style_jsdoc/jsdoc-custom.css b/build/style_jsdoc/jsdoc-custom.css
@@ -0,0 +1,18 @@
+td, th {
+    padding: 10px 10px !important;
+    word-wrap: break-word;
+    max-width: 50px;
+    white-space: inherit;
+    text-overflow: ellipsis;
+  }
+
+  /* Optional: Style the first and last columns differently */
+  td:nth-child(5), th:nth-child(5) {
+    max-width: 150px !important;
+  } 
+  td:first-child, th:first-child {
+    max-width: 100px !important;
+  } 
+.main-wrapper {
+    padding: 0 !important;
+}
diff --git a/contrib/akamai/controlbar/ControlBar.js b/contrib/akamai/controlbar/ControlBar.js
@@ -372,7 +372,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
                 durationDisplay.onclick = seekLive;
                 durationDisplay.classList.add('live-icon');
             }
-        } else if (!isNaN(value)) {
+        } else if (!isNaN(value) && isFinite(value)) {
             durationDisplay.textContent = displayUTCTimeCodes ? self.player.formatUTC(value) : self.player.convertToTimeCode(value);
             durationDisplay.classList.remove('live-icon');
         }

diff --git a/index.d.ts b/index.d.ts
@@ -705,6 +705,8 @@ declare namespace dashjs {
 
         getNextSegmentRequest(mediaInfo: MediaInfo, representation: Representation): FragmentRequest | null;
 
+        repeatSegmentRequest(mediaInfo: MediaInfo, representation: Representation): FragmentRequest | null;
+
         getValidTimeCloseToTargetTime(time: number, mediaInfo: MediaInfo, representation: Representation, targetThreshold: number): number;
 
         getValidTimeAheadOfTargetTime(time: number, mediaInfo: MediaInfo, representation: Representation): number;
@@ -1090,6 +1092,13 @@ declare namespace dashjs {
                     droppedFramesRule?: boolean,
                     abandonRequestsRule?: boolean
                 },
+                abrRulesParameters?: {
+                    abandonRequestsRule: {
+                        graceTimeThreshold: number,
+                        abandonMultiplier: number,
+                        minLengthToAverage: number
+                    }
+                },
                 bandwidthSafetyFactor?: number;
                 useDefaultABRRules?: boolean;
                 useDeadTimeLatency?: boolean;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dashjs",
-    "version": "4.7.2",
+    "version": "4.7.3",
     "description": "A reference client implementation for the playback of MPEG DASH via Javascript and compliant browsers.",
     "author": "Dash Industry Forum",
     "license": "BSD-3-Clause",
@@ -62,11 +62,13 @@
     "dependencies": {
         "bcp-47-match": "^1.0.3",
         "bcp-47-normalize": "^1.1.1",
+        "clean-jsdoc-theme": "^4.2.10",
         "codem-isoboxer": "0.3.9",
         "es6-promise": "^4.2.8",
         "fast-deep-equal": "2.0.1",
+        "foodoc": "^0.0.9",
         "html-entities": "^1.2.1",
-        "imsc": "^1.1.3",
+        "imsc": "^1.1.4",
         "localforage": "^1.7.1",
         "path-browserify": "^1.0.1",
         "ua-parser-js": "^1.0.2"

diff --git a/samples/ad-insertion/js/scte.js b/samples/ad-insertion/js/scte.js
@@ -4,7 +4,7 @@
 (function() {
     var player = dashjs.MediaPlayer().create();
         playerAd = dashjs.MediaPlayer().create();
-        contentUrl = 'https://livesim.dashif.org/livesim/scte35_1/testpic_2s/Manifest.mpd ',
+        contentUrl = 'https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd',
         adUrl = 'https://dash.akamaized.net/fokus/adinsertion-samples/scte/dash.mpd',
         currentlyAd = false;
 

diff --git a/samples/advanced/listening-to-SCTE-EMSG-events.html b/samples/advanced/listening-to-SCTE-EMSG-events.html
@@ -25,8 +25,8 @@
 
     <script class="code">
         var player;
-        const mpd = "https://livesim.dashif.org/livesim/scte35_2/testpic_2s/Manifest.mpd";
-        const SCHEMEIDURI = "urn:scte:scte35:2013:xml";
+        const mpd = "https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd";
+        const SCHEMEIDURI = "urn:scte:scte35:2013:bin";
         const EVENT_MODE_ON_START = dashjs.MediaPlayer.events.EVENT_MODE_ON_START;
         const EVENT_MODE_ON_RECEIVE = dashjs.MediaPlayer.events.EVENT_MODE_ON_RECEIVE;
 

diff --git a/samples/advanced/load-with-starttime.html b/samples/advanced/load-with-starttime.html
@@ -21,7 +21,7 @@
         function init() {
             var video,
                 player,
-                url = "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd";
+                url = "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd";
 
             player = dashjs.MediaPlayer().create();
             video = document.querySelector("video");

diff --git a/samples/audio-only/index.html b/samples/audio-only/index.html
@@ -21,7 +21,7 @@
         function init() {
             var audio,
                 player,
-                url = "https://livesim.dashif.org/dash/vod/testpic_2s/audio.mpd";
+                url = "https://livesim2.dashif.org/vod/testpic_2s/audio.mpd";
 
             audio = document.querySelector("audio");
             player = dashjs.MediaPlayer().create();

diff --git a/samples/captioning/cea608.html b/samples/captioning/cea608.html
@@ -25,7 +25,7 @@
     </style>
 
     <script class="code">
-        var CAPTION_URL = "https://livesim.dashif.org/dash/vod/testpic_2s/cea608.mpd",
+        var CAPTION_URL = "https://livesim2.dashif.org/vod/testpic_2s/cea608.mpd",
             video,
             player;
 

diff --git a/samples/captioning/multi-track-captions.html b/samples/captioning/multi-track-captions.html
@@ -26,7 +26,7 @@
 
     <script class="code">
         var EXTERNAL_CAPTION_URL = "https://dash.akamaized.net/dash264/TestCases/4b/qualcomm/1/ED_OnDemand_5SecSeg_Subtitles.mpd", /* need to manually seek to get stream to start... issue with MPD but only sample with multi adaptations for external sidecar caption text xml */
-            FRAGMENTED_CAPTION_URL = "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
+            FRAGMENTED_CAPTION_URL = "https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd",
             videoElement,
             controlbar,
             player;
@@ -172,7 +172,7 @@ <h4>Settings</h4>
                                 <option value="">-- unset initial lang and role --</option>
                                 <option value="en-subtitle">eng - subtitles</option>
                                 <option value="en-caption">eng - captions</option>
-                                <option value="se">swe - subtitles</option>
+                                <option value="sv">swe - subtitles</option>
                                 <option value="qb">qbb - subtitles</option>
                                 <option value="no">nor - subtitles</option>
                             </select>

diff --git a/samples/captioning/ttml-ebutt-sample.html b/samples/captioning/ttml-ebutt-sample.html
@@ -25,11 +25,6 @@
     </style>
 
     <script class="code">
-        /* TEST CONTENT.
-         https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd
-         https://livesim.dashif.org/dash/vod/testpic_2s/xml_subs.mpd
-         https://livesim.dashif.org/livesim/testpic_2s/multi_subs.mpd
-        */
         var CAPTION_URL = "https://rdmedia.bbc.co.uk/elephants_dream/1/client_manifest-all.mpd",
             video,
             player;

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
@@ -1808,6 +1808,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                 case 'muted':
                     $scope.muted = this.parseBoolean(value);
                     $scope.toggleMuted();
+                    if ($scope.muted === true){
+                        document.getElementById('muteBtn')?.click();    
+                    } 
                     break;
                 case 'drmToday':
                     $scope.drmToday = this.parseBoolean(value);