Merge pull request #160 from google/dev

dev -> dev-hls

library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java

@@ -737,11 +737,11 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
       return false;
       return false;
     }
     }
 
 
-    int decodeOnlyIdx = getDecodeOnlyIndex(outputBufferInfo.presentationTimeUs);
+    int decodeOnlyIndex = getDecodeOnlyIndex(outputBufferInfo.presentationTimeUs);
     if (processOutputBuffer(positionUs, elapsedRealtimeUs, codec, outputBuffers[outputIndex],
     if (processOutputBuffer(positionUs, elapsedRealtimeUs, codec, outputBuffers[outputIndex],
-        outputBufferInfo, outputIndex, decodeOnlyIdx >= 0)) {
-      if (decodeOnlyIdx >= 0) {
-        decodeOnlyPresentationTimestamps.remove(decodeOnlyIdx);
+        outputBufferInfo, outputIndex, decodeOnlyIndex != -1)) {
+      if (decodeOnlyIndex != -1) {
+        decodeOnlyPresentationTimestamps.remove(decodeOnlyIndex);
       } else {
       } else {
         currentPositionUs = outputBufferInfo.presentationTimeUs;
         currentPositionUs = outputBufferInfo.presentationTimeUs;
       }
       }
@@ -794,4 +794,5 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
     }
     }
     return -1;
     return -1;
   }
   }
+
 }
 }

library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java

@@ -15,7 +15,6 @@
  */
  */
 package com.google.android.exoplayer.audio;
 package com.google.android.exoplayer.audio;
 
 
-import com.google.android.exoplayer.ExoPlaybackException;
 import com.google.android.exoplayer.util.Assertions;
 import com.google.android.exoplayer.util.Assertions;
 import com.google.android.exoplayer.util.Util;
 import com.google.android.exoplayer.util.Util;
 
 
@@ -192,9 +191,12 @@ public final class AudioTrack {
       return CURRENT_POSITION_NOT_SET;
       return CURRENT_POSITION_NOT_SET;
     }
     }
 
 
+    if (audioTrack.getPlayState() == android.media.AudioTrack.PLAYSTATE_PLAYING) {
+      maybeSampleSyncParams();
+    }
+
     long systemClockUs = System.nanoTime() / 1000;
     long systemClockUs = System.nanoTime() / 1000;
     long currentPositionUs;
     long currentPositionUs;
-    maybeSampleSyncParams();
     if (audioTimestampSet) {
     if (audioTimestampSet) {
       // How long ago in the past the audio timestamp is (negative if it's in the future).
       // How long ago in the past the audio timestamp is (negative if it's in the future).
       long presentationDiff = systemClockUs - (audioTimestampCompat.getNanoTime() / 1000);
       long presentationDiff = systemClockUs - (audioTimestampCompat.getNanoTime() / 1000);
@@ -508,10 +510,6 @@ public final class AudioTrack {
 
 
   /** Updates the audio track latency and playback position parameters. */
   /** Updates the audio track latency and playback position parameters. */
   private void maybeSampleSyncParams() {
   private void maybeSampleSyncParams() {
-    if (!hasCurrentPositionUs()) {
-      return;
-    }
-
     long playbackPositionUs = getPlaybackPositionUs();
     long playbackPositionUs = getPlaybackPositionUs();
     if (playbackPositionUs == 0) {
     if (playbackPositionUs == 0) {
       // The AudioTrack hasn't output anything yet.
       // The AudioTrack hasn't output anything yet.
@@ -574,7 +572,7 @@ public final class AudioTrack {
    * method is a no-op. If it hasn't then {@link #audioTrack} is released and set to null, and an
    * method is a no-op. If it hasn't then {@link #audioTrack} is released and set to null, and an
    * exception is thrown.
    * exception is thrown.
    *
    *
-   * @throws ExoPlaybackException If {@link #audioTrack} has not been successfully initialized.
+   * @throws InitializationException If {@link #audioTrack} has not been successfully initialized.
    */
    */
   private void checkAudioTrackInitialized() throws InitializationException {
   private void checkAudioTrackInitialized() throws InitializationException {
     int state = audioTrack.getState();
     int state = audioTrack.getState();