From 4d6c9f27c2a2ae982acedf7df45b9fd2656300b7 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 19 Dec 2014 12:05:03 +0000
Subject: [PATCH] Minor cleanup of AudioTrack.

---
 .../google/android/exoplayer/audio/AudioTrack.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 52602e1483..9754d511e1 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
@@ -361,9 +361,12 @@ public final class AudioTrack {
    *     written data.
    */
   public int handleBuffer(ByteBuffer buffer, int offset, int size, long presentationTimeUs) {
-    int result = 0;
+    if (size == 0) {
+      return RESULT_BUFFER_CONSUMED;
+    }
 
-    if (temporaryBufferSize == 0 && size != 0) {
+    int result = 0;
+    if (temporaryBufferSize == 0) {
       if (isAc3 && ac3Bitrate == UNKNOWN_AC3_BITRATE) {
         // Each AC-3 buffer contains 1536 frames of audio, so the AudioTrack playback position
         // advances by 1536 per buffer (32 ms at 48 kHz). Calculate the bitrate in kbit/s.
@@ -393,15 +396,11 @@ public final class AudioTrack {
           // number of bytes submitted.
           startMediaTimeUs += (bufferStartTime - expectedBufferStartTime);
           startMediaTimeState = START_IN_SYNC;
-          result = RESULT_POSITION_DISCONTINUITY;
+          result |= RESULT_POSITION_DISCONTINUITY;
         }
       }
     }
 
-    if (size == 0) {
-      return result;
-    }
-
     if (temporaryBufferSize == 0) {
       temporaryBufferSize = size;
       buffer.position(offset);