fix: Fix build failures

1. Added hdr as a property in stream when constructing. Fixes build failure from commit 7137286 . PR #3116 Issue #2813 2. Fixed the test error from commit d3640d1 . PR #3044 Issue #3029 3. Fixed the new line with no other arguments from commit 0845843 . PR #3060 Change-Id: I5833e49c1a95172742c4ec820960c9c5a7bf0cca
shaka-project · Feb 2, 2021 · 2371bd8 · 2371bd8
1 parent 2634bc9
commit 2371bd8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
@@ -1365,6 +1365,7 @@ shaka.hls.HlsParser = class {
       channelsCount,
       audioSamplingRate: null,
       closedCaptions,
+      hdr: undefined,
     };
 
     return {

diff --git a/test/test/util/manifest_generator.js b/test/test/util/manifest_generator.js
@@ -521,6 +521,8 @@ shaka.test.ManifestGenerator.Stream = class {
       this.audioSamplingRate = null;
       /** @type {Map.<string, string>} */
       this.closedCaptions = null;
+      /** @type {(string|undefined)} */
+      this.hdr = undefined;
     }
 
     /** @type {shaka.extern.Stream} */

diff --git a/test/text/ssa_text_parser_unit.js b/test/text/ssa_text_parser_unit.js
@@ -390,8 +390,7 @@ describe('SsaTextParser', () => {
     const expected = cues.map((cue) => {
       if (cue.nestedCues) {
         cue.nestedCues = cue.nestedCues.map(
-            (nestedCue) => jasmine.objectContaining(nestedCue)
-        );
+            (nestedCue) => jasmine.objectContaining(nestedCue));
       }
       return jasmine.objectContaining(cue);
     });

diff --git a/test/text/ttml_text_parser_unit.js b/test/text/ttml_text_parser_unit.js
@@ -653,7 +653,7 @@ describe('TtmlTextParser', () => {
         ],
         '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling" tts:extent="1920px 1080px">' +
         '<layout>' +
-        '<region xml:id="subtitleArea" tts:origin="108px 192px"/>' +
+        '<region xml:id="subtitleArea" tts:origin="192px 108px"/>' +
         '</layout>' +
         '<body region="subtitleArea"><div>' +
         '<p begin="01:02.05" end="01:02:03.200">Test</p>' +