fix: Missing AES-128 key of last HLS segment

Closes shaka-project#4517
devsunb · Sep 27, 2022 · 79c535a · 79c535a
1 parent b3621c2
commit 79c535a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -37,6 +37,7 @@ Giorgio Gamberoni <[email protected]>
 Giuseppe Samela <[email protected]>
 Google Inc. <*@google.com>
 Itay Kinnrot <[email protected]>
+Jaeseok Lee <[email protected]>
 Jason Palmer <[email protected]>
 Jesper Haug Karsrud <[email protected]>
 Johan Sundström <[email protected]>

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -57,6 +57,7 @@ Hichem Taoufik <[email protected]>
 Itay Kinnrot <[email protected]>
 Isaac Ramirez <[email protected]>
 Jacob Trimble <[email protected]>
+Jaeseok Lee <[email protected]>
 Jason Palmer <[email protected]>
 Jeffrey Swan <[email protected]>
 Jesper Haug Karsrud <[email protected]>

diff --git a/lib/media/segment_index.js b/lib/media/segment_index.js
@@ -364,7 +364,10 @@ shaka.media.SegmentIndex = class {
             lastReference.partialReferences,
             lastReference.tilesLayout,
             lastReference.tileDuration,
-            lastReference.syncTime);
+            lastReference.syncTime,
+            undefined,
+            lastReference.hlsAes128Key,
+        );
   }
 
 

diff --git a/test/media/segment_index_unit.js b/test/media/segment_index_unit.js
@@ -955,9 +955,11 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
    * @param {number} startTime
    * @param {number} endTime
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
+   * @param {!shaka.extern.HlsAes128Key} hlsAes128Key
    * @return {shaka.media.SegmentReference}
    */
-  function makeReference(uri, startTime, endTime, partialReferences = []) {
+  function makeReference(uri, startTime, endTime, partialReferences = [],
+      hlsAes128Key = {method: 'AES-128', firstMediaSequenceNumber: 0}) {
     return new shaka.media.SegmentReference(
         startTime,
         endTime,
@@ -968,6 +970,11 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
-        /* partialReferences= */ partialReferences);
+        /* partialReferences= */ partialReferences,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        hlsAes128Key);
   }
 });