Skip to content

CEA608: PAINT-ON Mode must keep the last shown captions on the screen #5147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ojw28 merged 1 commit into from
Dec 5, 2018
Merged

CEA608: PAINT-ON Mode must keep the last shown captions on the screen #5147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,19 @@ private void setCaptionMode(int captionMode) {
int oldCaptionMode = this.captionMode;
this.captionMode = captionMode;

// Clear the working memory.
// Clear the cues and cueBuilders except for Paint-on mode. Paint-on mode may modify characters
// already on the screen. This feature is not fully supported, but we need to keep the previous
// screen content shown
if (captionMode == CC_MODE_PAINT_ON) {
// update the Mode member of all existing cueBuilders even if we are mid-row
for (CueBuilder builder : cueBuilders) {
builder.setCaptionMode(captionMode);
}
return;
}

resetCueBuilders();

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.
Expand Down Expand Up @@ -653,6 +664,10 @@ public CueBuilder(int captionMode, int captionRowCount) {
setCaptionRowCount(captionRowCount);
}

public void setCaptionMode(int captionMode) {
this.captionMode = captionMode;
}

public void reset(int captionMode) {
this.captionMode = captionMode;
cueStyles.clear();
Expand Down