Merge pull request #5 from video-dev/master

Update to latest 22/1/18

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
 node_js: node
+# Work-around for https://github.com/travis-ci/travis-ci/issues/8836#issuecomment-356362524.
+# (Restore `sudo: false` once that is resolved.)
+sudo: required
 # don't connect to sauce labs unless running functional tests
 # before_install: if [ "${TRAVIS_MODE}" != "funcTests" ]; then unset SAUCE_USERNAME && unset SAUCE_ACCESS_KEY; fi
 script: ./scripts/travis.sh

doc/design.md

@@ -124,10 +124,10 @@ design idea is pretty simple :
     - subtitle track controller handles subtitle track loading and switching
   - [src/controller/timeline-controller.js][]
     - Manages pulling CEA-708 caption data from the fragments, running them through the cea-608-parser, and handing them off to a display class, which defaults to src/utils/cues.js
-  - [src/crypt/aes.js][]
+  - [src/crypt/aes-crypto.js][]
     - AES 128 software decryption routine, low level class handling decryption of 128 bit of data.
-  - [src/crypt/aes128-decrypter.js][]  
-    - AES 128-CBC software decryption routine, high-level class handling cipher-block chaining (CBC), and that should also handle padding (TODO).
+  - [src/crypt/aes-decrypter.js][]  
+    - AES 128-CBC software decryption routine, high-level class handling cipher-block chaining (CBC), handles PKCS7 padding when the option is enabled.
   - [src/crypt/decrypter.js][]
     - decrypter interface, use either WebCrypto API if available and enabled, or fallback on AES 128 software decryption routine.
   - [src/demux/aacdemuxer.js][]

package.json

@@ -54,10 +54,10 @@
     "chromedriver": "^2.28.0",
     "cross-env": "^5.0.2",
     "deep-strict-equal": "^0.2.0",
-    "http-server": "^0.10.0",
+    "http-server": "^0.11.0",
     "istanbul-instrumenter-loader": "^2.0.0",
     "jshint": "^2.9.4",
-    "karma": "^1.7.0",
+    "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-mocha": "^1.3.0",

src/controller/buffer-controller.js

@@ -222,7 +222,11 @@ class BufferController extends EventHandler {
     let pending = this.segments.reduce( (counter, segment) => (segment.parent === parent) ? counter + 1 : counter , 0);
 
     // this.sourceBuffer is better to use than media.buffered as it is closer to the PTS data from the fragments
-    const bufferedEntries = Object.entries(this.sourceBuffer).map(([k,v]) => [k, v.buffered]);
+    let bufferedEntries = [];
+    const sourceBuffer = this.sourceBuffer;
+    for (let streamType in sourceBuffer) {
+      bufferedEntries.push([streamType, sourceBuffer[streamType].buffered]);
+    }
     const timeRanges = new Map(bufferedEntries);
 
     this.hls.trigger(Event.BUFFER_APPENDED, { parent, pending, timeRanges });

src/crypt/aes-decryptor.js

@@ -182,7 +182,7 @@ class AESDecryptor {
     return (word << 24) | ((word & 0xff00) << 8) | ((word & 0xff0000) >> 8) | (word >>> 24);
   }
 
-  decrypt(inputArrayBuffer, offset, aesIV) {
+  decrypt(inputArrayBuffer, offset, aesIV, removePKCS7Padding) {
     let nRounds = this.keySize + 6;
     let invKeySchedule = this.invKeySchedule;
     let invSBOX = this.invSBox;
@@ -259,7 +259,7 @@ class AESDecryptor {
       offset = offset + 4;
     }
 
-    return removePadding(outputInt32.buffer);
+    return removePKCS7Padding ? removePadding(outputInt32.buffer) : outputInt32.buffer;
   }
 
   destroy() {

src/crypt/decrypter.js

@@ -8,14 +8,18 @@ import {logger} from '../utils/logger';
 /*globals self: false */
 
 class Decrypter {
-  constructor(observer,config) {
+  constructor(observer, config, { removePKCS7Padding = true } = {}) {
+    this.logEnabled = true;
     this.observer = observer;
     this.config = config;
-    this.logEnabled = true;
-    try {
-      const browserCrypto = crypto ? crypto : self.crypto;
-      this.subtle = browserCrypto.subtle || browserCrypto.webkitSubtle;
-    } catch (e) {}
+    this.removePKCS7Padding = removePKCS7Padding;
+    // built in decryptor expects PKCS7 padding
+    if (removePKCS7Padding) {
+      try {
+        const browserCrypto = crypto ? crypto : self.crypto;
+        this.subtle = browserCrypto.subtle || browserCrypto.webkitSubtle;
+      } catch (e) {}
+    }
     this.disableWebCrypto = !this.subtle;
   }
 
@@ -34,7 +38,7 @@ class Decrypter {
         this.decryptor = decryptor = new AESDecryptor();
       }
       decryptor.expandKey(key);
-      callback(decryptor.decrypt(data, 0, iv));
+      callback(decryptor.decrypt(data, 0, iv, this.removePKCS7Padding));
     }
     else {
       if (this.logEnabled) {

src/demux/demuxer-inline.js

@@ -60,9 +60,10 @@ class DemuxerInline {
   pushDecrypted(data, decryptdata, initSegment, audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS) {
     var demuxer = this.demuxer;
     if (!demuxer ||
-      // in case of continuity change, we might switch from content type (AAC container to TS container for example)
+      // in case of continuity change, or track switch
+      // we might switch from content type (AAC container to TS container, or TS to fmp4 for example)
       // so let's check that current demuxer is still valid
-      (discontinuity && !this.probe(data))) {
+      ((discontinuity || trackSwitch) && !this.probe(data))) {
       const observer = this.observer;
       const typeSupported = this.typeSupported;
       const config = this.config;

src/demux/sample-aes.js

@@ -9,7 +9,7 @@
   constructor(observer, config, decryptdata, discardEPB) {
     this.decryptdata = decryptdata;
     this.discardEPB = discardEPB;
-    this.decrypter = new Decrypter(observer, config);
+    this.decrypter = new Decrypter(observer, config, { removePKCS7Padding: false });
   }
 
   decryptBuffer(encryptedData, callback) {

src/helper/fragment-tracker.js

@@ -45,14 +45,17 @@ export class FragmentTracker extends EventHandler {
     // Check if any flagged fragments have been unloaded
     for (let fragmentEntity of this.fragments.values()) {
       if(fragmentEntity.buffered === true) {
-        fragmentTimes = fragmentEntity.range[elementaryStream].time;
-        for (let i = 0; i < fragmentTimes.length; i++) {
-          time = fragmentTimes[i];
-
-          if(this.isTimeBuffered(time.startPTS, time.endPTS, timeRange) === false) {
-            // Unregister partial fragment as it needs to load again to be reused
-            this.removeFragment(fragmentEntity.body);
-            break;
+        const esData = fragmentEntity.range[elementaryStream];
+        if (esData) {
+          fragmentTimes = esData.time;
+          for (let i = 0; i < fragmentTimes.length; i++) {
+            time = fragmentTimes[i];
+
+            if(this.isTimeBuffered(time.startPTS, time.endPTS, timeRange) === false) {
+              // Unregister partial fragment as it needs to load again to be reused
+              this.removeFragment(fragmentEntity.body);
+              break;
+            }
           }
         }
       }

src/remux/mp4-remuxer.js

@@ -77,13 +77,12 @@ class MP4Remuxer {
           this.remuxVideo(videoTrack,videoTimeOffset,contiguous,audioTrackLength, accurateTimeOffset);
         }
       } else {
-        let videoData;
         //logger.log('nb AVC samples:' + videoTrack.samples.length);
         if (nbVideoSamples) {
-          videoData = this.remuxVideo(videoTrack,videoTimeOffset,contiguous, accurateTimeOffset);
-        }
-        if (videoData && audioTrack.codec) {
-          this.remuxEmptyAudio(audioTrack, audioTimeOffset, contiguous, videoData);
+          let videoData = this.remuxVideo(videoTrack,videoTimeOffset,contiguous, 0, accurateTimeOffset);
+          if (videoData && audioTrack.codec) {
+            this.remuxEmptyAudio(audioTrack, audioTimeOffset, contiguous, videoData);
+          }
         }
       }
     }
@@ -206,6 +205,9 @@ class MP4Remuxer {
     let nextAvcDts = this.nextAvcDts;
 
     const isSafari = this.isSafari;
+
+	if(inputSamples.length == 0)
+		return null;
 
     // Safari does not like overlapping DTS on consecutive fragments. let's use nextAvcDts to overcome this if fragments are consecutive
     if (isSafari) {

tests/functional/streams.json

@@ -32,13 +32,6 @@
     "live": false,
     "abr": false
   },
-  "nasa": {
-    "url": "https://nasa-i.akamaihd.net/hls/live/253565/NASA-NTV1-Public/master.m3u8",
-    "description": "NASA live stream",
-    "live": true,
-    "abr": false,
-    "blacklist_ua": ["internet explorer", "safari"]
-  },
   "closedcaptions": {
     "url": "http://playertest.longtailvideo.com/adaptive/captions/playlist.m3u8",
     "description": "CNN special report, with CC",
@@ -87,9 +80,9 @@
     "blacklist_ua": ["safari", "internet explorer"]
   },
   "offset_pts": {
-    "url": "https://video-dev.github.io/streams/pts_shift/master.m3u8", 
-    "description": "DK Turntable, PTS shifted by 2.3s", 
-    "live": false, 
+    "url": "https://video-dev.github.io/streams/pts_shift/master.m3u8",
+    "description": "DK Turntable, PTS shifted by 2.3s",
+    "live": false,
     "abr": false
   }
 }