Do not filter out TextTracks with kind of "captions" from API subtitl…

…eTrack selection (#5297)

Fixes #5292

Commit:
4029b6d [4029b6d]
Parents: d097760
Author: @dstreet26

src/controller/subtitle-track-controller.ts

@@ -420,7 +420,10 @@ function filterSubtitleTracks(textTrackList: TextTrackList): TextTrack[] {
   for (let i = 0; i < textTrackList.length; i++) {
     const track = textTrackList[i];
     // Edge adds a track without a label; we don't want to use it
-    if (track.kind === 'subtitles' && track.label) {
+    if (
+      (track.kind === 'subtitles' || track.kind === 'captions') &&
+      track.label
+    ) {
       tracks.push(textTrackList[i]);
     }
   }

tests/unit/controller/subtitle-track-controller.js

@@ -49,12 +49,20 @@ describe('SubtitleTrackController', function () {
 
     const textTrack1 = videoElement.addTextTrack('subtitles', 'English', 'en');
     const textTrack2 = videoElement.addTextTrack('subtitles', 'Swedish', 'se');
+    const textTrack3 = videoElement.addTextTrack(
+      'captions',
+      'Untitled CC',
+      'en'
+    );
+
     textTrack1.groupId = 'default-text-group';
     textTrack2.groupId = 'default-text-group';
+    textTrack3.groupId = 'default-text-group';
     subtitleTrackController.groupId = 'default-text-group';
 
     textTrack1.mode = 'disabled';
     textTrack2.mode = 'disabled';
+    textTrack3.mode = 'disabled';
     sandbox = sinon.createSandbox();
   });
 
@@ -89,6 +97,16 @@ describe('SubtitleTrackController', function () {
 
       expect(subtitleTrackController.subtitleTrack).to.equal(0);
     });
+
+    it('should set subtitleTrack id captions track is showing', function () {
+      expect(subtitleTrackController.subtitleTrack).to.equal(-1);
+
+      videoElement.textTracks[2].mode = 'showing';
+      subtitleTrackController.onTextTracksChanged();
+
+      expect(videoElement.textTracks[2].kind).to.equal('captions');
+      expect(subtitleTrackController.subtitleTrack).to.equal(2);
+    });
   });
 
   describe('set subtitleTrack', function () {