Skip to content

SDK / exoplayer

Go to a project
Commit a8298b4c by olly Committed by Oliver Woodman
Options

Tentative fix for roll-up row count 

Issue: #3513

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177804505
parent 10b24be6
Inline Side-by-side
Showing with 29 additions and 13 deletions
RELEASENOTES.md
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
seek. seek.
* Use the same listener `MediaSourceEventListener` for all MediaSource * Use the same listener `MediaSourceEventListener` for all MediaSource
implementations. implementations.
* CEA-608: Fix handling of row count changes in roll-up mode
([#3513](https://github.com/google/ExoPlayer/issues/3513)).
### 2.6.0 ### ### 2.6.0 ###
......
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
...@@ -33,7 +33,6 @@ import com.google.android.exoplayer2.text.SubtitleInputBuffer; ...@@ -33,7 +33,6 @@ import com.google.android.exoplayer2.text.SubtitleInputBuffer;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
...@@ -185,7 +184,7 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -185,7 +184,7 @@ public final class Cea608Decoder extends CeaDecoder {
private final ParsableByteArray ccData; private final ParsableByteArray ccData;
private final int packetLength; private final int packetLength;
private final int selectedField; private final int selectedField;
private final LinkedList<CueBuilder> cueBuilders; private final ArrayList<CueBuilder> cueBuilders;
private CueBuilder currentCueBuilder; private CueBuilder currentCueBuilder;
private List<Cue> cues; private List<Cue> cues;
...@@ -200,7 +199,7 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -200,7 +199,7 @@ public final class Cea608Decoder extends CeaDecoder {
public Cea608Decoder(String mimeType, int accessibilityChannel) { public Cea608Decoder(String mimeType, int accessibilityChannel) {
ccData = new ParsableByteArray(); ccData = new ParsableByteArray();
cueBuilders = new LinkedList<>(); cueBuilders = new ArrayList<>();
currentCueBuilder = new CueBuilder(CC_MODE_UNKNOWN, DEFAULT_CAPTIONS_ROW_COUNT); currentCueBuilder = new CueBuilder(CC_MODE_UNKNOWN, DEFAULT_CAPTIONS_ROW_COUNT);
packetLength = MimeTypes.APPLICATION_MP4CEA608.equals(mimeType) ? 2 : 3; packetLength = MimeTypes.APPLICATION_MP4CEA608.equals(mimeType) ? 2 : 3;
switch (accessibilityChannel) { switch (accessibilityChannel) {
...@@ -230,8 +229,8 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -230,8 +229,8 @@ public final class Cea608Decoder extends CeaDecoder {
cues = null; cues = null;
lastCues = null; lastCues = null;
setCaptionMode(CC_MODE_UNKNOWN); setCaptionMode(CC_MODE_UNKNOWN);
setCaptionRowCount(DEFAULT_CAPTIONS_ROW_COUNT);
resetCueBuilders(); resetCueBuilders();
captionRowCount = DEFAULT_CAPTIONS_ROW_COUNT;
repeatableControlSet = false; repeatableControlSet = false;
repeatableControlCc1 = 0; repeatableControlCc1 = 0;
repeatableControlCc2 = 0; repeatableControlCc2 = 0;
...@@ -434,16 +433,16 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -434,16 +433,16 @@ public final class Cea608Decoder extends CeaDecoder {
private void handleMiscCode(byte cc2) { private void handleMiscCode(byte cc2) {
switch (cc2) { switch (cc2) {
case CTRL_ROLL_UP_CAPTIONS_2_ROWS: case CTRL_ROLL_UP_CAPTIONS_2_ROWS:
captionRowCount = 2;
setCaptionMode(CC_MODE_ROLL_UP); setCaptionMode(CC_MODE_ROLL_UP);
setCaptionRowCount(2);
return; return;
case CTRL_ROLL_UP_CAPTIONS_3_ROWS: case CTRL_ROLL_UP_CAPTIONS_3_ROWS:
captionRowCount = 3;
setCaptionMode(CC_MODE_ROLL_UP); setCaptionMode(CC_MODE_ROLL_UP);
setCaptionRowCount(3);
return; return;
case CTRL_ROLL_UP_CAPTIONS_4_ROWS: case CTRL_ROLL_UP_CAPTIONS_4_ROWS:
captionRowCount = 4;
setCaptionMode(CC_MODE_ROLL_UP); setCaptionMode(CC_MODE_ROLL_UP);
setCaptionRowCount(4);
return; return;
case CTRL_RESUME_CAPTION_LOADING: case CTRL_RESUME_CAPTION_LOADING:
setCaptionMode(CC_MODE_POP_ON); setCaptionMode(CC_MODE_POP_ON);
...@@ -451,6 +450,9 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -451,6 +450,9 @@ public final class Cea608Decoder extends CeaDecoder {
case CTRL_RESUME_DIRECT_CAPTIONING: case CTRL_RESUME_DIRECT_CAPTIONING:
setCaptionMode(CC_MODE_PAINT_ON); setCaptionMode(CC_MODE_PAINT_ON);
return; return;
default:
// Fall through.
break;
} }
if (captionMode == CC_MODE_UNKNOWN) { if (captionMode == CC_MODE_UNKNOWN) {
...@@ -484,6 +486,9 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -484,6 +486,9 @@ public final class Cea608Decoder extends CeaDecoder {
case CTRL_DELETE_TO_END_OF_ROW: case CTRL_DELETE_TO_END_OF_ROW:
// TODO: implement // TODO: implement
break; break;
default:
// Fall through.
break;
} }
} }
...@@ -515,8 +520,13 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -515,8 +520,13 @@ public final class Cea608Decoder extends CeaDecoder {
} }
} }
private void setCaptionRowCount(int captionRowCount) {
this.captionRowCount = captionRowCount;
currentCueBuilder.setCaptionRowCount(captionRowCount);
}
private void resetCueBuilders() { private void resetCueBuilders() {
currentCueBuilder.reset(captionMode, captionRowCount); currentCueBuilder.reset(captionMode);
cueBuilders.clear(); cueBuilders.clear();
cueBuilders.add(currentCueBuilder); cueBuilders.add(currentCueBuilder);
} }
...@@ -594,12 +604,14 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -594,12 +604,14 @@ public final class Cea608Decoder extends CeaDecoder {
public CueBuilder(int captionMode, int captionRowCount) { public CueBuilder(int captionMode, int captionRowCount) {
preambleStyles = new ArrayList<>(); preambleStyles = new ArrayList<>();
midrowStyles = new ArrayList<>(); midrowStyles = new ArrayList<>();
rolledUpCaptions = new LinkedList<>(); rolledUpCaptions = new ArrayList<>();
captionStringBuilder = new SpannableStringBuilder(); captionStringBuilder = new SpannableStringBuilder();
reset(captionMode, captionRowCount); reset(captionMode);
setCaptionRowCount(captionRowCount);
} }
public void reset(int captionMode, int captionRowCount) { public void reset(int captionMode) {
this.captionMode = captionMode;
preambleStyles.clear(); preambleStyles.clear();
midrowStyles.clear(); midrowStyles.clear();
rolledUpCaptions.clear(); rolledUpCaptions.clear();
...@@ -607,11 +619,13 @@ public final class Cea608Decoder extends CeaDecoder { ...@@ -607,11 +619,13 @@ public final class Cea608Decoder extends CeaDecoder {
row = BASE_ROW; row = BASE_ROW;
indent = 0; indent = 0;
tabOffset = 0; tabOffset = 0;
this.captionMode = captionMode;
this.captionRowCount = captionRowCount;
underlineStartPosition = POSITION_UNSET; underlineStartPosition = POSITION_UNSET;
} }
public void setCaptionRowCount(int captionRowCount) {
this.captionRowCount = captionRowCount;
}
public boolean isEmpty() { public boolean isEmpty() {
return preambleStyles.isEmpty() && midrowStyles.isEmpty() && rolledUpCaptions.isEmpty() return preambleStyles.isEmpty() && midrowStyles.isEmpty() && rolledUpCaptions.isEmpty()
&& captionStringBuilder.length() == 0; && captionStringBuilder.length() == 0;
......
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