Commit 06f7b6be by andrewlewis Committed by Oliver Woodman

Use IntDef for AudioTrack.startMediaTimeState

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169880369
parent 505d5cd0
...@@ -22,6 +22,7 @@ import android.media.AudioManager; ...@@ -22,6 +22,7 @@ import android.media.AudioManager;
import android.media.AudioTimestamp; import android.media.AudioTimestamp;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
...@@ -29,6 +30,8 @@ import com.google.android.exoplayer2.PlaybackParameters; ...@@ -29,6 +30,8 @@ import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
...@@ -247,6 +250,12 @@ public final class AudioTrack { ...@@ -247,6 +250,12 @@ public final class AudioTrack {
*/ */
private static final long MAX_LATENCY_US = 5 * C.MICROS_PER_SECOND; private static final long MAX_LATENCY_US = 5 * C.MICROS_PER_SECOND;
/**
* Represents states of the {@link #startMediaTimeUs} value.
*/
@Retention(RetentionPolicy.SOURCE)
@IntDef({START_NOT_SET, START_IN_SYNC, START_NEED_SYNC})
private @interface StartMediaTimeState {}
private static final int START_NOT_SET = 0; private static final int START_NOT_SET = 0;
private static final int START_IN_SYNC = 1; private static final int START_IN_SYNC = 1;
private static final int START_NEED_SYNC = 2; private static final int START_NEED_SYNC = 2;
...@@ -299,10 +308,8 @@ public final class AudioTrack { ...@@ -299,10 +308,8 @@ public final class AudioTrack {
private android.media.AudioTrack audioTrack; private android.media.AudioTrack audioTrack;
private int sampleRate; private int sampleRate;
private int channelConfig; private int channelConfig;
@C.Encoding private @C.Encoding int encoding;
private int encoding; private @C.Encoding int outputEncoding;
@C.Encoding
private int outputEncoding;
private AudioAttributes audioAttributes; private AudioAttributes audioAttributes;
private boolean passthrough; private boolean passthrough;
private int bufferSize; private int bufferSize;
...@@ -331,7 +338,7 @@ public final class AudioTrack { ...@@ -331,7 +338,7 @@ public final class AudioTrack {
private long writtenPcmBytes; private long writtenPcmBytes;
private long writtenEncodedFrames; private long writtenEncodedFrames;
private int framesPerEncodedSample; private int framesPerEncodedSample;
private int startMediaTimeState; private @StartMediaTimeState int startMediaTimeState;
private long startMediaTimeUs; private long startMediaTimeUs;
private long resumeSystemTimeUs; private long resumeSystemTimeUs;
private long latencyUs; private long latencyUs;
......
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