Commit 4d6c9f27 by Oliver Woodman

Minor cleanup of AudioTrack.

parent ee823a95
...@@ -361,9 +361,12 @@ public final class AudioTrack { ...@@ -361,9 +361,12 @@ public final class AudioTrack {
* written data. * written data.
*/ */
public int handleBuffer(ByteBuffer buffer, int offset, int size, long presentationTimeUs) { 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) { if (isAc3 && ac3Bitrate == UNKNOWN_AC3_BITRATE) {
// Each AC-3 buffer contains 1536 frames of audio, so the AudioTrack playback position // 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. // advances by 1536 per buffer (32 ms at 48 kHz). Calculate the bitrate in kbit/s.
...@@ -393,15 +396,11 @@ public final class AudioTrack { ...@@ -393,15 +396,11 @@ public final class AudioTrack {
// number of bytes submitted. // number of bytes submitted.
startMediaTimeUs += (bufferStartTime - expectedBufferStartTime); startMediaTimeUs += (bufferStartTime - expectedBufferStartTime);
startMediaTimeState = START_IN_SYNC; startMediaTimeState = START_IN_SYNC;
result = RESULT_POSITION_DISCONTINUITY; result |= RESULT_POSITION_DISCONTINUITY;
} }
} }
} }
if (size == 0) {
return result;
}
if (temporaryBufferSize == 0) { if (temporaryBufferSize == 0) {
temporaryBufferSize = size; temporaryBufferSize = size;
buffer.position(offset); buffer.position(offset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment