sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Cea608 caption valid

Browse source 
PiperOrigin-RevId: 222797622
This commit is contained in:
olly 2018-11-26 10:58:41 +00:00 committed by Oliver Woodman
parent 03101444af
commit 17eadcc433
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
View file

@ -298,7 +298,6 @@ public final class Cea608Decoder extends CeaDecoder {
int ccByte1 = ccData.readUnsignedByte(); int ccByte1 = ccData.readUnsignedByte();
int ccByte2 = ccData.readUnsignedByte(); int ccByte2 = ccData.readUnsignedByte();
// Only examine valid CEA-608 packets
// TODO: We're currently ignoring the top 5 marker bits, which should all be 1s according // TODO: We're currently ignoring the top 5 marker bits, which should all be 1s according
// to the CEA-608 specification. We need to determine if the data should be handled // to the CEA-608 specification. We need to determine if the data should be handled
// differently when that is not the case. // differently when that is not the case.
@ -323,11 +322,12 @@ public final class Cea608Decoder extends CeaDecoder {
continue; continue;
} }
if ((ccHeader & CC_VALID_FLAG) != CC_VALID_FLAG) { boolean previousCaptionValid = captionValid;
if (captionValid) { captionValid = (ccHeader & CC_VALID_FLAG) == CC_VALID_FLAG;
if (!captionValid) {
if (previousCaptionValid) {
// The encoder has flipped the validity bit to indicate captions are being turned off. // The encoder has flipped the validity bit to indicate captions are being turned off.
resetCueBuilders(); resetCueBuilders();
captionValid = false;
captionDataProcessed = true; captionDataProcessed = true;
} }
continue; continue;