diff --git a/libraries/decoder_opus/src/main/java/androidx/media3/decoder/opus/OpusDecoder.java b/libraries/decoder_opus/src/main/java/androidx/media3/decoder/opus/OpusDecoder.java index 232dbafdce..62fb9c04b1 100644 --- a/libraries/decoder_opus/src/main/java/androidx/media3/decoder/opus/OpusDecoder.java +++ b/libraries/decoder_opus/src/main/java/androidx/media3/decoder/opus/OpusDecoder.java @@ -213,7 +213,7 @@ public final class OpusDecoder outputData.position(0); outputData.limit(result); if (skipSamples > 0) { - int bytesPerSample = channelCount * 2; + int bytesPerSample = samplesToBytes(1, channelCount, outputFloat); int skipBytes = skipSamples * bytesPerSample; if (result <= skipBytes) { skipSamples -= result / bytesPerSample; @@ -280,6 +280,12 @@ public final class OpusDecoder return DEFAULT_SEEK_PRE_ROLL_SAMPLES; } + /** Returns number of bytes to represent {@code samples}. */ + private static int samplesToBytes(int samples, int channelCount, boolean outputFloat) { + int bytesPerChannel = outputFloat ? 4 : 2; + return samples * channelCount * bytesPerChannel; + } + private static int readSignedLittleEndian16(byte[] input, int offset) { int value = input[offset] & 0xFF; value |= (input[offset + 1] & 0xFF) << 8;