loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make MediaCodecRenderer.codec nullable

Browse Source 
Also fix annotation style of the surrounding functions.

PiperOrigin-RevId: 288865420
This commit is contained in:
krocard 2020-01-09 11:05:36 +00:00 committed by Oliver Woodman
parent 2c02f787bd
commit 91d2b8581e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View File

@ -634,7 +634,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
* method if they are taking over responsibility for output format propagation (e.g., when using * method if they are taking over responsibility for output format propagation (e.g., when using
* video tunneling). * video tunneling).
*/ */
protected final @Nullable Format updateOutputFormatForTime(long presentationTimeUs) { @Nullable
protected final Format updateOutputFormatForTime(long presentationTimeUs) {
Format format = formatQueue.pollFloor(presentationTimeUs); Format format = formatQueue.pollFloor(presentationTimeUs);
if (format != null) { if (format != null) {
outputFormat = format; outputFormat = format;
@ -642,11 +643,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
return format; return format;
} }
@Nullable
protected final MediaCodec getCodec() { protected final MediaCodec getCodec() {
return codec; return codec;
} }
protected final @Nullable MediaCodecInfo getCodecInfo() { @Nullable
protected final MediaCodecInfo getCodecInfo() {
return codecInfo; return codecInfo;
} }