Merge branch 'master' of github.com:video-dev/hls.js into task-loop-e…

…nhancements
biggun1860 · Apr 18, 2018 · beef75f · beef75f
2 parents 9f71225 + c254aae
commit beef75f
Show file tree

Hide file tree

Showing 97 changed files with 83,466 additions and 79,248 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,64 +1,63 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true,
-    "es6": true,
+  'env': {
+    'browser': true,
+    'commonjs': true,
+    'es6': true
   },
-  "globals": {
+  'globals': {
     // Allowed globals
-    "console": true,
-    //"MediaSource": true,
-    "performance": true,
-    "crypto": true,
-    "fetch": true,
-    "Request": true,
-    "Headers": true,
-    "escape": true,
+    'console': true,
+    // "MediaSource": true,
+    'performance': true,
+    'crypto': true,
+    'fetch': true,
+    'Request': true,
+    'Headers': true,
+    'escape': true,
 
     // Compile-time defines
-    "__VERSION__": true,
-    "__USE_SUBTITLES__": true,
-    "__USE_ALT_AUDIO__": true,
-    "__USE_EME_DRM__": true
+    '__VERSION__': true,
+    '__USE_SUBTITLES__': true,
+    '__USE_ALT_AUDIO__': true,
+    '__USE_EME_DRM__': true
   },
   // see https://standardjs.com/
   // see https://github.com/standard/eslint-config-standard
-  "extends": [
-    "eslint:recommended",
-    "standard"
+  'extends': [
+    'eslint:recommended',
+    'standard'
   ],
-  "parserOptions": {
-    "sourceType": "module"
+  'parserOptions': {
+    'sourceType': 'module'
   },
-  "rules": {
+  'rules': {
     // our basic style rules
-    "semi": [
-      "error",
-      "always"
+    'semi': [
+      'error',
+      'always'
     ],
-    "indent": [
-      "error",
+    'indent': [
+      'error',
       2
     ],
-    "quotes": [
-      "error",
-      "single"
+    'quotes': [
+      'error',
+      'single'
     ],
-    "linebreak-style": [
-      "error",
-      "unix"
+    'linebreak-style': [
+      'error',
+      'unix'
     ],
     // spacing
-    "space-infix-ops": 2,
-    "space-unary-ops": [2, {"words": true, "nonwords": false}],
-    "space-in-parens": ["error", "never"],
-    "keyword-spacing": [2, {"before": true, "after": true}],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, { 'words': true, 'nonwords': false }],
+    'space-in-parens': ['error', 'never'],
+    'keyword-spacing': [2, { 'before': true, 'after': true }],
     // enforce litteral objects on multiple lines
-    "block-spacing": "error",
-    "curly": ["error", "multi-or-nest", "consistent"],
-    "object-curly-spacing": ["error", "always"],
-    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-
+    'block-spacing': 'error',
+    'curly': 2,
+    'object-curly-spacing': ['error', 'always'],
+    'brace-style': ['error', '1tbs', { 'allowSingleLine': false }],
 
     // limit code block and line length
     /*
@@ -75,23 +74,23 @@ module.exports = {
     // (warnings for now)
 
     // forbid "one var" style, enforce one declaration per variable
-    "one-var": [
+    'one-var': [
       1,
-      "never"
+      'never'
     ],
 
-    "standard/no-callback-literal": 1,
-    "import/first": 1,
-    "no-var": 1,
-    "no-empty": 1,
-    "no-mixed-operators": 1,
-    "no-unused-vars": 1,
-    "no-console": 1,
-    "no-fallthrough": 1,
-    "no-case-declarations": 1,
-    "no-irregular-whitespace": 1,
-    "no-self-assign": 1,
-    "new-cap": 1,
-    "no-undefined": 1
+    'standard/no-callback-literal': 1,
+    'import/first': 1,
+    'no-var': 1,
+    'no-empty': 1,
+    'no-mixed-operators': 1,
+    'no-unused-vars': 1,
+    'no-console': 1,
+    'no-fallthrough': 1,
+    'no-case-declarations': 1,
+    'no-irregular-whitespace': 1,
+    'no-self-assign': 1,
+    'new-cap': 1,
+    'no-undefined': 1
   }
 };
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,14 @@
-### Description of the Changes
+### This PR will...
 
+### Why is this Pull Request needed?
 
-### CheckLists
+### Are there any points in the code the reviewer needs to double check?
+
+### Resolves issues:
+
+### Checklist
 
 - [ ] changes have been done against master branch, and PR does not conflict
 - [ ] no commits have been done in dist folder (we will take care of updating it)
 - [ ] new unit / functional tests have been added (whenever applicable)
-- [ ] Travis tests are passing (or test results are not worse than on master branch :))
 - [ ] API or design changes are documented in API.md
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ HTMLVideoElement control and events could be used seamlessly.
 |[<img src="https://cloud.githubusercontent.com/assets/12702747/19316434/0a3601de-9067-11e6-85e2-936b1cb099a0.png" width="120">](https://www.snapstream.com/)|[<img src="https://www.streamamg.com/wp-content/themes/barebones/_assets/images/streamamg-logo.png" width="120">](https://www.streamamg.com/)|[<img src="https://streamsharkio.sa.metacdn.com/wp-content/uploads/2015/10/streamshark-dark.svg" width="120">](https://streamshark.io/)|[<img src="https://camo.githubusercontent.com/9580f10e9bfa8aa7fba52c5cb447bee0757e33da/68747470733a2f2f7777772e7461626c6f74762e636f6d2f7374617469632f696d616765732f7461626c6f5f6c6f676f2e706e67" width="120">](http://my.tablotv.com/)|
 |[<img src="https://user-images.githubusercontent.com/2803310/34083705-349c8fd0-e375-11e7-92a6-5c38509f4936.png" width="120">](https://www.streamroot.io/)|[<img src="http://vignette1.wikia.nocookie.net/tedtalks/images/c/c0/TED_logo.png/revision/20150915192527" width="120">](https://www.ted.com/)|[<img src="https://www.seeklogo.net/wp-content/uploads/2014/12/twitter-logo-vector-download.jpg" width="120">](https://twitter.com/)|[<img src="https://cloud.githubusercontent.com/assets/8201317/20566816/bc33f51c-b196-11e6-9bd3-afb71a06460b.png" width="120">](http://vwflow.com)|
 |[<img src="http://media.mtvnservices.com/edge/hosted/Viacom_logo.svg" width="120">](https://www.viacom.com/)|[<img src="https://user-images.githubusercontent.com/1181974/29248959-efabc440-802d-11e7-8050-7c1f4ca6c607.png" width="120">](https://vk.com/)|[<img src="https://s3.amazonaws.com/uploads.hipchat.com/87223/4876411/7Rybnl26ReFzlt3/jw-logo-red.png" width="120">](https://www.jwplayer.com)|[<img src="https://staticftv-a.akamaihd.net/arches/francetv/default/img/og-image.jpg?20161007" width="120">](https://www.france.tv)|
-|[<img src="http://showmax.akamaized.net/e/logo/showmax_black.png" width="120">](https://tech.showmax.com)| | | |
+|[<img src="http://showmax.akamaized.net/e/logo/showmax_black.png" width="120">](https://tech.showmax.com)|[<img src="https://static3.1tv.ru/assets/web/logo-8ff7c63246d8df0397233927db52edbb.svg" width="120" height="120">](https://www.1tv.ru/) | | |
 
 
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "Apache-2.0",
   "description": "Media Source Extension - HLS library, by/for Dailymotion",
   "homepage": "https://github.com/video-dev/hls.js",

diff --git a/demo/index.html b/demo/index.html
@@ -94,6 +94,11 @@ <h3>
           <input style="width: 8em" id="defaultAudioCodec"/>
         </label>
 
+        <label class="innerControls">
+          Metrics history (max limit, -1 is unlimited):
+          <input id="limitMetrics" style="width: 8em" type=number/>
+        </label>
+
         <label class="innerControls">
           Player size:
           <select id="videoSize" style="float:right;">