mirror of
https://github.com/samsonjs/media.git
synced 2026-04-27 15:07:40 +00:00
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
This commit is contained in:
parent
0f94ebfb7d
commit
8c0f22c99c
3 changed files with 5 additions and 0 deletions
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Nullable
|
||||||
public MediaClock getMediaClock() {
|
public MediaClock getMediaClock() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -218,6 +218,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Nullable
|
||||||
public MediaClock getMediaClock() {
|
public MediaClock getMediaClock() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue