fix(hls): Support multiple CHARACTERISTICS values in HLS (shaka-proje…

…ct#2905) Resolves shaka-project#2903
laurilopes · Oct 13, 2020 · f7626ff · f7626ff
1 parent 648e12e
commit f7626ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
@@ -1322,7 +1322,9 @@ shaka.hls.HlsParser = class {
 
     const roles = [];
     if (characteristics) {
-      roles.push(characteristics);
+      for (const characteristic of characteristics.split(',')) {
+        roles.push(characteristic);
+      }
     }
 
     /** @type {shaka.extern.Stream} */

diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
@@ -799,7 +799,8 @@ describe('HlsParser', () => {
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
       'URI="audio"\n',
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
-      'CHARACTERISTICS="public.accessibility.describes-video",URI="audio2"\n',
+      'CHARACTERISTICS="public.accessibility.describes-video,',
+      'public.accessibility.describes-music-and-sound",URI="audio2"\n',
     ].join('');
 
     const media = [
@@ -825,7 +826,10 @@ describe('HlsParser', () => {
         variant.addPartialStream(ContentType.VIDEO);
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
-          stream.roles = ['public.accessibility.describes-video'];
+          stream.roles = [
+            'public.accessibility.describes-video',
+            'public.accessibility.describes-music-and-sound',
+          ];
         });
       });
     });