Merge pull request #5147 from zsmatyas:dev-v2

PiperOrigin-RevId: 224114911
google · Dec 5, 2018 · 0d79208 · 0d79208
2 parents 22a8aa3 + d1e49f2
commit 0d79208
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -560,6 +560,14 @@ private void setCaptionMode(int captionMode) {
     int oldCaptionMode = this.captionMode;
     this.captionMode = captionMode;
 
+    if (captionMode == CC_MODE_PAINT_ON) {
+      // Switching to paint-on mode should have no effect except to select the mode.
+      for (int i = 0; i < cueBuilders.size(); i++) {
+        cueBuilders.get(i).setCaptionMode(captionMode);
+      }
+      return;
+    }
+
     // Clear the working memory.
     resetCueBuilders();
     if (oldCaptionMode == CC_MODE_PAINT_ON || captionMode == CC_MODE_ROLL_UP
@@ -664,6 +672,10 @@ public void reset(int captionMode) {
       tabOffset = 0;
     }
 
+    public void setCaptionMode(int captionMode) {
+      this.captionMode = captionMode;
+    }
+
     public void setCaptionRowCount(int captionRowCount) {
       this.captionRowCount = captionRowCount;
     }