Commit 17762eba by andrewlewis Committed by Oliver Woodman

Reformat @IntDef field/return type annotations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=148018580
parent 11c16d83
...@@ -56,8 +56,7 @@ public final class ExoPlaybackException extends Exception { ...@@ -56,8 +56,7 @@ public final class ExoPlaybackException extends Exception {
* The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} and * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} and
* {@link #TYPE_UNEXPECTED}. * {@link #TYPE_UNEXPECTED}.
*/ */
@Type @Type public final int type;
public final int type;
/** /**
* If {@link #type} is {@link #TYPE_RENDERER}, this is the index of the renderer. * If {@link #type} is {@link #TYPE_RENDERER}, this is the index of the renderer.
......
...@@ -83,8 +83,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -83,8 +83,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
private DrmSession<ExoMediaCrypto> drmSession; private DrmSession<ExoMediaCrypto> drmSession;
private DrmSession<ExoMediaCrypto> pendingDrmSession; private DrmSession<ExoMediaCrypto> pendingDrmSession;
@ReinitializationState @ReinitializationState private int decoderReinitializationState;
private int decoderReinitializationState;
private boolean decoderReceivedBuffers; private boolean decoderReceivedBuffers;
private boolean audioTrackNeedsConfigure; private boolean audioTrackNeedsConfigure;
......
...@@ -61,8 +61,7 @@ public class DecoderInputBuffer extends Buffer { ...@@ -61,8 +61,7 @@ public class DecoderInputBuffer extends Buffer {
*/ */
public long timeUs; public long timeUs;
@BufferReplacementMode @BufferReplacementMode private final int bufferReplacementMode;
private final int bufferReplacementMode;
/** /**
* @param bufferReplacementMode Determines the behavior of {@link #ensureSpaceForWrite(int)}. One * @param bufferReplacementMode Determines the behavior of {@link #ensureSpaceForWrite(int)}. One
......
...@@ -70,8 +70,7 @@ public interface DrmSession<T extends ExoMediaCrypto> { ...@@ -70,8 +70,7 @@ public interface DrmSession<T extends ExoMediaCrypto> {
* @return One of {@link #STATE_ERROR}, {@link #STATE_CLOSED}, {@link #STATE_OPENING}, * @return One of {@link #STATE_ERROR}, {@link #STATE_CLOSED}, {@link #STATE_OPENING},
* {@link #STATE_OPENED} and {@link #STATE_OPENED_WITH_KEYS}. * {@link #STATE_OPENED} and {@link #STATE_OPENED_WITH_KEYS}.
*/ */
@State @State int getState();
int getState();
/** /**
* Returns a {@link ExoMediaCrypto} for the open session. * Returns a {@link ExoMediaCrypto} for the open session.
......
...@@ -43,8 +43,7 @@ public final class UnsupportedDrmException extends Exception { ...@@ -43,8 +43,7 @@ public final class UnsupportedDrmException extends Exception {
/** /**
* Either {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}. * Either {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}.
*/ */
@Reason @Reason public final int reason;
public final int reason;
/** /**
* @param reason {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}. * @param reason {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}.
......
...@@ -117,8 +117,7 @@ public final class FragmentedMp4Extractor implements Extractor { ...@@ -117,8 +117,7 @@ public final class FragmentedMp4Extractor implements Extractor {
private static final int STATE_READING_SAMPLE_CONTINUE = 4; private static final int STATE_READING_SAMPLE_CONTINUE = 4;
// Workarounds. // Workarounds.
@Flags @Flags private final int flags;
private final int flags;
private final Track sideloadedTrack; private final Track sideloadedTrack;
// Track-linked data bundle, accessible as a whole through trackID. // Track-linked data bundle, accessible as a whole through trackID.
......
...@@ -83,8 +83,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -83,8 +83,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
private final ParsableByteArray atomHeader; private final ParsableByteArray atomHeader;
private final Stack<ContainerAtom> containerAtoms; private final Stack<ContainerAtom> containerAtoms;
@State @State private int parserState;
private int parserState;
private int atomType; private int atomType;
private long atomSize; private long atomSize;
private int atomHeaderBytesRead; private int atomHeaderBytesRead;
......
...@@ -75,8 +75,7 @@ public final class Track { ...@@ -75,8 +75,7 @@ public final class Track {
* One of {@code TRANSFORMATION_*}. Defines the transformation to apply before outputting each * One of {@code TRANSFORMATION_*}. Defines the transformation to apply before outputting each
* sample. * sample.
*/ */
@Transformation @Transformation public final int sampleTransformation;
public final int sampleTransformation;
/** /**
* Track encryption boxes for the different track sample descriptions. Entries may be null. * Track encryption boxes for the different track sample descriptions. Entries may be null.
......
...@@ -40,8 +40,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact ...@@ -40,8 +40,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
public static final int FLAG_DETECT_ACCESS_UNITS = 8; public static final int FLAG_DETECT_ACCESS_UNITS = 8;
public static final int FLAG_IGNORE_SPLICE_INFO_STREAM = 16; public static final int FLAG_IGNORE_SPLICE_INFO_STREAM = 16;
@Flags @Flags private final int flags;
private final int flags;
public DefaultTsPayloadReaderFactory() { public DefaultTsPayloadReaderFactory() {
this(0); this(0);
......
...@@ -57,8 +57,7 @@ public final class MergingMediaSource implements MediaSource { ...@@ -57,8 +57,7 @@ public final class MergingMediaSource implements MediaSource {
* The reason the merge failed. One of {@link #REASON_WINDOWS_ARE_DYNAMIC} and * The reason the merge failed. One of {@link #REASON_WINDOWS_ARE_DYNAMIC} and
* {@link #REASON_PERIOD_COUNT_MISMATCH}. * {@link #REASON_PERIOD_COUNT_MISMATCH}.
*/ */
@Reason @Reason public final int reason;
public final int reason;
/** /**
* @param reason The reason the merge failed. One of {@link #REASON_WINDOWS_ARE_DYNAMIC} and * @param reason The reason the merge failed. One of {@link #REASON_WINDOWS_ARE_DYNAMIC} and
......
...@@ -78,8 +78,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist { ...@@ -78,8 +78,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
public static final int PLAYLIST_TYPE_VOD = 1; public static final int PLAYLIST_TYPE_VOD = 1;
public static final int PLAYLIST_TYPE_EVENT = 2; public static final int PLAYLIST_TYPE_EVENT = 2;
@PlaylistType @PlaylistType public final int playlistType;
public final int playlistType;
public final long startOffsetUs; public final long startOffsetUs;
public final long startTimeUs; public final long startTimeUs;
public final boolean hasDiscontinuitySequence; public final boolean hasDiscontinuitySequence;
......
...@@ -34,8 +34,7 @@ public abstract class HlsPlaylist { ...@@ -34,8 +34,7 @@ public abstract class HlsPlaylist {
public static final int TYPE_MEDIA = 1; public static final int TYPE_MEDIA = 1;
public final String baseUri; public final String baseUri;
@Type @Type public final int type;
public final int type;
protected HlsPlaylist(String baseUri, @Type int type) { protected HlsPlaylist(String baseUri, @Type int type) {
this.baseUri = baseUri; this.baseUri = baseUri;
......
...@@ -94,8 +94,7 @@ public final class CaptionStyleCompat { ...@@ -94,8 +94,7 @@ public final class CaptionStyleCompat {
* <li>{@link #EDGE_TYPE_DEPRESSED} * <li>{@link #EDGE_TYPE_DEPRESSED}
* </ul> * </ul>
*/ */
@EdgeType @EdgeType public final int edgeType;
public final int edgeType;
/** /**
* The preferred edge color, if using an edge type other than {@link #EDGE_TYPE_NONE}. * The preferred edge color, if using an edge type other than {@link #EDGE_TYPE_NONE}.
......
...@@ -56,16 +56,11 @@ import java.lang.annotation.RetentionPolicy; ...@@ -56,16 +56,11 @@ import java.lang.annotation.RetentionPolicy;
private boolean hasFontColor; private boolean hasFontColor;
private int backgroundColor; private int backgroundColor;
private boolean hasBackgroundColor; private boolean hasBackgroundColor;
@OptionalBoolean @OptionalBoolean private int linethrough;
private int linethrough; @OptionalBoolean private int underline;
@OptionalBoolean @OptionalBoolean private int bold;
private int underline; @OptionalBoolean private int italic;
@OptionalBoolean @FontSizeUnit private int fontSizeUnit;
private int bold;
@OptionalBoolean
private int italic;
@FontSizeUnit
private int fontSizeUnit;
private float fontSize; private float fontSize;
private String id; private String id;
private TtmlStyle inheritableStyle; private TtmlStyle inheritableStyle;
...@@ -85,8 +80,7 @@ import java.lang.annotation.RetentionPolicy; ...@@ -85,8 +80,7 @@ import java.lang.annotation.RetentionPolicy;
* @return {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link #STYLE_BOLD}, {@link #STYLE_BOLD} * @return {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link #STYLE_BOLD}, {@link #STYLE_BOLD}
* or {@link #STYLE_BOLD_ITALIC}. * or {@link #STYLE_BOLD_ITALIC}.
*/ */
@StyleFlags @StyleFlags public int getStyle() {
public int getStyle() {
if (bold == UNSPECIFIED && italic == UNSPECIFIED) { if (bold == UNSPECIFIED && italic == UNSPECIFIED) {
return UNSPECIFIED; return UNSPECIFIED;
} }
...@@ -255,8 +249,7 @@ import java.lang.annotation.RetentionPolicy; ...@@ -255,8 +249,7 @@ import java.lang.annotation.RetentionPolicy;
return this; return this;
} }
@FontSizeUnit @FontSizeUnit public int getFontSizeUnit() {
public int getFontSizeUnit() {
return fontSizeUnit; return fontSizeUnit;
} }
......
...@@ -69,16 +69,11 @@ import java.util.List; ...@@ -69,16 +69,11 @@ import java.util.List;
private boolean hasFontColor; private boolean hasFontColor;
private int backgroundColor; private int backgroundColor;
private boolean hasBackgroundColor; private boolean hasBackgroundColor;
@OptionalBoolean @OptionalBoolean private int linethrough;
private int linethrough; @OptionalBoolean private int underline;
@OptionalBoolean @OptionalBoolean private int bold;
private int underline; @OptionalBoolean private int italic;
@OptionalBoolean @FontSizeUnit private int fontSizeUnit;
private int bold;
@OptionalBoolean
private int italic;
@FontSizeUnit
private int fontSizeUnit;
private float fontSize; private float fontSize;
private Layout.Alignment textAlign; private Layout.Alignment textAlign;
...@@ -162,8 +157,7 @@ import java.util.List; ...@@ -162,8 +157,7 @@ import java.util.List;
* @return {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link #STYLE_BOLD}, {@link #STYLE_BOLD} * @return {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link #STYLE_BOLD}, {@link #STYLE_BOLD}
* or {@link #STYLE_BOLD_ITALIC}. * or {@link #STYLE_BOLD_ITALIC}.
*/ */
@StyleFlags @StyleFlags public int getStyle() {
public int getStyle() {
if (bold == UNSPECIFIED && italic == UNSPECIFIED) { if (bold == UNSPECIFIED && italic == UNSPECIFIED) {
return UNSPECIFIED; return UNSPECIFIED;
} }
...@@ -260,8 +254,7 @@ import java.util.List; ...@@ -260,8 +254,7 @@ import java.util.List;
return this; return this;
} }
@FontSizeUnit @FontSizeUnit public int getFontSizeUnit() {
public int getFontSizeUnit() {
return fontSizeUnit; return fontSizeUnit;
} }
......
...@@ -82,8 +82,7 @@ public final class DataSpec { ...@@ -82,8 +82,7 @@ public final class DataSpec {
* Request flags. Currently {@link #FLAG_ALLOW_GZIP} and * Request flags. Currently {@link #FLAG_ALLOW_GZIP} and
* {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH} are the only supported flags. * {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH} are the only supported flags.
*/ */
@Flags @Flags public final int flags;
public final int flags;
/** /**
* Construct a {@link DataSpec} for the given uri and with {@link #key} set to null. * Construct a {@link DataSpec} for the given uri and with {@link #key} set to null.
......
...@@ -149,8 +149,7 @@ public interface HttpDataSource extends DataSource { ...@@ -149,8 +149,7 @@ public interface HttpDataSource extends DataSource {
public static final int TYPE_READ = 2; public static final int TYPE_READ = 2;
public static final int TYPE_CLOSE = 3; public static final int TYPE_CLOSE = 3;
@Type @Type public final int type;
public final int type;
/** /**
* The {@link DataSpec} associated with the current connection. * The {@link DataSpec} associated with the current connection.
......
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