From 963b7cbf72104e1fe1d61d8b218f620c4a39f5c1 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 8 May 2017 00:25:59 -0700
Subject: [PATCH] Fix interpolation for rate/pitch adjustment

Based on https://github.com/waywardgeek/sonic/commit/7b441933.

Issue: #2774

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=155349817
---
 .../java/com/google/android/exoplayer2/audio/Sonic.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
index 5d6f01b6e0..ef7877ae1e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
@@ -374,8 +374,8 @@ import java.util.Arrays;
   }
 
   private short interpolate(short[] in, int inPos, int oldSampleRate, int newSampleRate) {
-    short left = in[inPos * numChannels];
-    short right = in[inPos * numChannels + numChannels];
+    short left = in[inPos];
+    short right = in[inPos + numChannels];
     int position = newRatePosition * oldSampleRate;
     int leftPosition = oldRatePosition * newSampleRate;
     int rightPosition = (oldRatePosition + 1) * newSampleRate;
@@ -402,7 +402,7 @@ import java.util.Arrays;
         enlargeOutputBufferIfNeeded(1);
         for (int i = 0; i < numChannels; i++) {
           outputBuffer[numOutputSamples * numChannels + i] =
-              interpolate(pitchBuffer, position + i, oldSampleRate, newSampleRate);
+              interpolate(pitchBuffer, position * numChannels + i, oldSampleRate, newSampleRate);
         }
         newRatePosition++;
         numOutputSamples++;