From cfbcf2c86cc4edc86650533b32e724c79d3227ce Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 10 Nov 2022 10:19:01 +0000 Subject: [PATCH] Fix Dackka parameter name error in `Gav1Decoder` and `VpxDecoder` These aren't caught by presubmit because the classes are annotated `@VisibleForTesting` and are therefore stripped out by Metalava. However Metalava doesn't run when we're generating javadoc for real. #minor-release PiperOrigin-RevId: 487476260 (cherry picked from commit 742da7f49a5b0cebc2fe6927e820666c8372f0b6) --- .../java/androidx/media3/decoder/av1/Gav1Decoder.java | 8 ++++---- .../main/java/androidx/media3/decoder/vp9/VpxDecoder.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Gav1Decoder.java b/libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Gav1Decoder.java index fb54007a84..2a93e0fb6f 100644 --- a/libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Gav1Decoder.java +++ b/libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Gav1Decoder.java @@ -138,13 +138,13 @@ public final class Gav1Decoder } @Override - protected void releaseOutputBuffer(VideoDecoderOutputBuffer buffer) { + protected void releaseOutputBuffer(VideoDecoderOutputBuffer outputBuffer) { // Decode only frames do not acquire a reference on the internal decoder buffer and thus do not // require a call to gav1ReleaseFrame. - if (buffer.mode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && !buffer.isDecodeOnly()) { - gav1ReleaseFrame(gav1DecoderContext, buffer); + if (outputBuffer.mode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && !outputBuffer.isDecodeOnly()) { + gav1ReleaseFrame(gav1DecoderContext, outputBuffer); } - super.releaseOutputBuffer(buffer); + super.releaseOutputBuffer(outputBuffer); } /** diff --git a/libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/VpxDecoder.java b/libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/VpxDecoder.java index 259ac2a544..30bdaecb7f 100644 --- a/libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/VpxDecoder.java +++ b/libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/VpxDecoder.java @@ -101,13 +101,13 @@ public final class VpxDecoder } @Override - protected void releaseOutputBuffer(VideoDecoderOutputBuffer buffer) { + protected void releaseOutputBuffer(VideoDecoderOutputBuffer outputBuffer) { // Decode only frames do not acquire a reference on the internal decoder buffer and thus do not // require a call to vpxReleaseFrame. - if (outputMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && !buffer.isDecodeOnly()) { - vpxReleaseFrame(vpxDecContext, buffer); + if (outputMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && !outputBuffer.isDecodeOnly()) { + vpxReleaseFrame(vpxDecContext, outputBuffer); } - super.releaseOutputBuffer(buffer); + super.releaseOutputBuffer(outputBuffer); } @Override