From 2b0f68a0abaabf3cdac29624b3b429512ca19670 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 15 Jul 2015 11:27:10 +0100
Subject: [PATCH] Rm Timescale from AudioTrack. Not required.

---
 .../exoplayer/MediaCodecAudioTrackRenderer.java   |  2 +-
 .../android/exoplayer/audio/AudioTrack.java       | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
index c9b44b7d43..510313c787 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
@@ -68,7 +68,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer implem
   private static final String RAW_DECODER_NAME = "OMX.google.raw.decoder";
 
   private final EventListener eventListener;
-  protected final AudioTrack audioTrack;
+  private final AudioTrack audioTrack;
 
   private int audioSessionId;
   private long currentPositionUs;
diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
index 29d3d0c876..1931e34e01 100644
--- a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
+++ b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
@@ -145,8 +145,6 @@ public final class AudioTrack {
   private static final int MIN_PLAYHEAD_OFFSET_SAMPLE_INTERVAL_US = 30000;
   private static final int MIN_TIMESTAMP_SAMPLE_INTERVAL_US = 500000;
 
-  private static final int DEFAULT_TIMESCALE_PERCENT = 100;
-
   /**
    * Whether to enable a workaround for an issue where an audio effect does not keep its session
    * active across releasing/initializing a new audio track, on platform API version < 21.
@@ -193,7 +191,6 @@ public final class AudioTrack {
   private long resumeSystemTimeUs;
   private long latencyUs;
   private float volume;
-  private int timeScalePercent;
 
   private byte[] temporaryBuffer;
   private int temporaryBufferOffset;
@@ -221,7 +218,6 @@ public final class AudioTrack {
     }
     playheadOffsets = new long[MAX_PLAYHEAD_OFFSET_COUNT];
     volume = 1.0f;
-    timeScalePercent = DEFAULT_TIMESCALE_PERCENT;
     startMediaTimeState = START_NOT_SET;
   }
 
@@ -481,7 +477,7 @@ public final class AudioTrack {
       } else {
         // Sanity check that bufferStartTime is consistent with the expected value.
         long expectedBufferStartTime = startMediaTimeUs
-            + (framesToDurationUs(bytesToFrames(submittedBytes)) * timeScalePercent) / 100;
+            + framesToDurationUs(bytesToFrames(submittedBytes));
         if (startMediaTimeState == START_IN_SYNC
             && Math.abs(expectedBufferStartTime - bufferStartTime) > 200000) {
           Log.e(TAG, "Discontinuity detected [expected " + expectedBufferStartTime + ", got "
@@ -590,15 +586,6 @@ public final class AudioTrack {
     }
   }
 
-  /**
-   * Updates the timescale percent for reporting current time
-   *
-   * @param timeScalePercent The new percent multiplier
-   */
-  public void setTimeScalePercent(int timeScalePercent) {
-    this.timeScalePercent = timeScalePercent;
-  }
-
   /**
    * Releases the underlying audio track asynchronously. Calling {@link #initialize} will block
    * until the audio track has been released, so it is safe to initialize immediately after