shaka-player 4.1.1 → 4.2.0

package/test/media/media_source_engine_unit.js

@@ -346,7 +346,7 @@ describe('MediaSourceEngine', () => {
 
     it('appends the given data', async () => {
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
       audioSourceBuffer.updateend();
@@ -363,7 +363,7 @@ describe('MediaSourceEngine', () => {
           jasmine.objectContaining({message: 'fail!'})));
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null, null,
+              ContentType.AUDIO, buffer, null,
               /* hasClosedCaptions= */ false))
           .toBeRejectedWith(expected);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -382,7 +382,7 @@ describe('MediaSourceEngine', () => {
           ContentType.AUDIO));
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null, null,
+              ContentType.AUDIO, buffer, null,
               /* hasClosedCaptions= */ false))
           .toBeRejectedWith(expected);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -403,10 +403,10 @@ describe('MediaSourceEngine', () => {
           ContentType.AUDIO));
 
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       audioSourceBuffer.updateend();
       await expectAsync(p1).toBeResolved();
@@ -416,7 +416,7 @@ describe('MediaSourceEngine', () => {
     it('rejects the promise if this operation fails async', async () => {
       mockVideo.error = {code: 5};
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       audioSourceBuffer.error();
       audioSourceBuffer.updateend();
@@ -433,11 +433,11 @@ describe('MediaSourceEngine', () => {
     it('queues operations on a single SourceBuffer', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null, null,
+          ContentType.AUDIO, buffer2, null,
           /* hasClosedCaptions= */ false));
 
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -456,15 +456,15 @@ describe('MediaSourceEngine', () => {
     it('queues operations independently for different types', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null, null,
+          ContentType.AUDIO, buffer2, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer3, null, null,
+          ContentType.VIDEO, buffer3, null,
           /* hasClosedCaptions= */ false));
 
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -499,13 +499,13 @@ describe('MediaSourceEngine', () => {
       });
 
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null, null,
+          ContentType.AUDIO, buffer2, null,
           /* hasClosedCaptions= */ false);
       const p3 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer3, null, null,
+          ContentType.AUDIO, buffer3, null,
           /* hasClosedCaptions= */ false);
 
       await expectAsync(p1).toBeResolved();
@@ -519,8 +519,9 @@ describe('MediaSourceEngine', () => {
     it('forwards to TextEngine', async () => {
       const data = new ArrayBuffer(0);
       expect(mockTextEngine.appendBuffer).not.toHaveBeenCalled();
+      const reference = dummyReference(0, 10);
       await mediaSourceEngine.appendBuffer(
-          ContentType.TEXT, data, 0, 10, /* hasClosedCaptions= */ false);
+          ContentType.TEXT, data, reference, /* hasClosedCaptions= */ false);
       expect(mockTextEngine.appendBuffer).toHaveBeenCalledWith(
           data, 0, 10);
     });
@@ -538,7 +539,7 @@ describe('MediaSourceEngine', () => {
       const init = async () => {
         await mediaSourceEngine.init(initObject, false);
         await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, buffer, null, null,
+            ContentType.VIDEO, buffer, null,
             /* hasClosedCaptions= */ false);
         expect(mockTextEngine.storeAndAppendClosedCaptions).toHaveBeenCalled();
         expect(videoSourceBuffer.appendBuffer).toHaveBeenCalled();
@@ -568,7 +569,7 @@ describe('MediaSourceEngine', () => {
       const init = async () => {
         await mediaSourceEngine.init(initObject, false);
         await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, buffer, null, null,
+            ContentType.VIDEO, buffer, null,
             /* hasClosedCaptions= */ false);
         expect(mockTextEngine.storeAndAppendClosedCaptions)
             .not.toHaveBeenCalled();
@@ -599,7 +600,8 @@ describe('MediaSourceEngine', () => {
 
       // Initialize the closed caption parser.
       const appendInit = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null, null, true);
+          ContentType.VIDEO, buffer, null,
+          /* hasClosedCaptions= */ true);
       // In MediaSourceEngine, appendBuffer() is async and Promise-based, but
       // at the browser level, it's event-based.
       // MediaSourceEngine waits for the 'updateend' event from the
@@ -612,8 +614,9 @@ describe('MediaSourceEngine', () => {
       expect(mockTextEngine.storeAndAppendClosedCaptions).not
           .toHaveBeenCalled();
       // Parse and append the closed captions embedded in video stream.
+      const reference = dummyReference(0, 1000);
       const appendVideo = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, 0, Infinity, true);
+          ContentType.VIDEO, buffer, reference, true);
       videoSourceBuffer.updateend();
       await appendVideo;
 
@@ -837,11 +840,11 @@ describe('MediaSourceEngine', () => {
     it('waits for all previous operations to complete', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null, null,
+          ContentType.VIDEO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 = new shaka.test.StatusPromise(mediaSourceEngine.endOfStream());
@@ -864,11 +867,11 @@ describe('MediaSourceEngine', () => {
     it('makes subsequent operations wait', async () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.endOfStream();
-      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
-      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
           /* hasClosedCaptions= */ false);
-      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null,
           /* hasClosedCaptions= */ false);
 
       // endOfStream hasn't been called yet because blocking multiple queues
@@ -896,7 +899,7 @@ describe('MediaSourceEngine', () => {
       mockMediaSource.endOfStream.and.throwError(new Error());
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.endOfStream();
-      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
 
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalled();
@@ -928,11 +931,11 @@ describe('MediaSourceEngine', () => {
     it('waits for all previous operations to complete', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null, null,
+          ContentType.VIDEO, buffer, null,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 =
@@ -956,11 +959,11 @@ describe('MediaSourceEngine', () => {
     it('makes subsequent operations wait', async () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.setDuration(100);
-      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
-      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
           /* hasClosedCaptions= */ false);
-      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null,
           /* hasClosedCaptions= */ false);
 
       // The setter hasn't been called yet because blocking multiple queues
@@ -989,7 +992,7 @@ describe('MediaSourceEngine', () => {
       mockMediaSource.durationSetter.and.throwError(new Error());
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.setDuration(100);
-      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
 
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalled();
@@ -1013,9 +1016,9 @@ describe('MediaSourceEngine', () => {
     });
 
     it('waits for all operations to complete', async () => {
-      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
-      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null, null,
+      mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
           /* hasClosedCaptions= */ false);
 
       /** @type {!shaka.test.StatusPromise} */
@@ -1033,7 +1036,7 @@ describe('MediaSourceEngine', () => {
 
     it('resolves even when a pending operation fails', async () => {
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       const d = mediaSourceEngine.destroy();
 
@@ -1058,10 +1061,10 @@ describe('MediaSourceEngine', () => {
 
     it('cancels operations that have not yet started', async () => {
       mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       const rejected = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null, null,
+          ContentType.AUDIO, buffer2, null,
           /* hasClosedCaptions= */ false);
       // Create the expectation first so we don't get unhandled rejection errors
       const expected = expectAsync(rejected).toBeRejected();
@@ -1085,7 +1088,7 @@ describe('MediaSourceEngine', () => {
 
     it('cancels blocking operations that have not yet started', async () => {
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null, null,
+          ContentType.AUDIO, buffer, null,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.endOfStream();
       const d = mediaSourceEngine.destroy();
@@ -1100,7 +1103,7 @@ describe('MediaSourceEngine', () => {
       const d = mediaSourceEngine.destroy();
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null, null,
+              ContentType.AUDIO, buffer, null,
               /* hasClosedCaptions= */ false))
           .toBeRejected();
       await d;
@@ -1198,4 +1201,16 @@ describe('MediaSourceEngine', () => {
       }
     });
   }
+
+  function dummyReference(startTime, endTime) {
+    return new shaka.media.SegmentReference(
+        startTime, endTime,
+        /* uris= */ () => ['foo://bar'],
+        /* startByte= */ 0,
+        /* endByte= */ null,
+        /* initSegmentReference= */ null,
+        /* timestampOffset= */ 0,
+        /* appendWindowStart= */ 0,
+        /* appendWindowEnd= */ Infinity);
+  }
 });

package/test/media/streaming_engine_unit.js

@@ -100,10 +100,13 @@ describe('StreamingEngine', () => {
     jasmine.clock().mockDate();
   });
 
-  /** @param {boolean=} trickMode
+  /**
+   * @param {boolean=} trickMode
    * @param {number=} mediaOffset The offset from 0 for the segment start times
+   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key The AES-128 key to put in
+   *   the manifest, if one should exist
    */
-  function setupVod(trickMode, mediaOffset) {
+  function setupVod(trickMode, mediaOffset, hlsAes128Key) {
     // For VOD, we fake a presentation that has 2 Periods of equal duration
     // (20 seconds), where each Period has 1 Variant and 1 text stream.
     //
@@ -209,7 +212,8 @@ describe('StreamingEngine', () => {
     setupManifest(
         /* firstPeriodStartTime= */ 0,
         /* secondPeriodStartTime= */ 20,
-        /* presentationDuration= */ 40);
+        /* presentationDuration= */ 40,
+        hlsAes128Key);
   }
 
   function setupLive() {
@@ -356,8 +360,15 @@ describe('StreamingEngine', () => {
         /* delays= */ netEngineDelays);
   }
 
+  /**
+   * @param {number} firstPeriodStartTime
+   * @param {number} secondPeriodStartTime
+   * @param {number} presentationDuration
+   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
+   */
   function setupManifest(
-      firstPeriodStartTime, secondPeriodStartTime, presentationDuration) {
+      firstPeriodStartTime, secondPeriodStartTime, presentationDuration,
+      hlsAes128Key) {
     const segmentDurations = {
       audio: segmentData[ContentType.AUDIO].segmentDuration,
       video: segmentData[ContentType.VIDEO].segmentDuration,
@@ -380,7 +391,7 @@ describe('StreamingEngine', () => {
         /** @type {!shaka.media.PresentationTimeline} */(timeline),
         [firstPeriodStartTime, secondPeriodStartTime],
         presentationDuration, segmentDurations, initSegmentRanges,
-        timestampOffsets);
+        timestampOffsets, hlsAes128Key);
 
     audioStream = manifest.variants[0].audio;
     videoStream = manifest.variants[0].video;
@@ -868,9 +879,9 @@ describe('StreamingEngine', () => {
     netEngineDelays.audio = 1.0;
     netEngineDelays.video = 5.0; // Need init segment and media segment
 
-    mediaSourceEngine.appendBuffer.and.callFake((type, data, start, end) => {
+    mediaSourceEngine.appendBuffer.and.callFake((type, data, reference) => {
       // Call to the underlying implementation.
-      const p = mediaSourceEngine.appendBufferImpl(type, data, start, end);
+      const p = mediaSourceEngine.appendBufferImpl(type, data, reference);
 
       // Validate that no one media type got ahead of any other.
       let minBuffered = Infinity;
@@ -1012,8 +1023,8 @@ describe('StreamingEngine', () => {
 
       const bufferEnd = {audio: 0, video: 0, text: 0};
       mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, start, end) => {
-            bufferEnd[type] = end;
+          (type, data, reference) => {
+            bufferEnd[type] = reference && reference.endTime;
             return Promise.resolve();
           });
       mediaSourceEngine.bufferEnd.and.callFake((type) => {
@@ -1080,9 +1091,9 @@ describe('StreamingEngine', () => {
       // Replace the whole spy since we want to call the original.
       mediaSourceEngine.appendBuffer =
           jasmine.createSpy('appendBuffer')
-              .and.callFake(async (type, data, start, end) => {
+              .and.callFake(async (type, data, reference) => {
                 await p;
-                return Util.invokeSpy(old, type, data, start, end);
+                return Util.invokeSpy(old, type, data, reference);
               });
 
       await streamingEngine.start();
@@ -1107,9 +1118,9 @@ describe('StreamingEngine', () => {
       // Replace the whole spy since we want to call the original.
       mediaSourceEngine.appendBuffer =
           jasmine.createSpy('appendBuffer')
-              .and.callFake(async (type, data, start, end) => {
+              .and.callFake(async (type, data, reference) => {
                 await p;
-                return Util.invokeSpy(old, type, data, start, end);
+                return Util.invokeSpy(old, type, data, reference);
               });
 
       await streamingEngine.start();
@@ -1750,9 +1761,9 @@ describe('StreamingEngine', () => {
           // eslint-disable-next-line no-restricted-syntax
           shaka.test.FakeMediaSourceEngine.prototype.appendBufferImpl;
       mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, startTime, endTime) => {
+          (type, data, reference) => {
             expect(presentationTimeInSeconds).toBe(125);
-            if (startTime >= 100) {
+            if (reference && reference.startTime >= 100) {
               // Ignore a possible call for the first Period.
               expect(Util.invokeSpy(timeline.getSegmentAvailabilityStart))
                   .toBe(100);
@@ -1765,7 +1776,7 @@ describe('StreamingEngine', () => {
 
             // eslint-disable-next-line no-restricted-syntax
             return originalAppendBuffer.call(
-                mediaSourceEngine, type, data, startTime, endTime);
+                mediaSourceEngine, type, data, reference);
           });
 
       await runTest(slideSegmentAvailabilityWindow);
@@ -1862,14 +1873,14 @@ describe('StreamingEngine', () => {
           // eslint-disable-next-line no-restricted-syntax
           shaka.test.FakeMediaSourceEngine.prototype.appendBufferImpl;
       mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, startTime, endTime) => {
+          (type, data, reference) => {
             // Reject the first video init segment.
             if (data == segmentData[ContentType.VIDEO].initSegments[0]) {
               return Promise.reject(expectedError);
             } else {
               // eslint-disable-next-line no-restricted-syntax
               return originalAppendBuffer.call(
-                  mediaSourceEngine, type, data, startTime, endTime);
+                  mediaSourceEngine, type, data, reference);
             }
           });
 
@@ -1896,14 +1907,14 @@ describe('StreamingEngine', () => {
           // eslint-disable-next-line no-restricted-syntax
           shaka.test.FakeMediaSourceEngine.prototype.appendBufferImpl;
       mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, startTime, endTime) => {
+          (type, data, reference) => {
             // Reject the first audio segment.
             if (data == segmentData[ContentType.AUDIO].segments[0]) {
               return Promise.reject(expectedError);
             } else {
               // eslint-disable-next-line no-restricted-syntax
               return originalAppendBuffer.call(
-                  mediaSourceEngine, type, data, startTime, endTime);
+                  mediaSourceEngine, type, data, reference);
             }
           });
 
@@ -2187,7 +2198,7 @@ describe('StreamingEngine', () => {
           // Now that we're streaming, throw QuotaExceededError on every segment
           // to quickly trigger the quota error.
           const appendBufferSpy = jasmine.createSpy('appendBuffer');
-          appendBufferSpy.and.callFake((type, data, startTime, endTime) => {
+          appendBufferSpy.and.callFake((type, data, reference) => {
             throw new shaka.util.Error(
                 shaka.util.Error.Severity.CRITICAL,
                 shaka.util.Error.Category.MEDIA,
@@ -2373,9 +2384,10 @@ describe('StreamingEngine', () => {
       // Throw two QuotaExceededErrors at different times.
       let numErrorsThrown = 0;
       appendBufferSpy.and.callFake(
-          (type, data, startTime, endTime) => {
-            const throwError = (numErrorsThrown == 0 && startTime == 10) ||
-                             (numErrorsThrown == 1 && startTime == 20);
+          (type, data, reference) => {
+            const throwError = reference &&
+                ((numErrorsThrown == 0 && reference.startTime == 10) ||
+                 (numErrorsThrown == 1 && reference.startTime == 20));
             if (throwError) {
               numErrorsThrown++;
               throw new shaka.util.Error(
@@ -2386,7 +2398,7 @@ describe('StreamingEngine', () => {
             } else {
               // eslint-disable-next-line no-restricted-syntax
               const p = originalAppendBuffer.call(
-                  mediaSourceEngine, type, data, startTime, endTime);
+                  mediaSourceEngine, type, data, reference);
               return p;
             }
           });
@@ -2435,8 +2447,8 @@ describe('StreamingEngine', () => {
       // Throw QuotaExceededError multiple times after at least one segment of
       // each type has been appended.
       appendBufferSpy.and.callFake(
-          (type, data, startTime, endTime) => {
-            if (startTime >= 10) {
+          (type, data, reference) => {
+            if (reference && reference.startTime >= 10) {
               throw new shaka.util.Error(
                   shaka.util.Error.Severity.CRITICAL,
                   shaka.util.Error.Category.MEDIA,
@@ -2445,7 +2457,7 @@ describe('StreamingEngine', () => {
             } else {
               // eslint-disable-next-line no-restricted-syntax
               const p = originalAppendBuffer.call(
-                  mediaSourceEngine, type, data, startTime, endTime);
+                  mediaSourceEngine, type, data, reference);
               return p;
             }
           });
@@ -2986,8 +2998,8 @@ describe('StreamingEngine', () => {
 
       // Naive buffered range tracking that only tracks the buffer end.
       const bufferEnd = {audio: 0, video: 0, text: 0};
-      mediaSourceEngine.appendBuffer.and.callFake((type, data, start, end) => {
-        bufferEnd[type] = end;
+      mediaSourceEngine.appendBuffer.and.callFake((type, data, reference) => {
+        bufferEnd[type] = reference && reference.endTime;
         return Promise.resolve();
       });
       mediaSourceEngine.bufferEnd.and.callFake((type) => bufferEnd[type]);
@@ -3281,8 +3293,8 @@ describe('StreamingEngine', () => {
 
       const bufferEnd = {audio: 0, video: 0, text: 0};
       mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, start, end) => {
-            bufferEnd[type] = end;
+          (type, data, reference) => {
+            bufferEnd[type] = reference && reference.endTime;
             return Promise.resolve();
           });
       mediaSourceEngine.bufferEnd.and.callFake((type) => {
@@ -3429,6 +3441,69 @@ describe('StreamingEngine', () => {
     expect(alternateVideoStream.createSegmentIndex).not.toHaveBeenCalled();
   });
 
+  describe('AES-128', () => {
+    let key;
+    /** @type {!shaka.extern.HlsAes128Key} */
+    let hlsAes128Key;
+
+    beforeEach(async () => {
+      // Get a key.
+      const keyData = new ArrayBuffer(16);
+      const keyDataView = new DataView(keyData);
+      keyDataView.setInt16(0, 31710); // 0111 1011 1101 1110
+      key = await window.crypto.subtle.importKey(
+          'raw', keyData, 'AES-CBC', true, ['decrypt']);
+
+      // Set up a manifest with AES-128 key info.
+      // We don't actually provide the imported key OR the key fetching function
+      // here, though, so that the individual tests can choose what the starting
+      // state of the hlsAes128Key object is.
+      hlsAes128Key = {method: 'AES-128', firstMediaSequenceNumber: 0};
+
+      setupVod(false, 0, hlsAes128Key);
+      mediaSourceEngine = new shaka.test.FakeMediaSourceEngine(segmentData);
+      presentationTimeInSeconds = 0;
+      createStreamingEngine();
+      streamingEngine.switchVariant(variant);
+    });
+
+    afterEach(async () => {
+      await streamingEngine.destroy();
+    });
+
+    async function runTest() {
+      spyOn(window.crypto.subtle, 'decrypt').and.callThrough();
+
+      await streamingEngine.start();
+      playing = true;
+      await Util.fakeEventLoop(10);
+
+      expect(mediaSourceEngine.appendBuffer).toHaveBeenCalledTimes(2);
+      expect(window.crypto.subtle.decrypt).toHaveBeenCalledTimes(2);
+      expect(window.crypto.subtle.decrypt).toHaveBeenCalledWith(
+          {name: 'AES-CBC', iv: jasmine.any(Object)}, key, jasmine.any(Object));
+    }
+
+    it('decrypts segments', async () => {
+      hlsAes128Key.cryptoKey = key;
+      await runTest();
+    });
+
+    it('downloads key if not pre-filled', async () => {
+      hlsAes128Key.fetchKey = () => {
+        hlsAes128Key.cryptoKey = key;
+        hlsAes128Key.fetchKey = undefined;
+        return Promise.resolve();
+      };
+
+      await runTest();
+
+      // The key should have been fetched.
+      expect(hlsAes128Key.cryptoKey).not.toBeUndefined();
+      expect(hlsAes128Key.fetchKey).toBeUndefined();
+    });
+  });
+
   describe('destroy', () => {
     it('aborts pending network operations', async () => {
       setupVod();

package/test/test/util/fake_media_source_engine.js

@@ -78,8 +78,8 @@ shaka.test.FakeMediaSourceEngine = class {
 
     /** @type {!jasmine.Spy} */
     this.appendBuffer = jasmine.createSpy('appendBuffer')
-        .and.callFake((type, data, start, end) =>
-          this.appendBufferImpl(type, data, start, end));
+        .and.callFake((type, data, reference) =>
+          this.appendBufferImpl(type, data, reference));
 
     /** @type {!jasmine.Spy} */
     this.clear = jasmine.createSpy('clear')
@@ -229,11 +229,10 @@ shaka.test.FakeMediaSourceEngine = class {
   /**
    * @param {string} type
    * @param {!ArrayBuffer} data
-   * @param {?number} startTime
-   * @param {?number} endTime
+   * @param {?shaka.media.SegmentReference} reference
    * @return {!Promise}
    */
-  appendBufferImpl(type, data, startTime, endTime) {
+  appendBufferImpl(type, data, reference) {
     if (!this.segments[type]) {
       throw new Error('unexpected type');
     }
@@ -257,8 +256,7 @@ shaka.test.FakeMediaSourceEngine = class {
     }
     if (i >= 0) {
       // Update the list of which init segment was appended last.
-      expect(startTime).toBe(null);
-      expect(endTime).toBe(null);
+      expect(reference).toBe(null);
       this.initSegments[type] =
           this.segmentData[type].initSegments.map((c) => false);
       this.initSegments[type][i] = true;
@@ -289,8 +287,11 @@ shaka.test.FakeMediaSourceEngine = class {
     const expectedStartTime = i * segmentData.segmentDuration;
     const expectedEndTime = expectedStartTime + segmentData.segmentDuration;
     expect(appendedTime).toBe(expectedStartTime);
-    expect(startTime).toBe(expectedStartTime);
-    expect(endTime).toBe(expectedEndTime);
+    expect(reference).not.toBe(null);
+    if (reference) {
+      expect(reference.startTime).toBe(expectedStartTime);
+      expect(reference.endTime).toBe(expectedEndTime);
+    }
 
     this.segments[type][i] = true;
     return Promise.resolve();

package/test/test/util/simple_fakes.js

@@ -481,6 +481,10 @@ shaka.test.FakeSegmentIndex = class {
               return this.get(nextPosition - 1);
             },
 
+            currentPosition: () => {
+              return nextPosition;
+            },
+
             seek: (time) => {
               nextPosition = this.find(time);
               return this.get(nextPosition++);