Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
17eadcc4
authored
Nov 26, 2018
by
olly
Committed by
Oliver Woodman
Nov 26, 2018
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix Cea608 caption valid
PiperOrigin-RevId: 222797622
parent
03101444
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
View file @
17eadcc4
...
@@ -298,7 +298,6 @@ public final class Cea608Decoder extends CeaDecoder {
...
@@ -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 {
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment