Skip to content

Commit

Permalink
Add missing @nullable to MediaCodecAudioRenderer.getMediaClock
Browse files Browse the repository at this point in the history
Without this @nullable, potential subclasses can't  override the
method to return null if they don't want to use the renderer as a
media clock.

Issue:#6792
PiperOrigin-RevId: 286545736
  • Loading branch information
tonihei authored and ojw28 committed Dec 20, 2019
1 parent 63f7b99 commit b7bc1fe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
`SsaStyle$SsaAlignment`
([#6771](https://github.com/google/ExoPlayer/issues/6771)).
* Fix `CacheDataSource` to correctly propagate `DataSpec.httpRequestHeaders`.
* Add missing @Nullable to `MediaCodecAudioRenderer.getMediaClock` and
`SimpleDecoderAudioRenderer.getMediaClock`
([#6792](https://github.com/google/ExoPlayer/issues/6792)).

### 2.11.0 (2019-12-11) ###

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ protected boolean canKeepCodecWithFlush(Format oldFormat, Format newFormat) {
}

@Override
@Nullable
public MediaClock getMediaClock() {
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ public SimpleDecoderAudioRenderer(
}

@Override
@Nullable
public MediaClock getMediaClock() {
return this;
}
Expand Down

0 comments on commit b7bc1fe

Please sign in to comment.