Commit ffbb0da8 by olly Committed by Oliver Woodman

Prevent Cea608Decoder from generating Subtitles with null Cues list.

PiperOrigin-RevId: 223580953
parent d98ab35a
......@@ -8,6 +8,7 @@
* Add options for controlling audio track selections to `DefaultTrackSelector`
([#3314](https://github.com/google/ExoPlayer/issues/3314)).
* Do not retry failed loads whose error is `FileNotFoundException`.
* Prevent Cea608Decoder from generating Subtitles with null Cues list
### 2.9.2 ###
......
......@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.text.SubtitleInputBuffer;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
......@@ -509,7 +510,7 @@ public final class Cea608Decoder extends CeaDecoder {
switch (cc2) {
case CTRL_ERASE_DISPLAYED_MEMORY:
cues = null;
cues = Collections.emptyList();
if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
resetCueBuilders();
}
......@@ -564,7 +565,7 @@ public final class Cea608Decoder extends CeaDecoder {
if (oldCaptionMode == CC_MODE_PAINT_ON || captionMode == CC_MODE_ROLL_UP
|| captionMode == CC_MODE_UNKNOWN) {
// When switching from paint-on or to roll-up or unknown, we also need to clear the caption.
cues = null;
cues = Collections.emptyList();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment