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
4b234388
authored
Jan 15, 2020
by
olly
Committed by
Oliver Woodman
Jan 16, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Move @Nullable annotations to correct positions
PiperOrigin-RevId: 289838473
parent
96c648c2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
21 deletions
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
View file @
4b234388
...
@@ -119,7 +119,8 @@ import com.google.android.exoplayer2.util.Assertions;
...
@@ -119,7 +119,8 @@ import com.google.android.exoplayer2.util.Assertions;
* @return The {@link MediaPeriodInfo} for the next media period to load, or {@code null} if not
* @return The {@link MediaPeriodInfo} for the next media period to load, or {@code null} if not
* yet known.
* yet known.
*/
*/
public
@Nullable
MediaPeriodInfo
getNextMediaPeriodInfo
(
@Nullable
public
MediaPeriodInfo
getNextMediaPeriodInfo
(
long
rendererPositionUs
,
PlaybackInfo
playbackInfo
)
{
long
rendererPositionUs
,
PlaybackInfo
playbackInfo
)
{
return
loading
==
null
return
loading
==
null
?
getFirstMediaPeriodInfo
(
playbackInfo
)
?
getFirstMediaPeriodInfo
(
playbackInfo
)
...
@@ -536,7 +537,8 @@ import com.google.android.exoplayer2.util.Assertions;
...
@@ -536,7 +537,8 @@ import com.google.android.exoplayer2.util.Assertions;
* @return The following media period's info, or {@code null} if it is not yet possible to get the
* @return The following media period's info, or {@code null} if it is not yet possible to get the
* next media period info.
* next media period info.
*/
*/
private
@Nullable
MediaPeriodInfo
getFollowingMediaPeriodInfo
(
@Nullable
private
MediaPeriodInfo
getFollowingMediaPeriodInfo
(
MediaPeriodHolder
mediaPeriodHolder
,
long
rendererPositionUs
)
{
MediaPeriodHolder
mediaPeriodHolder
,
long
rendererPositionUs
)
{
// TODO: This method is called repeatedly from ExoPlayerImplInternal.maybeUpdateLoadingPeriod
// TODO: This method is called repeatedly from ExoPlayerImplInternal.maybeUpdateLoadingPeriod
// but if the timeline is not ready to provide the next period it can't return a non-null value
// but if the timeline is not ready to provide the next period it can't return a non-null value
...
...
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
View file @
4b234388
...
@@ -54,7 +54,7 @@ public final class AudioCapabilitiesReceiver {
...
@@ -54,7 +54,7 @@ public final class AudioCapabilitiesReceiver {
@Nullable
private
final
BroadcastReceiver
receiver
;
@Nullable
private
final
BroadcastReceiver
receiver
;
@Nullable
private
final
ExternalSurroundSoundSettingObserver
externalSurroundSoundSettingObserver
;
@Nullable
private
final
ExternalSurroundSoundSettingObserver
externalSurroundSoundSettingObserver
;
/* package */
@Nullable
AudioCapabilities
audioCapabilities
;
@Nullable
/* package */
AudioCapabilities
audioCapabilities
;
private
boolean
registered
;
private
boolean
registered
;
/**
/**
...
...
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
View file @
4b234388
...
@@ -112,7 +112,8 @@ public class CameraMotionRenderer extends BaseRenderer {
...
@@ -112,7 +112,8 @@ public class CameraMotionRenderer extends BaseRenderer {
return
true
;
return
true
;
}
}
private
@Nullable
float
[]
parseMetadata
(
ByteBuffer
data
)
{
@Nullable
private
float
[]
parseMetadata
(
ByteBuffer
data
)
{
if
(
data
.
remaining
()
!=
16
)
{
if
(
data
.
remaining
()
!=
16
)
{
return
null
;
return
null
;
}
}
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
View file @
4b234388
...
@@ -26,7 +26,7 @@ import java.util.List;
...
@@ -26,7 +26,7 @@ import java.util.List;
*/
*/
public
abstract
class
SegmentBase
{
public
abstract
class
SegmentBase
{
/* package */
@Nullable
final
RangedUri
initialization
;
@Nullable
/* package */
final
RangedUri
initialization
;
/* package */
final
long
timescale
;
/* package */
final
long
timescale
;
/* package */
final
long
presentationTimeOffset
;
/* package */
final
long
presentationTimeOffset
;
...
@@ -116,7 +116,7 @@ public abstract class SegmentBase {
...
@@ -116,7 +116,7 @@ public abstract class SegmentBase {
/* package */
final
long
startNumber
;
/* package */
final
long
startNumber
;
/* package */
final
long
duration
;
/* package */
final
long
duration
;
/* package */
@Nullable
final
List
<
SegmentTimelineElement
>
segmentTimeline
;
@Nullable
/* package */
final
List
<
SegmentTimelineElement
>
segmentTimeline
;
/**
/**
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data
...
@@ -233,12 +233,10 @@ public abstract class SegmentBase {
...
@@ -233,12 +233,10 @@ public abstract class SegmentBase {
}
}
/**
/** A {@link MultiSegmentBase} that uses a SegmentList to define its segments. */
* A {@link MultiSegmentBase} that uses a SegmentList to define its segments.
public
static
final
class
SegmentList
extends
MultiSegmentBase
{
*/
public
static
class
SegmentList
extends
MultiSegmentBase
{
/* package */
@Nullable
final
List
<
RangedUri
>
mediaSegments
;
@Nullable
/* package */
final
List
<
RangedUri
>
mediaSegments
;
/**
/**
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data
* @param initialization A {@link RangedUri} corresponding to initialization data, if such data
...
@@ -285,13 +283,11 @@ public abstract class SegmentBase {
...
@@ -285,13 +283,11 @@ public abstract class SegmentBase {
}
}
/**
/** A {@link MultiSegmentBase} that uses a SegmentTemplate to define its segments. */
* A {@link MultiSegmentBase} that uses a SegmentTemplate to define its segments.
public
static
final
class
SegmentTemplate
extends
MultiSegmentBase
{
*/
public
static
class
SegmentTemplate
extends
MultiSegmentBase
{
/* package */
@Nullable
final
UrlTemplate
initializationTemplate
;
@Nullable
/* package */
final
UrlTemplate
initializationTemplate
;
/* package */
@Nullable
final
UrlTemplate
mediaTemplate
;
@Nullable
/* package */
final
UrlTemplate
mediaTemplate
;
/* package */
final
long
endNumber
;
/* package */
final
long
endNumber
;
/**
/**
...
@@ -378,10 +374,8 @@ public abstract class SegmentBase {
...
@@ -378,10 +374,8 @@ public abstract class SegmentBase {
}
}
}
}
/**
/** Represents a timeline segment from the MPD's SegmentTimeline list. */
* Represents a timeline segment from the MPD's SegmentTimeline list.
public
static
final
class
SegmentTimelineElement
{
*/
public
static
class
SegmentTimelineElement
{
/* package */
final
long
startTime
;
/* package */
final
long
startTime
;
/* package */
final
long
duration
;
/* package */
final
long
duration
;
...
...
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