MPEG DASH support

DIYgod · Sep 25, 2017 · c0f515a · c0f515a
1 parent d8cfa12
commit c0f515a
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -55,6 +55,7 @@
         "require": false,
         "module": false,
         "Hls": false,
-        "flvjs": false
+        "flvjs": false,
+        "dashjs": false
     }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="demo.css">
     <script src="https://unpkg.com/flv.js/dist/flv.min.js"></script>
     <script src="https://unpkg.com/hls.js/dist/hls.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dashjs/dist/dash.all.min.js"></script>
     <script src="DPlayer.js"></script>
 </head>
 
@@ -215,6 +216,26 @@ <h2 id="flv-support">FLV support</h2>
             flvPlayer.load();
         </script>
     </div>
+    <h2 id="dash-support">MPEG DASH support</h2>
+    <div class="example">
+        <div id="dplayer10"></div>
+        <script>
+            var dp10 = new DPlayer({
+                container: document.getElementById('dplayer10'),
+                video: {
+                    url: 'http://devtest.qiniudn.com/若能绽放光芒.mpd',
+                    type: 'dash'
+                }
+            });
+        </script>
+        <div id="dplayer11"></div>
+        <script>
+            var dp11 = new DPlayer({
+                container: document.getElementById('dplayer11')
+            });
+            dashjs.MediaPlayer().create().initialize(dp11.video, "http://devtest.qiniudn.com/若能绽放光芒.mpd", false);
+        </script>
+    </div>
 
     <h2 id="bilibili-video-and-danmaku">Bilibili video and danmaku</h2>
     <div class="example">

diff --git a/dist/DPlayer.min.js b/dist/DPlayer.min.js
diff --git a/dist/DPlayer.min.js.map b/dist/DPlayer.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dplayer",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "Wow, such a lovely HTML5 danmaku video player",
   "main": "dist/DPlayer.min.js",
   "style": "dist/DPlayer.min.css",

diff --git a/src/DPlayer.js b/src/DPlayer.js
@@ -951,28 +951,36 @@ class DPlayer {
             else if (/.flv(#|\?|$)/i.exec(video.src)) {
                 this.type = 'flv';
             }
+            else if (/.mpd(#|\?|$)/i.exec(video.src)) {
+                this.type = 'dash';
+            }
             else {
                 this.type = 'normal';
             }
         }
 
-        // Support HTTP Live Streaming
-        if (this.type === 'hls' && Hls.isSupported()) {
+        // HTTP Live Streaming
+        if (this.type === 'hls' && Hls && Hls.isSupported()) {
             // this.container.getElementsByClassName('dplayer-time')[0].style.display = 'none';
             const hls = new Hls();
             hls.loadSource(video.src);
             hls.attachMedia(video);
         }
 
-        // Support FLV
-        if (this.type === 'flv' && flvjs.isSupported()) {
+        // FLV
+        if (this.type === 'flv' && flvjs && flvjs.isSupported()) {
             const flvPlayer = flvjs.createPlayer({
                 type: 'flv',
                 url: video.src
             });
             flvPlayer.attachMediaElement(video);
             flvPlayer.load();
         }
+
+        // MPEG DASH
+        if (this.type === 'dash' && dashjs) {
+            dashjs.MediaPlayer().create().initialize(video, video.src, false);
+        }
     }
 
     initVideo (video, type) {