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
881fcf82
authored
Oct 23, 2019
by
tonihei
Committed by
Oliver Woodman
Oct 30, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add some missing @Nullable to Format
PiperOrigin-RevId: 276366002
parent
665627c3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
library/core/src/main/java/com/google/android/exoplayer2/Format.java
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View file @
881fcf82
...
@@ -187,8 +187,8 @@ public final class Format implements Parcelable {
...
@@ -187,8 +187,8 @@ public final class Format implements Parcelable {
public
static
Format
createVideoContainerFormat
(
public
static
Format
createVideoContainerFormat
(
@Nullable
String
id
,
@Nullable
String
id
,
@Nullable
String
containerMimeType
,
@Nullable
String
containerMimeType
,
String
sampleMimeType
,
@Nullable
String
sampleMimeType
,
String
codecs
,
@Nullable
String
codecs
,
int
bitrate
,
int
bitrate
,
int
width
,
int
width
,
int
height
,
int
height
,
...
@@ -215,8 +215,8 @@ public final class Format implements Parcelable {
...
@@ -215,8 +215,8 @@ public final class Format implements Parcelable {
@Nullable
String
id
,
@Nullable
String
id
,
@Nullable
String
label
,
@Nullable
String
label
,
@Nullable
String
containerMimeType
,
@Nullable
String
containerMimeType
,
String
sampleMimeType
,
@Nullable
String
sampleMimeType
,
String
codecs
,
@Nullable
String
codecs
,
@Nullable
Metadata
metadata
,
@Nullable
Metadata
metadata
,
int
bitrate
,
int
bitrate
,
int
width
,
int
width
,
...
@@ -326,7 +326,7 @@ public final class Format implements Parcelable {
...
@@ -326,7 +326,7 @@ public final class Format implements Parcelable {
@Nullable
List
<
byte
[]>
initializationData
,
@Nullable
List
<
byte
[]>
initializationData
,
int
rotationDegrees
,
int
rotationDegrees
,
float
pixelWidthHeightRatio
,
float
pixelWidthHeightRatio
,
byte
[]
projectionData
,
@Nullable
byte
[]
projectionData
,
@C
.
StereoMode
int
stereoMode
,
@C
.
StereoMode
int
stereoMode
,
@Nullable
ColorInfo
colorInfo
,
@Nullable
ColorInfo
colorInfo
,
@Nullable
DrmInitData
drmInitData
)
{
@Nullable
DrmInitData
drmInitData
)
{
...
@@ -618,7 +618,7 @@ public final class Format implements Parcelable {
...
@@ -618,7 +618,7 @@ public final class Format implements Parcelable {
public
static
Format
createTextSampleFormat
(
public
static
Format
createTextSampleFormat
(
@Nullable
String
id
,
@Nullable
String
id
,
String
sampleMimeType
,
@Nullable
String
sampleMimeType
,
@C
.
SelectionFlags
int
selectionFlags
,
@C
.
SelectionFlags
int
selectionFlags
,
@Nullable
String
language
)
{
@Nullable
String
language
)
{
return
createTextSampleFormat
(
id
,
sampleMimeType
,
selectionFlags
,
language
,
null
);
return
createTextSampleFormat
(
id
,
sampleMimeType
,
selectionFlags
,
language
,
null
);
...
@@ -626,7 +626,7 @@ public final class Format implements Parcelable {
...
@@ -626,7 +626,7 @@ public final class Format implements Parcelable {
public
static
Format
createTextSampleFormat
(
public
static
Format
createTextSampleFormat
(
@Nullable
String
id
,
@Nullable
String
id
,
String
sampleMimeType
,
@Nullable
String
sampleMimeType
,
@C
.
SelectionFlags
int
selectionFlags
,
@C
.
SelectionFlags
int
selectionFlags
,
@Nullable
String
language
,
@Nullable
String
language
,
@Nullable
DrmInitData
drmInitData
)
{
@Nullable
DrmInitData
drmInitData
)
{
...
@@ -697,7 +697,7 @@ public final class Format implements Parcelable {
...
@@ -697,7 +697,7 @@ public final class Format implements Parcelable {
int
accessibilityChannel
,
int
accessibilityChannel
,
@Nullable
DrmInitData
drmInitData
,
@Nullable
DrmInitData
drmInitData
,
long
subsampleOffsetUs
,
long
subsampleOffsetUs
,
List
<
byte
[]>
initializationData
)
{
@Nullable
List
<
byte
[]>
initializationData
)
{
return
new
Format
(
return
new
Format
(
id
,
id
,
/* label= */
null
,
/* label= */
null
,
...
...
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