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
54b4df70
authored
Dec 01, 2016
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'RikHeijdens-eia-608-improvements' into dev-v2
parents
7a18738d
a6ccedf7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
library/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
View file @
54b4df70
This diff is collapsed.
Click to expand it.
library/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
View file @
54b4df70
...
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text.cea;
...
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text.cea;
import
com.google.android.exoplayer2.text.Cue
;
import
com.google.android.exoplayer2.text.Cue
;
import
com.google.android.exoplayer2.text.Subtitle
;
import
com.google.android.exoplayer2.text.Subtitle
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -28,14 +27,10 @@ import java.util.List;
...
@@ -28,14 +27,10 @@ import java.util.List;
private
final
List
<
Cue
>
cues
;
private
final
List
<
Cue
>
cues
;
/**
/**
* @param cue
The subtitle cue
.
* @param cue
s The subtitle cues
.
*/
*/
public
CeaSubtitle
(
Cue
cue
)
{
public
CeaSubtitle
(
List
<
Cue
>
cues
)
{
if
(
cue
==
null
)
{
this
.
cues
=
cues
;
cues
=
Collections
.
emptyList
();
}
else
{
cues
=
Collections
.
singletonList
(
cue
);
}
}
}
@Override
@Override
...
@@ -56,7 +51,6 @@ import java.util.List;
...
@@ -56,7 +51,6 @@ import java.util.List;
@Override
@Override
public
List
<
Cue
>
getCues
(
long
timeUs
)
{
public
List
<
Cue
>
getCues
(
long
timeUs
)
{
return
cues
;
return
cues
;
}
}
}
}
library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
View file @
54b4df70
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