fix: Fix handling of CC when switching between codecs (#5160)

shaka-project · Apr 26, 2023 · c5cbdf8 · c5cbdf8
1 parent 9200e43
commit c5cbdf8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/media/media_source_engine.js b/lib/media/media_source_engine.js
@@ -646,7 +646,8 @@ shaka.media.MediaSourceEngine = class {
       // For HLS CEA-608/708 CLOSED-CAPTIONS, text data is embedded in
       // the video stream, so textEngine may not have been initialized.
       if (!this.textEngine_) {
-        this.reinitText('text/vtt', this.sequenceMode_);
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
+            this.sequenceMode_);
       }
       // This doesn't work for native TS support (ex. Edge/Chromecast),
       // since no transmuxing is needed for native TS.
@@ -665,7 +666,8 @@ shaka.media.MediaSourceEngine = class {
       data = transmuxedData.data;
     } else if (hasClosedCaptions && contentType == ContentType.VIDEO) {
       if (!this.textEngine_) {
-        this.reinitText('text/vtt', this.sequenceMode_);
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
+            this.sequenceMode_);
       }
       if (!this.captionParser_) {
         this.captionParser_ = this.getCaptionParser(mimeType);

diff --git a/lib/text/text_engine.js b/lib/text/text_engine.js
@@ -139,6 +139,7 @@ shaka.text.TextEngine = class {
     // into TextEngine and TextDisplayer.
     if (mimeType == shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE ||
         mimeType == shaka.util.MimeUtils.CEA708_CLOSED_CAPTION_MIMETYPE) {
+      this.parser_ = null;
       return;
     }