Commit 8c0f22c9 by tonihei Committed by Oliver Woodman

Add missing @Nullable to MediaCodecAudioRenderer.getMediaClock

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
parent 0f94ebfb
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
`SsaStyle$SsaAlignment` `SsaStyle$SsaAlignment`
([#6771](https://github.com/google/ExoPlayer/issues/6771)). ([#6771](https://github.com/google/ExoPlayer/issues/6771)).
* Fix `CacheDataSource` to correctly propagate `DataSpec.httpRequestHeaders`. * 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) ### ### 2.11.0 (2019-12-11) ###
......
...@@ -520,6 +520,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -520,6 +520,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
} }
@Override @Override
@Nullable
public MediaClock getMediaClock() { public MediaClock getMediaClock() {
return this; return this;
} }
......
...@@ -218,6 +218,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -218,6 +218,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
} }
@Override @Override
@Nullable
public MediaClock getMediaClock() { public MediaClock getMediaClock() {
return this; return this;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment