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
9eb93a35
authored
Oct 28, 2019
by
aquilescanta
Committed by
Oliver Woodman
Oct 30, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix a bunch of typos
PiperOrigin-RevId: 277056574
parent
8ec6cf15
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
View file @
9eb93a35
...
@@ -110,7 +110,7 @@ import java.util.Map;
...
@@ -110,7 +110,7 @@ import java.util.Map;
/**
/**
* Reads an ICY stream metadata block, passing it to {@link #listener} unless the block is empty.
* Reads an ICY stream metadata block, passing it to {@link #listener} unless the block is empty.
*
*
* @return True if the block was extracted, including if it
'
s length byte indicated a length of
* @return True if the block was extracted, including if its length byte indicated a length of
* zero. False if the end of the stream was reached.
* zero. False if the end of the stream was reached.
* @throws IOException If an error occurs reading from the wrapped {@link DataSource}.
* @throws IOException If an error occurs reading from the wrapped {@link DataSource}.
*/
*/
...
...
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
View file @
9eb93a35
...
@@ -88,11 +88,11 @@ public final class WebvttCueParser {
...
@@ -88,11 +88,11 @@ public final class WebvttCueParser {
*
*
* @param webvttData Parsable WebVTT file data.
* @param webvttData Parsable WebVTT file data.
* @param builder Builder for WebVTT Cues.
* @param builder Builder for WebVTT Cues.
* @param styles List of styles defined by the CSS style blocks prece
e
ding the cues.
* @param styles List of styles defined by the CSS style blocks preceding the cues.
* @return Whether a valid Cue was found.
* @return Whether a valid Cue was found.
*/
*/
public
boolean
parseCue
(
ParsableByteArray
webvttData
,
WebvttCue
.
Builder
builder
,
public
boolean
parseCue
(
List
<
WebvttCssStyle
>
styles
)
{
ParsableByteArray
webvttData
,
WebvttCue
.
Builder
builder
,
List
<
WebvttCssStyle
>
styles
)
{
String
firstLine
=
webvttData
.
readLine
();
String
firstLine
=
webvttData
.
readLine
();
if
(
firstLine
==
null
)
{
if
(
firstLine
==
null
)
{
return
false
;
return
false
;
...
@@ -152,11 +152,11 @@ public final class WebvttCueParser {
...
@@ -152,11 +152,11 @@ public final class WebvttCueParser {
*
*
* @param id Id of the cue, {@code null} if it is not present.
* @param id Id of the cue, {@code null} if it is not present.
* @param markup The markup text to be parsed.
* @param markup The markup text to be parsed.
* @param styles List of styles defined by the CSS style blocks prece
e
ding the cues.
* @param styles List of styles defined by the CSS style blocks preceding the cues.
* @param builder Output builder.
* @param builder Output builder.
*/
*/
/* package */
static
void
parseCueText
(
String
id
,
String
markup
,
WebvttCue
.
Builder
builder
,
/* package */
static
void
parseCueText
(
List
<
WebvttCssStyle
>
styles
)
{
String
id
,
String
markup
,
WebvttCue
.
Builder
builder
,
List
<
WebvttCssStyle
>
styles
)
{
SpannableStringBuilder
spannedText
=
new
SpannableStringBuilder
();
SpannableStringBuilder
spannedText
=
new
SpannableStringBuilder
();
ArrayDeque
<
StartTag
>
startTagStack
=
new
ArrayDeque
<>();
ArrayDeque
<
StartTag
>
startTagStack
=
new
ArrayDeque
<>();
List
<
StyleMatch
>
scratchStyleMatches
=
new
ArrayList
<>();
List
<
StyleMatch
>
scratchStyleMatches
=
new
ArrayList
<>();
...
...
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View file @
9eb93a35
...
@@ -1526,7 +1526,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
...
@@ -1526,7 +1526,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
setParameters
(
buildUponParameters
().
setRendererDisabled
(
rendererIndex
,
disabled
));
setParameters
(
buildUponParameters
().
setRendererDisabled
(
rendererIndex
,
disabled
));
}
}
/** @deprecated Use {@link Parameters#getRendererDisabled(int)}. *
*
/
/** @deprecated Use {@link Parameters#getRendererDisabled(int)}. */
@Deprecated
@Deprecated
public
final
boolean
getRendererDisabled
(
int
rendererIndex
)
{
public
final
boolean
getRendererDisabled
(
int
rendererIndex
)
{
return
getParameters
().
getRendererDisabled
(
rendererIndex
);
return
getParameters
().
getRendererDisabled
(
rendererIndex
);
...
@@ -1542,7 +1542,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
...
@@ -1542,7 +1542,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
setParameters
(
buildUponParameters
().
setSelectionOverride
(
rendererIndex
,
groups
,
override
));
setParameters
(
buildUponParameters
().
setSelectionOverride
(
rendererIndex
,
groups
,
override
));
}
}
/** @deprecated Use {@link Parameters#hasSelectionOverride(int, TrackGroupArray)}. *
*
/
/** @deprecated Use {@link Parameters#hasSelectionOverride(int, TrackGroupArray)}. */
@Deprecated
@Deprecated
public
final
boolean
hasSelectionOverride
(
int
rendererIndex
,
TrackGroupArray
groups
)
{
public
final
boolean
hasSelectionOverride
(
int
rendererIndex
,
TrackGroupArray
groups
)
{
return
getParameters
().
hasSelectionOverride
(
rendererIndex
,
groups
);
return
getParameters
().
hasSelectionOverride
(
rendererIndex
,
groups
);
...
...
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