Remove unused variable and parameter.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=152107538
roblav96 · Apr 6, 2017 · 6a7db4b · 6a7db4b
1 parent dd2914f
commit 6a7db4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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<OpusMSDecoder*>(jDecoder);
   const uint8_t* inputBuffer =
       reinterpret_cast<const uint8_t*>(
           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,