Dash-Industry-Forum · dsilhavy · Jun 4, 2021 · May 27, 2021 · May 28, 2021 · May 28, 2021
diff --git a/index.d.ts b/index.d.ts
@@ -142,7 +142,6 @@ declare namespace dashjs {
         };
         streaming?: {
             abandonLoadTimeout?: number,
-            calcSegmentAvailabilityRangeFromTimeline?: boolean,
             wallclockTimeUpdateInterval?: number,
             lowLatencyEnabled?: boolean,
             manifestUpdateRetryInterval?: number,
@@ -157,12 +156,16 @@ declare namespace dashjs {
                 fallbackToSegmentTimeline?: boolean
             },
             metrics?: {
-                metricsMaxListDepth?: number
+                maxListDepth?: number
             },
             delay?: {
                 liveDelayFragmentCount?: number,
                 liveDelay?: number,
-                useSuggestedPresentationDelay?: boolean
+                useSuggestedPresentationDelay?: boolean,
+                applyServiceDescription?: boolean
+            },
+            protection?: {
+                keepProtectionMediaKeys?: boolean,
             },
             buffer?: {
                 fastSwitchEnabled?: boolean,
@@ -179,9 +182,6 @@ declare namespace dashjs {
                 useAppendWindow?: boolean,
                 setStallState?:boolean
             },
-            protection?: {
-                keepProtectionMediaKeys?: boolean,
-            }
             gaps?: {
                 jumpGaps?: boolean,
                 jumpLargeGaps?: boolean,
@@ -262,6 +262,12 @@ declare namespace dashjs {
             abr?: {
                 movingAverageMethod?: 'slidingWindow' | 'ewma';
                 ABRStrategy?: 'abrDynamic' | 'abrBola' | 'abrL2A' | 'abrLoLP' | 'abrThroughput';
+                additionalAbrRules?: {
+                    insufficientBufferRule?: boolean,
+                    switchHistoryRule?: boolean,
+                    droppedFramesRule?: boolean,
+                    abandonRequestsRule?: boolean
+                },
                 bandwidthSafetyFactor?: number;
                 useDefaultABRRules?: boolean;
                 useDeadTimeLatency?: boolean;
@@ -483,14 +489,6 @@ declare namespace dashjs {
 
         setTextTrack(idx: number): void;
 
-        getTextDefaultLanguage(): string | undefined;
-
-        setTextDefaultLanguage(lang: string): void;
-
-        getTextDefaultEnabled(): boolean | undefined;
-
-        setTextDefaultEnabled(enable: boolean): void;
-
         provideThumbnail(time: number, callback: (thumbnail: Thumbnail | null) => void): void;
 
         getBitrateInfoListFor(type: MediaType): BitrateInfo[];
@@ -543,8 +541,6 @@ declare namespace dashjs {
 
         getOfflineController(): OfflineController;
 
-        enableManifestDateHeaderTimeSource(value: boolean): void;
-
         displayCaptionsOnTop(value: boolean): void;
 
         attachTTMLRenderingDiv(div: HTMLDivElement): void;

diff --git a/samples/advanced/abr/LowestBitrateRule.js → samples/abr/LowestBitrateRule.js b/samples/advanced/abr/LowestBitrateRule.js → samples/abr/LowestBitrateRule.js
diff --git a/samples/abr/abr.html b/samples/abr/abr.html
@@ -0,0 +1,89 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Configuration of ABR Rules</title>
+
+    <script src="../../dist/dash.all.debug.js"></script>
+
+    <!-- Bootstrap core CSS -->
+    <link href="../lib/bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../lib/main.css" rel="stylesheet">
+
+    <style>
+        video {
+            width: 640px;
+            height: 360px;
+        }
+    </style>
+
+    <script class="code">
+        function init() {
+            var video,
+                player,
+                url = "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd";
+
+            video = document.querySelector("video");
+            player = dashjs.MediaPlayer().create();
+
+            player.updateSettings({
+                streaming: {
+                    abr: {
+                        useDefaultABRRules: true,
+                        ABRStrategy: 'abrThroughput',
+                        additionalAbrRules: {
+                            insufficientBufferRule: true,
+                            switchHistoryRule: false,
+                            droppedFramesRule: false,
+                            abandonRequestsRule: false
+                        }
+
+                    }
+                }
+            });
+
+
+            player.initialize(video, url, true);
+        }
+    </script>
+</head>
+<body>
+
+<main>
+    <div class="container py-4">
+        <header class="pb-3 mb-4 border-bottom">
+            <img class=""
+                 src="../lib/img/dashjs-logo.png"
+                 width="200">
+        </header>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="h-100 p-5 bg-light border rounded-3">
+                    <h3>Configuration of ABR Rules</h3>
+                    <p>Example showing how to define the target ABR rules in dash.js. In this demo we enable the throughput based ABR decision logic. In addition, the InsufficientBufferRule is enabled.</p>
+                </div>
+            </div>
+            <div class="col-md-8">
+                <video controls="true"></video>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div id="code-output"></div>
+            </div>
+        </div>
+        <footer class="pt-3 mt-4 text-muted border-top">
+            &copy; DASH-IF
+        </footer>
+    </div>
+</main>
+
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        init();
+    });
+</script>
+<script src="../highlighter.js"></script>
+</body>
+</html>
diff --git a/samples/advanced/abr/index.html → samples/abr/custom-abr-rules.html b/samples/advanced/abr/index.html → samples/abr/custom-abr-rules.html
@@ -4,11 +4,11 @@
     <meta charset="utf-8">
     <title>Custom ABR Rules</title>
 
-    <script src="../../../dist/dash.all.debug.js"></script>
+    <script src="../../dist/dash.all.debug.js"></script>
 
     <!-- Bootstrap core CSS -->
-    <link href="../../lib/bootstrap/bootstrap.min.css" rel="stylesheet">
-    <link href="../../lib/main.css" rel="stylesheet">
+    <link href="../lib/bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../lib/main.css" rel="stylesheet">
 
     <style>
         video {
@@ -51,7 +51,7 @@
     <div class="container py-4">
         <header class="pb-3 mb-4 border-bottom">
             <img class=""
-                 src="../../lib/img/dashjs-logo.png"
+                 src="../lib/img/dashjs-logo.png"
                  width="200">
         </header>
         <div class="row">
@@ -82,6 +82,6 @@ <h3>Custom ABR Rules</h3>
         init();
     });
 </script>
-<script src="../../highlighter.js"></script>
+<script src="../highlighter.js"></script>
 </body>
 </html>
diff --git a/samples/abr/disable-abr.html b/samples/abr/disable-abr.html
@@ -0,0 +1,81 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Disable ABR</title>
+
+    <script src="../../dist/dash.all.debug.js"></script>
+
+    <!-- Bootstrap core CSS -->
+    <link href="../lib/bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../lib/main.css" rel="stylesheet">
+
+    <style>
+        video {
+            width: 640px;
+            height: 360px;
+        }
+    </style>
+
+    <script class="code">
+        function init() {
+            var video,
+                player,
+                url = "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd";
+
+            video = document.querySelector("video");
+            player = dashjs.MediaPlayer().create();
+
+            player.updateSettings({
+                streaming: {
+                    abr: {
+                        autoSwitchBitrate: { audio: true, video: false },
+                    }
+                }
+            });
+
+
+            player.initialize(video, url, true);
+        }
+    </script>
+</head>
+<body>
+
+<main>
+    <div class="container py-4">
+        <header class="pb-3 mb-4 border-bottom">
+            <img class=""
+                 src="../lib/img/dashjs-logo.png"
+                 width="200">
+        </header>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="h-100 p-5 bg-light border rounded-3">
+                    <h3>Disable ABR</h3>
+                    <p>Example showing how to disable the ABR switching in dash.js.</p>
+                </div>
+            </div>
+            <div class="col-md-8">
+                <video controls="true"></video>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div id="code-output"></div>
+            </div>
+        </div>
+        <footer class="pt-3 mt-4 text-muted border-top">
+            &copy; DASH-IF
+        </footer>
+    </div>
+</main>
+
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        init();
+    });
+</script>
+<script src="../highlighter.js"></script>
+</body>
+</html>
diff --git a/samples/abr/initial-bitrate.html b/samples/abr/initial-bitrate.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Initial bitrate</title>
+
+    <script src="../../dist/dash.all.debug.js"></script>
+
+    <!-- Bootstrap core CSS -->
+    <link href="../lib/bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../lib/main.css" rel="stylesheet">
+
+    <style>
+        video {
+            width: 640px;
+            height: 360px;
+        }
+    </style>
+
+    <script class="code">
+        function init() {
+            var video,
+                player,
+                url = "https://dash.akamaized.net/akamai/bbb_30fps/bbb_30fps.mpd";
+
+            video = document.querySelector("video");
+            player = dashjs.MediaPlayer().create();
+
+            player.updateSettings({
+                streaming: {
+                    abr: {
+                        initialBitrate: { audio: -1, video: 800 },
+                        autoSwitchBitrate: { audio: true, video: false }
+                    }
+                }
+            });
+
+
+            player.initialize(video, url, true);
+        }
+    </script>
+</head>
+<body>
+
+<main>
+    <div class="container py-4">
+        <header class="pb-3 mb-4 border-bottom">
+            <img class=""
+                 src="../lib/img/dashjs-logo.png"
+                 width="200">
+        </header>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="h-100 p-5 bg-light border rounded-3">
+                    <h3>Initial bitrate</h3>
+                    <p>Example showing how to set the initial bitrate in dash.js. For visibility reasons the ABR switching is disabled as well.</p>
+                </div>
+            </div>
+            <div class="col-md-8">
+                <video controls="true"></video>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div id="code-output"></div>
+            </div>
+        </div>
+        <footer class="pt-3 mt-4 text-muted border-top">
+            &copy; DASH-IF
+        </footer>
+    </div>
+</main>
+
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        init();
+    });
+</script>
+<script src="../highlighter.js"></script>
+</body>
+</html>