Skip to content
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

Jump to bottom

CEA 708 Decoder Improvements to meet Spec compliance and Sarnoff test… #4595

Open
wants to merge 1 commit into
base: dev-v2
Choose a base branch
from
Open

CEA 708 Decoder Improvements to meet Spec compliance and Sarnoff test… #4595

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions 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 @@ -187,6 +187,7 @@ public final class Cea608Decoder extends CeaDecoder {
private CueBuilder currentCueBuilder;
private List<Cue> cues;
private List<Cue> lastCues;
private long inputTimestampUs;

private int captionMode;
private int captionRowCount;
Expand Down Expand Up @@ -252,6 +253,7 @@ protected Subtitle createSubtitle() {

@Override
protected void decode(SubtitleInputBuffer inputBuffer) {
inputTimestampUs = inputBuffer.timeUs;
ccData.reset(inputBuffer.data.array(), inputBuffer.data.limit());
boolean captionDataProcessed = false;
boolean isRepeatableControl = false;
Expand Down Expand Up @@ -329,6 +331,7 @@ protected void decode(SubtitleInputBuffer inputBuffer) {
}
if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
cues = getDisplayCues();
onNewSubtitleDataAvailable(inputTimestampUs); // update screen
}
}
}
Expand Down Expand Up @@ -454,12 +457,14 @@ private void handleMiscCode(byte cc2) {
if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
resetCueBuilders();
}
onNewSubtitleDataAvailable(inputTimestampUs); // update screen
break;
case CTRL_ERASE_NON_DISPLAYED_MEMORY:
resetCueBuilders();
break;
case CTRL_END_OF_CAPTION:
cues = getDisplayCues();
onNewSubtitleDataAvailable(inputTimestampUs); // update screen
resetCueBuilders();
break;
case CTRL_CARRIAGE_RETURN:
Expand Down Expand Up @@ -506,6 +511,7 @@ private void setCaptionMode(int captionMode) {
|| captionMode == CC_MODE_UNKNOWN) {
// When switching from paint-on or to roll-up or unknown, we also need to clear the caption.
cues = null;
onNewSubtitleDataAvailable(inputTimestampUs); // update screen
}
}

Expand Down
Loading