Commit 91d2b858 by krocard Committed by Oliver Woodman

Make MediaCodecRenderer.codec nullable

Also fix annotation style of the surrounding functions.

PiperOrigin-RevId: 288865420
parent 2c02f787
...@@ -634,7 +634,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -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 { ...@@ -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;
} }
......
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