From 6a7db4b1ec4bf4864197bf5e9cabb0b744abebba Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 4 Apr 2017 01:31:33 -0700 Subject: [PATCH] Remove unused variable and parameter. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=152107538 --- .../google/android/exoplayer2/ext/opus/OpusDecoder.java | 4 ++-- extensions/opus/src/main/jni/opus_jni.cc | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java index 83e461d279..95c38c34bb 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java @@ -161,7 +161,7 @@ public OpusDecoderException decode(DecoderInputBuffer inputBuffer, cryptoInfo.key, cryptoInfo.iv, cryptoInfo.numSubSamples, cryptoInfo.numBytesOfClearData, cryptoInfo.numBytesOfEncryptedData) : opusDecode(nativeDecoderContext, inputBuffer.timeUs, inputData, inputData.limit(), - outputBuffer, SAMPLE_RATE); + outputBuffer); if (result < 0) { if (result == DRM_ERROR) { String message = "Drm error: " + opusGetErrorMessage(nativeDecoderContext); @@ -210,7 +210,7 @@ private static int readLittleEndian16(byte[] input, int offset) { private native long opusInit(int sampleRate, int channelCount, int numStreams, int numCoupled, int gain, byte[] streamMap); private native int opusDecode(long decoder, long timeUs, ByteBuffer inputBuffer, int inputSize, - SimpleOutputBuffer outputBuffer, int sampleRate); + SimpleOutputBuffer outputBuffer); private native int opusSecureDecode(long decoder, long timeUs, ByteBuffer inputBuffer, int inputSize, SimpleOutputBuffer outputBuffer, int sampleRate, ExoMediaCrypto mediaCrypto, int inputMode, byte[] key, byte[] iv, diff --git a/extensions/opus/src/main/jni/opus_jni.cc b/extensions/opus/src/main/jni/opus_jni.cc index a1d1ffe478..8d9c1a4152 100644 --- a/extensions/opus/src/main/jni/opus_jni.cc +++ b/extensions/opus/src/main/jni/opus_jni.cc @@ -93,16 +93,14 @@ DECODER_FUNC(jlong, opusInit, jint sampleRate, jint channelCount, } DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs, - jobject jInputBuffer, jint inputSize, jobject jOutputBuffer, - jint sampleRate) { + jobject jInputBuffer, jint inputSize, jobject jOutputBuffer) { OpusMSDecoder* decoder = reinterpret_cast(jDecoder); const uint8_t* inputBuffer = reinterpret_cast( env->GetDirectBufferAddress(jInputBuffer)); - const int32_t inputSampleCount = - opus_packet_get_nb_samples(inputBuffer, inputSize, sampleRate); - const jint outputSize = kMaxOpusOutputPacketSizeSamples * kBytesPerSample * channelCount; + const jint outputSize = + kMaxOpusOutputPacketSizeSamples * kBytesPerSample * channelCount; env->CallObjectMethod(jOutputBuffer, outputBufferInit, jTimeUs, outputSize); const jobject jOutputBufferData = env->CallObjectMethod(jOutputBuffer,