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
bb9b3fd4
authored
Jan 27, 2020
by
aquilescanta
Committed by
Ian Baker
Jan 28, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix some typos
PiperOrigin-RevId: 291750515
parent
8da0e27d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
View file @
bb9b3fd4
...
@@ -203,7 +203,7 @@ import java.nio.ByteBuffer;
...
@@ -203,7 +203,7 @@ import java.nio.ByteBuffer;
* @param context Decoder context.
* @param context Decoder context.
* @param surface Output surface.
* @param surface Output surface.
* @param outputBuffer Output buffer with the decoded frame.
* @param outputBuffer Output buffer with the decoded frame.
* @return {@link #GAV1_OK} if successful, {@link #GAV1_ERROR} if an error occured.
* @return {@link #GAV1_OK} if successful, {@link #GAV1_ERROR} if an error occur
r
ed.
*/
*/
private
native
int
gav1RenderFrame
(
private
native
int
gav1RenderFrame
(
long
context
,
Surface
surface
,
VideoDecoderOutputBuffer
outputBuffer
);
long
context
,
Surface
surface
,
VideoDecoderOutputBuffer
outputBuffer
);
...
@@ -225,10 +225,10 @@ import java.nio.ByteBuffer;
...
@@ -225,10 +225,10 @@ import java.nio.ByteBuffer;
private
native
String
gav1GetErrorMessage
(
long
context
);
private
native
String
gav1GetErrorMessage
(
long
context
);
/**
/**
* Returns whether an error occured.
* Returns whether an error occur
r
ed.
*
*
* @param context Decoder context.
* @param context Decoder context.
* @return {@link #GAV1_OK} if there was no error, {@link #GAV1_ERROR} if an error occured.
* @return {@link #GAV1_OK} if there was no error, {@link #GAV1_ERROR} if an error occur
r
ed.
*/
*/
private
native
int
gav1CheckError
(
long
context
);
private
native
int
gav1CheckError
(
long
context
);
}
}
library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java
View file @
bb9b3fd4
...
@@ -41,9 +41,9 @@ public final class MpegAudioUtil {
...
@@ -41,9 +41,9 @@ public final class MpegAudioUtil {
public
int
samplesPerFrame
;
public
int
samplesPerFrame
;
/**
/**
* Populates the fields in this instance to reflect the
the MPEG audio header in {@code
* Populates the fields in this instance to reflect the
MPEG audio header in {@code headerData},
*
headerData}, returning whether the header was valid. If false, the values of the fields in
*
returning whether the header was valid. If false, the values of the fields in this instance
*
this instance
will not be updated.
* will not be updated.
*
*
* @param headerData Header data to parse.
* @param headerData Header data to parse.
* @return True if the fields were populated. False otherwise, indicating that {@code
* @return True if the fields were populated. False otherwise, indicating that {@code
...
...
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
View file @
bb9b3fd4
...
@@ -139,7 +139,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
...
@@ -139,7 +139,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
* starts with {@code [} (i.e. the title of the next section).
* starts with {@code [} (i.e. the title of the next section).
*
*
* @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition() position}
* @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition() position}
* set to the beginning of
of
the first line after {@code [Script Info]}.
* set to the beginning of the first line after {@code [Script Info]}.
*/
*/
private
void
parseScriptInfo
(
ParsableByteArray
data
)
{
private
void
parseScriptInfo
(
ParsableByteArray
data
)
{
@Nullable
String
currentLine
;
@Nullable
String
currentLine
;
...
@@ -175,7 +175,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
...
@@ -175,7 +175,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
* starts with {@code [} (i.e. the title of the next section).
* starts with {@code [} (i.e. the title of the next section).
*
*
* @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition()} pointing
* @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition()} pointing
* at the beginning of
of
the first line after {@code [V4+ Styles]}.
* at the beginning of the first line after {@code [V4+ Styles]}.
*/
*/
private
static
Map
<
String
,
SsaStyle
>
parseStyles
(
ParsableByteArray
data
)
{
private
static
Map
<
String
,
SsaStyle
>
parseStyles
(
ParsableByteArray
data
)
{
Map
<
String
,
SsaStyle
>
styles
=
new
LinkedHashMap
<>();
Map
<
String
,
SsaStyle
>
styles
=
new
LinkedHashMap
<>();
...
...
library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
View file @
bb9b3fd4
...
@@ -89,7 +89,7 @@ public final class MappingTrackSelectorTest {
...
@@ -89,7 +89,7 @@ public final class MappingTrackSelectorTest {
}
}
@Test
@Test
public
void
selectTracks_audioAndVideo_sameOrderAsRenderers_mappedToCorectRenderer
()
public
void
selectTracks_audioAndVideo_sameOrderAsRenderers_mappedToCor
r
ectRenderer
()
throws
ExoPlaybackException
{
throws
ExoPlaybackException
{
FakeMappingTrackSelector
trackSelector
=
new
FakeMappingTrackSelector
();
FakeMappingTrackSelector
trackSelector
=
new
FakeMappingTrackSelector
();
RendererCapabilities
[]
rendererCapabilities
=
RendererCapabilities
[]
rendererCapabilities
=
...
@@ -103,7 +103,7 @@ public final class MappingTrackSelectorTest {
...
@@ -103,7 +103,7 @@ public final class MappingTrackSelectorTest {
}
}
@Test
@Test
public
void
selectTracks_audioAndVideo_reverseOrderToRenderers_mappedToCorectRenderer
()
public
void
selectTracks_audioAndVideo_reverseOrderToRenderers_mappedToCor
r
ectRenderer
()
throws
ExoPlaybackException
{
throws
ExoPlaybackException
{
FakeMappingTrackSelector
trackSelector
=
new
FakeMappingTrackSelector
();
FakeMappingTrackSelector
trackSelector
=
new
FakeMappingTrackSelector
();
TrackGroupArray
trackGroups
=
new
TrackGroupArray
(
VIDEO_TRACK_GROUP
,
AUDIO_TRACK_GROUP
);
TrackGroupArray
trackGroups
=
new
TrackGroupArray
(
VIDEO_TRACK_GROUP
,
AUDIO_TRACK_GROUP
);
...
...
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