Skip to content

SDK / exoplayer

Go to a project
Commit 1f7174e7 by olly Committed by Ian Baker
Options

Revert of 87420e5f 

PiperOrigin-RevId: 426996878
parent 631b107b
Expand all
Inline Side-by-side
Showing with 344 additions and 246 deletions
libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java
......@@ -150,7 +150,7 @@ public final class CastPlayer extends BasePlayer {
private TrackSelectionArray currentTrackSelection;
private TracksInfo currentTracksInfo;
private Commands availableCommands;
private @Player.State int playbackState;
@Player.State private int playbackState;
private int currentWindowIndex;
private long lastReportedPositionMs;
private int pendingSeekCount;
......@@ -387,12 +387,14 @@ public final class CastPlayer extends BasePlayer {
}
@Override
public @Player.State int getPlaybackState() {
@Player.State
public int getPlaybackState() {
return playbackState;
}
@Override
public @PlaybackSuppressionReason int getPlaybackSuppressionReason() {
@PlaybackSuppressionReason
public int getPlaybackSuppressionReason() {
return Player.PLAYBACK_SUPPRESSION_REASON_NONE;
}
......@@ -572,7 +574,8 @@ public final class CastPlayer extends BasePlayer {
}
@Override
public @RepeatMode int getRepeatMode() {
@RepeatMode
public int getRepeatMode() {
return repeatMode.value;
}
......@@ -1289,7 +1292,8 @@ public final class CastPlayer extends BasePlayer {
* Retrieves the repeat mode from {@code remoteMediaClient} and maps it into a {@link
* Player.RepeatMode}.
*/
private static @RepeatMode int fetchRepeatMode(RemoteMediaClient remoteMediaClient) {
@RepeatMode
private static int fetchRepeatMode(RemoteMediaClient remoteMediaClient) {
MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
if (mediaStatus == null) {
// No media session active, yet.
......
libraries/common/src/main/java/androidx/media3/common/AdPlaybackState.java
......@@ -67,7 +67,7 @@ public final class AdPlaybackState implements Bundleable {
/** The URI of each ad in the ad group. */
public final @NullableType Uri[] uris;
/** The state of each ad in the ad group. */
public final @AdState int[] states;
@AdState public final int[] states;
/** The durations of each ad in the ad group, in microseconds. */
public final long[] durationsUs;
/**
......
libraries/common/src/main/java/androidx/media3/common/BasePlayer.java
......@@ -384,7 +384,8 @@ public abstract class BasePlayer implements Player {
: timeline.getWindow(getCurrentMediaItemIndex(), window).getDurationMs();
}
private @RepeatMode int getRepeatModeForNavigation() {
@RepeatMode
private int getRepeatModeForNavigation() {
@RepeatMode int repeatMode = getRepeatMode();
return repeatMode == REPEAT_MODE_ONE ? REPEAT_MODE_OFF : repeatMode;
}
......
libraries/common/src/main/java/androidx/media3/common/C.java
......@@ -1250,8 +1250,8 @@ public final class C {
replacement = "Util.getErrorCodeForMediaDrmErrorCode(mediaDrmErrorCode)",
imports = {"androidx.media3.common.util.Util"})
@Deprecated
public static @PlaybackException.ErrorCode int getErrorCodeForMediaDrmErrorCode(
int mediaDrmErrorCode) {
@PlaybackException.ErrorCode
public static int getErrorCodeForMediaDrmErrorCode(int mediaDrmErrorCode) {
return Util.getErrorCodeForMediaDrmErrorCode(mediaDrmErrorCode);
}
}
libraries/common/src/main/java/androidx/media3/common/ColorInfo.java
......@@ -38,7 +38,8 @@ public final class ColorInfo implements Bundleable {
* made.
*/
@Pure
public static @C.ColorSpace int isoColorPrimariesToColorSpace(int isoColorPrimaries) {
@C.ColorSpace
public static int isoColorPrimariesToColorSpace(int isoColorPrimaries) {
switch (isoColorPrimaries) {
case 1:
return C.COLOR_SPACE_BT709;
......@@ -60,8 +61,8 @@ public final class ColorInfo implements Bundleable {
* mapping can be made.
*/
@Pure
public static @C.ColorTransfer int isoTransferCharacteristicsToColorTransfer(
int isoTransferCharacteristics) {
@C.ColorTransfer
public static int isoTransferCharacteristicsToColorTransfer(int isoTransferCharacteristics) {
switch (isoTransferCharacteristics) {
case 1: // BT.709.
case 6: // SMPTE 170M.
......@@ -80,20 +81,20 @@ public final class ColorInfo implements Bundleable {
* The color space of the video. Valid values are {@link C#COLOR_SPACE_BT601}, {@link
* C#COLOR_SPACE_BT709}, {@link C#COLOR_SPACE_BT2020} or {@link Format#NO_VALUE} if unknown.
*/
public final @C.ColorSpace int colorSpace;
@C.ColorSpace public final int colorSpace;
/**
* The color range of the video. Valid values are {@link C#COLOR_RANGE_LIMITED}, {@link
* C#COLOR_RANGE_FULL} or {@link Format#NO_VALUE} if unknown.
*/
public final @C.ColorRange int colorRange;
@C.ColorRange public final int colorRange;
/**
* The color transfer characteristics of the video. Valid values are {@link C#COLOR_TRANSFER_HLG},
* {@link C#COLOR_TRANSFER_ST2084}, {@link C#COLOR_TRANSFER_SDR} or {@link Format#NO_VALUE} if
* unknown.
*/
public final @C.ColorTransfer int colorTransfer;
@C.ColorTransfer public final int colorTransfer;
/** HdrStaticInfo as defined in CTA-861.3, or null if none specified. */
@Nullable public final byte[] hdrStaticInfo;
......
libraries/common/src/main/java/androidx/media3/common/DrmInitData.java
......@@ -52,8 +52,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
* @param mediaData DRM session acquisition data obtained from the media.
* @return A {@link DrmInitData} obtained from merging a media manifest and a media stream.
*/
@Nullable
public static DrmInitData createSessionCreationData(
public static @Nullable DrmInitData createSessionCreationData(
@Nullable DrmInitData manifestData, @Nullable DrmInitData mediaData) {
ArrayList<SchemeData> result = new ArrayList<>();
String schemeType = null;
......
libraries/common/src/main/java/androidx/media3/common/FileTypes.java
......@@ -114,8 +114,8 @@ public final class FileTypes {
private FileTypes() {}
/** Returns the {@link Type} corresponding to the response headers provided. */
public static @FileTypes.Type int inferFileTypeFromResponseHeaders(
Map<String, List<String>> responseHeaders) {
@FileTypes.Type
public static int inferFileTypeFromResponseHeaders(Map<String, List<String>> responseHeaders) {
@Nullable List<String> contentTypes = responseHeaders.get(HEADER_CONTENT_TYPE);
@Nullable
String mimeType = contentTypes == null || contentTypes.isEmpty() ? null : contentTypes.get(0);
......@@ -127,7 +127,8 @@ public final class FileTypes {
*
* <p>Returns {@link #UNKNOWN} if the mime type is {@code null}.
*/
public static @FileTypes.Type int inferFileTypeFromMimeType(@Nullable String mimeType) {
@FileTypes.Type
public static int inferFileTypeFromMimeType(@Nullable String mimeType) {
if (mimeType == null) {
return FileTypes.UNKNOWN;
}
......@@ -177,7 +178,8 @@ public final class FileTypes {
}
/** Returns the {@link Type} corresponding to the {@link Uri} provided. */
public static @FileTypes.Type int inferFileTypeFromUri(Uri uri) {
@FileTypes.Type
public static int inferFileTypeFromUri(Uri uri) {
@Nullable String filename = uri.getLastPathSegment();
if (filename == null) {
return FileTypes.UNKNOWN;
......
libraries/common/src/main/java/androidx/media3/common/Format.java
......@@ -156,14 +156,14 @@ public final class Format implements Bundleable {
private int rotationDegrees;
private float pixelWidthHeightRatio;
@Nullable private byte[] projectionData;
private @C.StereoMode int stereoMode;
@C.StereoMode private int stereoMode;
@Nullable private ColorInfo colorInfo;
// Audio specific.
private int channelCount;
private int sampleRate;
private @C.PcmEncoding int pcmEncoding;
@C.PcmEncoding private int pcmEncoding;
private int encoderDelay;
private int encoderPadding;
......@@ -173,7 +173,7 @@ public final class Format implements Bundleable {
// Provided by the source.
private @C.CryptoType int cryptoType;
@C.CryptoType private int cryptoType;
/** Creates a new instance with default values. */
public Builder() {
......@@ -727,7 +727,7 @@ public final class Format implements Bundleable {
* modes are {@link C#STEREO_MODE_MONO}, {@link C#STEREO_MODE_TOP_BOTTOM}, {@link
* C#STEREO_MODE_LEFT_RIGHT}, {@link C#STEREO_MODE_STEREO_MESH}.
*/
@UnstableApi public final @C.StereoMode int stereoMode;
@UnstableApi @C.StereoMode public final int stereoMode;
/** The color metadata associated with the video, or null if not applicable. */
@UnstableApi @Nullable public final ColorInfo colorInfo;
......@@ -738,7 +738,7 @@ public final class Format implements Bundleable {
/** The audio sampling rate in Hz, or {@link #NO_VALUE} if unknown or not applicable. */
public final int sampleRate;
/** The {@link C.PcmEncoding} for PCM audio. Set to {@link #NO_VALUE} for other media types. */
@UnstableApi public final @C.PcmEncoding int pcmEncoding;
@UnstableApi @C.PcmEncoding public final int pcmEncoding;
/**
* The number of frames to trim from the start of the decoded audio stream, or 0 if not
* applicable.
......@@ -762,7 +762,7 @@ public final class Format implements Bundleable {
* {@link #drmInitData} is non-null, but may be {@link C#CRYPTO_TYPE_UNSUPPORTED} to indicate that
* the samples are encrypted using an unsupported crypto type.
*/
@UnstableApi public final @C.CryptoType int cryptoType;
@UnstableApi @C.CryptoType public final int cryptoType;
// Lazily initialized hashcode.
private int hashCode;
......
libraries/common/src/main/java/androidx/media3/common/HeartRating.java
......@@ -79,7 +79,7 @@ public final class HeartRating extends Rating {
// Bundleable implementation.
private static final @RatingType int TYPE = RATING_TYPE_HEART;
@RatingType private static final int TYPE = RATING_TYPE_HEART;
@Documented
@Retention(RetentionPolicy.SOURCE)
......
libraries/common/src/main/java/androidx/media3/common/MediaMetadata.java
......@@ -56,11 +56,11 @@ public final class MediaMetadata implements Bundleable {
@Nullable private Rating userRating;
@Nullable private Rating overallRating;
@Nullable private byte[] artworkData;
@Nullable private @PictureType Integer artworkDataType;
@Nullable @PictureType private Integer artworkDataType;
@Nullable private Uri artworkUri;
@Nullable private Integer trackNumber;
@Nullable private Integer totalTrackCount;
@Nullable private @FolderType Integer folderType;
@Nullable @FolderType private Integer folderType;
@Nullable private Boolean isPlayable;
@Nullable private Integer recordingYear;
@Nullable private Integer recordingMonth;
......
libraries/common/src/main/java/androidx/media3/common/MimeTypes.java
......@@ -552,7 +552,8 @@ public final class MimeTypes {
* @return The corresponding {@link C.Encoding}, or {@link C#ENCODING_INVALID}.
*/
@UnstableApi
public static @C.Encoding int getEncoding(String mimeType, @Nullable String codec) {
@C.Encoding
public static int getEncoding(String mimeType, @Nullable String codec) {
switch (mimeType) {
case MimeTypes.AUDIO_MPEG:
return C.ENCODING_MP3;
......@@ -727,7 +728,8 @@ public final class MimeTypes {
}
/** Returns the encoding for {@link #audioObjectTypeIndication}. */
public @C.Encoding int getEncoding() {
@C.Encoding
public int getEncoding() {
// See AUDIO_OBJECT_TYPE_AAC_* constants in AacUtil.
switch (audioObjectTypeIndication) {
case 2:
......
libraries/common/src/main/java/androidx/media3/common/PercentageRating.java
......@@ -77,7 +77,7 @@ public final class PercentageRating extends Rating {
// Bundleable implementation.
private static final @RatingType int TYPE = RATING_TYPE_PERCENTAGE;
@RatingType private static final int TYPE = RATING_TYPE_PERCENTAGE;
@Documented
@Retention(RetentionPolicy.SOURCE)
......
libraries/common/src/main/java/androidx/media3/common/Player.java
......@@ -686,7 +686,8 @@ public interface Player {
@UnstableApi
public static final class Builder {
private static final @Command int[] SUPPORTED_COMMANDS = {
@Command
private static final int[] SUPPORTED_COMMANDS = {
COMMAND_PLAY_PAUSE,
COMMAND_PREPARE,
COMMAND_STOP,
......
libraries/common/src/main/java/androidx/media3/common/StarRating.java
......@@ -103,7 +103,7 @@ public final class StarRating extends Rating {
// Bundleable implementation.
private static final @RatingType int TYPE = RATING_TYPE_STAR;
@RatingType private static final int TYPE = RATING_TYPE_STAR;
private static final int MAX_STARS_DEFAULT = 5;
@Documented
......
libraries/common/src/main/java/androidx/media3/common/ThumbRating.java
......@@ -76,7 +76,7 @@ public final class ThumbRating extends Rating {
// Bundleable implementation.
private static final @RatingType int TYPE = RATING_TYPE_THUMB;
@RatingType private static final int TYPE = RATING_TYPE_THUMB;
@Documented
@Retention(RetentionPolicy.SOURCE)
......
libraries/common/src/main/java/androidx/media3/common/TrackGroup.java
......@@ -207,7 +207,8 @@ public final class TrackGroup implements Bundleable {
return language == null || language.equals(C.LANGUAGE_UNDETERMINED) ? "" : language;
}
private static @C.RoleFlags int normalizeRoleFlags(@C.RoleFlags int roleFlags) {
@C.RoleFlags
private static int normalizeRoleFlags(@C.RoleFlags int roleFlags) {
// Treat trick-play and non-trick-play formats as compatible.
return roleFlags | C.ROLE_FLAG_TRICK_PLAY;
}
......
libraries/common/src/main/java/androidx/media3/common/TracksInfo.java
......@@ -45,7 +45,7 @@ public final class TracksInfo implements Bundleable {
*/
public static final class TrackGroupInfo implements Bundleable {
private final TrackGroup trackGroup;
private final @C.FormatSupport int[] trackSupport;
@C.FormatSupport private final int[] trackSupport;
private final @C.TrackType int trackType;
private final boolean[] trackSelected;
......@@ -83,7 +83,8 @@ public final class TracksInfo implements Bundleable {
* @return The {@link C.FormatSupport} of the track.
*/
@UnstableApi
public @C.FormatSupport int getTrackSupport(int trackIndex) {
@C.FormatSupport
public int getTrackSupport(int trackIndex) {
return trackSupport[trackIndex];
}
......@@ -228,7 +229,8 @@ public final class TracksInfo implements Bundleable {
fromNullableBundle(
TrackGroup.CREATOR, bundle.getBundle(keyForField(FIELD_TRACK_GROUP)));
checkNotNull(trackGroup); // Can't create a trackGroup info without a trackGroup
final @C.FormatSupport int[] trackSupport =
@C.FormatSupport
final int[] trackSupport =
MoreObjects.firstNonNull(
bundle.getIntArray(keyForField(FIELD_TRACK_SUPPORT)), new int[trackGroup.length]);
@C.TrackType
......
libraries/common/src/main/java/androidx/media3/common/text/Cue.java
......@@ -569,7 +569,7 @@ public final class Cue implements Bundleable {
@Nullable private Alignment textAlignment;
@Nullable private Alignment multiRowAlignment;
private float line;
private @LineType int lineType;
@LineType private int lineType;
private @AnchorType int lineAnchor;
private float position;
private @AnchorType int positionAnchor;
......@@ -730,7 +730,8 @@ public final class Cue implements Bundleable {
* @see Cue#lineType
*/
@Pure
public @LineType int getLineType() {
@LineType
public int getLineType() {
return lineType;
}
......@@ -750,7 +751,8 @@ public final class Cue implements Bundleable {
* @see Cue#lineAnchor
*/
@Pure
public @AnchorType int getLineAnchor() {
@AnchorType
public int getLineAnchor() {
return lineAnchor;
}
......@@ -792,7 +794,8 @@ public final class Cue implements Bundleable {
* @see Cue#positionAnchor
*/
@Pure
public @AnchorType int getPositionAnchor() {
@AnchorType
public int getPositionAnchor() {
return positionAnchor;
}
......@@ -814,7 +817,8 @@ public final class Cue implements Bundleable {
* @see Cue#textSizeType
*/
@Pure
public @TextSizeType int getTextSizeType() {
@TextSizeType
public int getTextSizeType() {
return textSizeType;
}
......@@ -932,7 +936,8 @@ public final class Cue implements Bundleable {
* @see Cue#verticalType
*/
@Pure
public @VerticalType int getVerticalType() {
@VerticalType
public int getVerticalType() {
return verticalType;
}
......
libraries/common/src/main/java/androidx/media3/common/text/RubySpan.java
......@@ -39,7 +39,7 @@ public final class RubySpan implements LanguageFeatureSpan {
public final String rubyText;
/** The position of the ruby text relative to the base text. */
public final @TextAnnotation.Position int position;
@TextAnnotation.Position public final int position;
public RubySpan(String rubyText, @TextAnnotation.Position int position) {
this.rubyText = rubyText;
......
libraries/common/src/main/java/androidx/media3/common/text/TextEmphasisSpan.java
......@@ -83,13 +83,13 @@ public final class TextEmphasisSpan implements LanguageFeatureSpan {
public static final int MARK_FILL_OPEN = 2;
/** The mark shape used for text emphasis. */
public @MarkShape int markShape;
@MarkShape public int markShape;
/** The mark fill for the text emphasis mark. */
public @MarkShape int markFill;
@MarkShape public int markFill;
/** The position of the text emphasis relative to the base text. */
public final @TextAnnotation.Position int position;
@TextAnnotation.Position public final int position;
public TextEmphasisSpan(
@MarkShape int shape, @MarkFill int fill, @TextAnnotation.Position int position) {
......
libraries/common/src/main/java/androidx/media3/common/util/NetworkTypeObserver.java
......@@ -85,7 +85,8 @@ public final class NetworkTypeObserver {
private final Object networkTypeLock;
@GuardedBy("networkTypeLock")
private @C.NetworkType int networkType;
@C.NetworkType
private int networkType;
/**
* Returns a network type observer instance.
......@@ -131,7 +132,8 @@ public final class NetworkTypeObserver {
}
/** Returns the current network type. */
public @C.NetworkType int getNetworkType() {
@C.NetworkType
public int getNetworkType() {
synchronized (networkTypeLock) {
return networkType;
}
......@@ -162,7 +164,8 @@ public final class NetworkTypeObserver {
}
}
private static @C.NetworkType int getNetworkTypeFromConnectivityManager(Context context) {
@C.NetworkType
private static int getNetworkTypeFromConnectivityManager(Context context) {
NetworkInfo networkInfo;
@Nullable
ConnectivityManager connectivityManager =
......@@ -195,7 +198,8 @@ public final class NetworkTypeObserver {
}
}
private static @C.NetworkType int getMobileNetworkType(NetworkInfo networkInfo) {
@C.NetworkType
private static int getMobileNetworkType(NetworkInfo networkInfo) {
switch (networkInfo.getSubtype()) {
case TelephonyManager.NETWORK_TYPE_EDGE:
case TelephonyManager.NETWORK_TYPE_GPRS:
......
libraries/common/src/main/java/androidx/media3/common/util/Util.java
......@@ -1560,7 +1560,8 @@ public final class Util {
* C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT} and {@link C#ENCODING_PCM_32BIT}. If
* the bit depth is unsupported then {@link C#ENCODING_INVALID} is returned.
*/
public static @C.PcmEncoding int getPcmEncoding(int bitDepth) {
@C.PcmEncoding
public static int getPcmEncoding(int bitDepth) {
switch (bitDepth) {
case 8:
return C.ENCODING_PCM_8BIT;
......@@ -1670,7 +1671,8 @@ public final class Util {
}
/** Returns the {@link C.AudioUsage} corresponding to the specified {@link C.StreamType}. */
public static @C.AudioUsage int getAudioUsageForStreamType(@C.StreamType int streamType) {
@C.AudioUsage
public static int getAudioUsageForStreamType(@C.StreamType int streamType) {
switch (streamType) {
case C.STREAM_TYPE_ALARM:
return C.USAGE_ALARM;
......@@ -1691,8 +1693,8 @@ public final class Util {
}
/** Returns the {@link C.AudioContentType} corresponding to the specified {@link C.StreamType}. */
public static @C.AudioContentType int getAudioContentTypeForStreamType(
@C.StreamType int streamType) {
@C.AudioContentType
public static int getAudioContentTypeForStreamType(@C.StreamType int streamType) {
switch (streamType) {
case C.STREAM_TYPE_ALARM:
case C.STREAM_TYPE_DTMF:
......@@ -1709,7 +1711,8 @@ public final class Util {
}
/** Returns the {@link C.StreamType} corresponding to the specified {@link C.AudioUsage}. */
public static @C.StreamType int getStreamTypeForAudioUsage(@C.AudioUsage int usage) {
@C.StreamType
public static int getStreamTypeForAudioUsage(@C.AudioUsage int usage) {
switch (usage) {
case C.USAGE_MEDIA:
case C.USAGE_GAME:
......@@ -1759,8 +1762,7 @@ public final class Util {
* "clearkey"}.
* @return The derived {@link UUID}, or {@code null} if one could not be derived.
*/
@Nullable
public static UUID getDrmUuid(String drmScheme) {
public static @Nullable UUID getDrmUuid(String drmScheme) {
switch (Ascii.toLowerCase(drmScheme)) {
case "widevine":
return C.WIDEVINE_UUID;
......@@ -1782,8 +1784,8 @@ public final class Util {
* MediaDrm.ErrorCodes} value. Returns {@link PlaybackException#ERROR_CODE_DRM_SYSTEM_ERROR} if
* the provided error code isn't recognised.
*/
public static @PlaybackException.ErrorCode int getErrorCodeForMediaDrmErrorCode(
int mediaDrmErrorCode) {
@PlaybackException.ErrorCode
public static int getErrorCodeForMediaDrmErrorCode(int mediaDrmErrorCode) {
switch (mediaDrmErrorCode) {
case MediaDrm.ErrorCodes.ERROR_PROVISIONING_CONFIG:
case MediaDrm.ErrorCodes.ERROR_PROVISIONING_PARSE:
......@@ -1819,7 +1821,8 @@ public final class Util {
* @param overrideExtension If not null, used to infer the type.
* @return The content type.
*/
public static @ContentType int inferContentType(Uri uri, @Nullable String overrideExtension) {
@ContentType
public static int inferContentType(Uri uri, @Nullable String overrideExtension) {
return TextUtils.isEmpty(overrideExtension)
? inferContentType(uri)
: inferContentType("." + overrideExtension);
......@@ -1831,7 +1834,8 @@ public final class Util {
* @param uri The {@link Uri}.
* @return The content type.
*/
public static @ContentType int inferContentType(Uri uri) {
@ContentType
public static int inferContentType(Uri uri) {
@Nullable String scheme = uri.getScheme();
if (scheme != null && Ascii.equalsIgnoreCase("rtsp", scheme)) {
return C.TYPE_RTSP;
......@@ -1847,7 +1851,8 @@ public final class Util {
* @param fileName Name of the file. It can include the path of the file.
* @return The content type.
*/
public static @ContentType int inferContentType(String fileName) {
@ContentType
public static int inferContentType(String fileName) {
fileName = Ascii.toLowerCase(fileName);
if (fileName.endsWith(".mpd")) {
return C.TYPE_DASH;
......@@ -1876,8 +1881,8 @@ public final class Util {
* @param mimeType If MIME type, or {@code null}.
* @return The content type.
*/
public static @ContentType int inferContentTypeForUriAndMimeType(
Uri uri, @Nullable String mimeType) {
@ContentType
public static int inferContentTypeForUriAndMimeType(Uri uri, @Nullable String mimeType) {
if (mimeType == null) {
return Util.inferContentType(uri);
}
......@@ -2027,8 +2032,7 @@ public final class Util {
* @return The original value of the file name before it was escaped, or null if the escaped
* fileName seems invalid.
*/
@Nullable
public static String unescapeFileName(String fileName) {
public static @Nullable String unescapeFileName(String fileName) {
int length = fileName.length();
int percentCharacterCount = 0;
for (int i = 0; i < length; i++) {
......
libraries/common/src/main/java/androidx/media3/common/util/XmlPullParserUtil.java
......@@ -93,8 +93,7 @@ public final class XmlPullParserUtil {
* @return The value of the attribute, or null if the current event is not a start tag or if no
* such attribute was found.
*/
@Nullable
public static String getAttributeValue(XmlPullParser xpp, String attributeName) {
public static @Nullable String getAttributeValue(XmlPullParser xpp, String attributeName) {
int attributeCount = xpp.getAttributeCount();
for (int i = 0; i < attributeCount; i++) {
if (xpp.getAttributeName(i).equals(attributeName)) {
......@@ -113,8 +112,8 @@ public final class XmlPullParserUtil {
* @return The value of the attribute, or null if the current event is not a start tag or if no
* such attribute was found.
*/
@Nullable
public static String getAttributeValueIgnorePrefix(XmlPullParser xpp, String attributeName) {
public static @Nullable String getAttributeValueIgnorePrefix(
XmlPullParser xpp, String attributeName) {
int attributeCount = xpp.getAttributeCount();
for (int i = 0; i < attributeCount; i++) {
if (stripPrefix(xpp.getAttributeName(i)).equals(attributeName)) {
......
libraries/datasource/src/main/java/androidx/media3/datasource/DataSourceException.java
......@@ -57,7 +57,7 @@ public class DataSourceException extends IOException {
* The reason of this {@link DataSourceException}, should be one of the {@code ERROR_CODE_IO_*} in
* {@link PlaybackException.ErrorCode}.
*/
public final @PlaybackException.ErrorCode int reason;
@PlaybackException.ErrorCode public final int reason;
/**
* Constructs a DataSourceException.
......
libraries/datasource/src/main/java/androidx/media3/datasource/DataSpec.java
......@@ -49,13 +49,13 @@ public final class DataSpec {
@Nullable private Uri uri;
private long uriPositionOffset;
private @HttpMethod int httpMethod;
@HttpMethod private int httpMethod;
@Nullable private byte[] httpBody;
private Map<String, String> httpRequestHeaders;
private long position;
private long length;
@Nullable private String key;
private @Flags int flags;
@Flags private int flags;
@Nullable private Object customData;
/** Creates a new instance with default values. */
......@@ -330,7 +330,7 @@ public final class DataSpec {
* The HTTP method to use when requesting the data. This value will be ignored by non-HTTP {@link
* DataSource} implementations.
*/
public final @HttpMethod int httpMethod;
@HttpMethod public final int httpMethod;
/**
* The HTTP request body, null otherwise. If the body is non-null, then {@code httpBody.length}
......@@ -382,7 +382,7 @@ public final class DataSpec {
@Nullable public final String key;
/** Request {@link Flags flags}. */
public final @Flags int flags;
@Flags public final int flags;
/**
* Application specific data.
......
libraries/datasource/src/main/java/androidx/media3/datasource/HttpDataSource.java
......@@ -233,7 +233,7 @@ public interface HttpDataSource extends DataSource {
/** The {@link DataSpec} associated with the current connection. */
public final DataSpec dataSpec;
public final @Type int type;
@Type public final int type;
/**
* @deprecated Use {@link #HttpDataSourceException(DataSpec, int, int)
......@@ -349,8 +349,8 @@ public interface HttpDataSource extends DataSource {
this.type = type;
}
private static @PlaybackException.ErrorCode int assignErrorCode(
@PlaybackException.ErrorCode int errorCode, @Type int type) {
@PlaybackException.ErrorCode
private static int assignErrorCode(@PlaybackException.ErrorCode int errorCode, @Type int type) {
return errorCode == PlaybackException.ERROR_CODE_IO_UNSPECIFIED && type == TYPE_OPEN
? PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED
: errorCode;
......
libraries/datasource/src/main/java/androidx/media3/datasource/cache/CacheDataSource.java
......@@ -72,7 +72,7 @@ public final class CacheDataSource implements DataSource {
@Nullable private DataSource.Factory upstreamDataSourceFactory;
@Nullable private PriorityTaskManager upstreamPriorityTaskManager;
private int upstreamPriority;
private @CacheDataSource.Flags int flags;
@CacheDataSource.Flags private int flags;
@Nullable private CacheDataSource.EventListener eventListener;
public Factory() {
......
libraries/decoder/src/main/java/androidx/media3/decoder/Buffer.java
......@@ -22,7 +22,7 @@ import androidx.media3.common.util.UnstableApi;
@UnstableApi
public abstract class Buffer {
private @C.BufferFlags int flags;
@C.BufferFlags private int flags;
/** Clears the buffer. */
public void clear() {
......
libraries/decoder/src/main/java/androidx/media3/decoder/CryptoInfo.java
......@@ -48,7 +48,7 @@ public final class CryptoInfo {
*
* @see android.media.MediaCodec.CryptoInfo#mode
*/
public @C.CryptoMode int mode;
@C.CryptoMode public int mode;
/**
* The number of leading unencrypted bytes in each sub-sample. If null, all bytes are treated as
* encrypted and {@link #numBytesOfEncryptedData} must be specified.
......
libraries/decoder/src/main/java/androidx/media3/decoder/DecoderInputBuffer.java
......@@ -111,7 +111,7 @@ public class DecoderInputBuffer extends Buffer {
*/
@Nullable public ByteBuffer supplementalData;
private final @BufferReplacementMode int bufferReplacementMode;
@BufferReplacementMode private final int bufferReplacementMode;
private final int paddingSize;
/** Returns a new instance that's not able to hold any data. */
......
libraries/decoder/src/main/java/androidx/media3/decoder/VideoDecoderOutputBuffer.java
......@@ -34,7 +34,7 @@ public class VideoDecoderOutputBuffer extends DecoderOutputBuffer {
public int decoderPrivate;
/** Output mode. */
public @C.VideoOutputMode int mode;
@C.VideoOutputMode public int mode;
/** RGB buffer for RGB mode. */
@Nullable public ByteBuffer data;
......
libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Gav1Decoder.java
......@@ -41,7 +41,7 @@ public final class Gav1Decoder
private final long gav1DecoderContext;
private volatile @C.VideoOutputMode int outputMode;
@C.VideoOutputMode private volatile int outputMode;
/**
* Creates a Gav1Decoder.
......
libraries/decoder_av1/src/main/java/androidx/media3/decoder/av1/Libgav1VideoRenderer.java
......@@ -128,7 +128,8 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer {
}
@Override
public final @Capabilities int supportsFormat(Format format) {
@Capabilities
public final int supportsFormat(Format format) {
if (!MimeTypes.VIDEO_AV1.equalsIgnoreCase(format.sampleMimeType)
|| !Gav1Library.isAvailable()) {
return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
......
libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioDecoder.java
......@@ -41,7 +41,7 @@ import java.util.List;
private final String codecName;
@Nullable private final byte[] extraData;
private final @C.PcmEncoding int encoding;
@C.PcmEncoding private final int encoding;
private final int outputBufferSize;
private long nativeContext; // May be reassigned on resetting the codec.
......@@ -158,7 +158,8 @@ import java.util.List;
}
/** Returns the encoding of output audio. */
public @C.PcmEncoding int getEncoding() {
@C.PcmEncoding
public int getEncoding() {
return encoding;
}
......
libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java
......@@ -90,7 +90,8 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer<FfmpegAudioD
}
@Override
protected @C.FormatSupport int supportsFormatInternal(Format format) {
@C.FormatSupport
protected int supportsFormatInternal(Format format) {
String mimeType = Assertions.checkNotNull(format.sampleMimeType);
if (!FfmpegLibrary.isAvailable() || !MimeTypes.isAudio(mimeType)) {
return C.FORMAT_UNSUPPORTED_TYPE;
......@@ -106,7 +107,8 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer<FfmpegAudioD
}
@Override
public final @AdaptiveSupport int supportsMixedMimeTypeAdaptation() {
@AdaptiveSupport
public final int supportsMixedMimeTypeAdaptation() {
return ADAPTIVE_NOT_SEAMLESS;
}
......
libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegVideoRenderer.java
......@@ -73,7 +73,8 @@ public final class FfmpegVideoRenderer extends DecoderVideoRenderer {
}
@Override
public final @RendererCapabilities.Capabilities int supportsFormat(Format format) {
@RendererCapabilities.Capabilities
public final int supportsFormat(Format format) {
// TODO: Remove this line and uncomment the implementation below.
return C.FORMAT_UNSUPPORTED_TYPE;
/*
......
libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/LibflacAudioRenderer.java
......@@ -79,7 +79,8 @@ public final class LibflacAudioRenderer extends DecoderAudioRenderer<FlacDecoder
}
@Override
protected @C.FormatSupport int supportsFormatInternal(Format format) {
@C.FormatSupport
protected int supportsFormatInternal(Format format) {
if (!FlacLibrary.isAvailable()
|| !MimeTypes.AUDIO_FLAC.equalsIgnoreCase(format.sampleMimeType)) {
return C.FORMAT_UNSUPPORTED_TYPE;
......
libraries/decoder_opus/src/main/java/androidx/media3/decoder/opus/LibopusAudioRenderer.java
......@@ -80,7 +80,8 @@ public class LibopusAudioRenderer extends DecoderAudioRenderer<OpusDecoder> {
}
@Override
protected @C.FormatSupport int supportsFormatInternal(Format format) {
@C.FormatSupport
protected int supportsFormatInternal(Format format) {
boolean drmIsSupported = OpusLibrary.supportsCryptoType(format.cryptoType);
if (!OpusLibrary.isAvailable()
|| !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {
......
libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/LibvpxVideoRenderer.java
......@@ -126,7 +126,8 @@ public class LibvpxVideoRenderer extends DecoderVideoRenderer {
}
@Override
public final @Capabilities int supportsFormat(Format format) {
@Capabilities
public final int supportsFormat(Format format) {
if (!VpxLibrary.isAvailable() || !MimeTypes.VIDEO_VP9.equalsIgnoreCase(format.sampleMimeType)) {
return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
}
......
libraries/decoder_vp9/src/main/java/androidx/media3/decoder/vp9/VpxDecoder.java
......@@ -49,7 +49,7 @@ public final class VpxDecoder
@Nullable private ByteBuffer lastSupplementalData;
private volatile @C.VideoOutputMode int outputMode;
@C.VideoOutputMode private volatile int outputMode;
/**
* Creates a VP9 decoder.
......
libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/StreamVolumeManagerTest.java
......@@ -273,7 +273,7 @@ public class StreamVolumeManagerTest {
private static class TestListener implements StreamVolumeManager.Listener {
private @C.StreamType int lastStreamType;
@C.StreamType private int lastStreamType;
private int lastStreamVolume;
private boolean lastStreamVolumeMuted;
public final CountDownLatch onStreamVolumeChangedLatch;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/AudioFocusManager.java
......@@ -139,7 +139,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@Nullable private PlayerControl playerControl;
@Nullable private AudioAttributes audioAttributes;
private @AudioFocusState int audioFocusState;
@AudioFocusState private int audioFocusState;
private @AudioFocusGain int focusGainToRequest;
private float volumeMultiplier = VOLUME_MULTIPLIER_DEFAULT;
......@@ -193,8 +193,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* @param playbackState The desired playback state.
* @return A {@link PlayerCommand} to execute on the player.
*/
public @PlayerCommand int updateAudioFocus(
boolean playWhenReady, @Player.State int playbackState) {
@PlayerCommand
public int updateAudioFocus(boolean playWhenReady, @Player.State int playbackState) {
if (shouldAbandonAudioFocusIfHeld(playbackState)) {
abandonAudioFocusIfHeld();
return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
......@@ -222,7 +222,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
return playbackState == Player.STATE_IDLE || focusGainToRequest != AUDIOFOCUS_GAIN;
}
private @PlayerCommand int requestAudioFocus() {
@PlayerCommand
private int requestAudioFocus() {
if (audioFocusState == AUDIO_FOCUS_STATE_HAVE_FOCUS) {
return PLAYER_COMMAND_PLAY_WHEN_READY;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/BaseRenderer.java
......@@ -200,7 +200,8 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
// RendererCapabilities implementation.
@Override
public @AdaptiveSupport int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
@AdaptiveSupport
public int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
return ADAPTIVE_NOT_SUPPORTED;
}
......@@ -423,7 +424,8 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
* the data of a sample being read. The buffer {@link DecoderInputBuffer#timeUs timestamp} and
* flags are populated if this exception is thrown, but the read position is not advanced.
*/
protected final @ReadDataResult int readSource(
@ReadDataResult
protected final int readSource(
FormatHolder formatHolder, DecoderInputBuffer buffer, @ReadFlags int readFlags) {
@ReadDataResult
int result = Assertions.checkNotNull(stream).readData(formatHolder, buffer, readFlags);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderReuseEvaluation.java
......@@ -125,13 +125,13 @@ public final class DecoderReuseEvaluation {
public final Format newFormat;
/** The {@link DecoderReuseResult result} of the evaluation. */
public final @DecoderReuseResult int result;
@DecoderReuseResult public final int result;
/**
* {@link DecoderDiscardReasons Reasons} why the decoder cannot be reused. Always {@code 0} if
* reuse is possible. May also be {code 0} if reuse is not possible for an unspecified reason.
*/
public final @DecoderDiscardReasons int discardReasons;
@DecoderDiscardReasons public final int discardReasons;
/**
* @param decoderName The name of the decoder.
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultRenderersFactory.java
......@@ -95,7 +95,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
private final Context context;
private final DefaultMediaCodecAdapterFactory codecAdapterFactory;
private @ExtensionRendererMode int extensionRendererMode;
@ExtensionRendererMode private int extensionRendererMode;
private long allowedVideoJoiningTimeMs;
private boolean enableDecoderFallback;
private MediaCodecSelector mediaCodecSelector;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlaybackException.java
......@@ -85,7 +85,7 @@ public final class ExoPlaybackException extends PlaybackException {
@UnstableApi public static final int TYPE_REMOTE = 3;
/** The {@link Type} of the playback failure. */
@UnstableApi public final @Type int type;
@UnstableApi @Type public final int type;
/** If {@link #type} is {@link #TYPE_RENDERER}, this is the name of the renderer. */
@UnstableApi @Nullable public final String rendererName;
......@@ -104,7 +104,7 @@ public final class ExoPlaybackException extends PlaybackException {
* renderer for {@link #rendererFormat}. If {@link #rendererFormat} is null, this is {@link
* C#FORMAT_HANDLED}.
*/
@UnstableApi public final @FormatSupport int rendererFormatSupport;
@UnstableApi @FormatSupport public final int rendererFormatSupport;
/** The {@link MediaPeriodId} of the media associated with this error, or null if undetermined. */
@UnstableApi @Nullable public final MediaPeriodId mediaPeriodId;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
......@@ -216,12 +216,12 @@ import java.util.concurrent.TimeoutException;
private final WifiLockManager wifiLockManager;
private final long detachSurfaceTimeoutMs;
private @RepeatMode int repeatMode;
@RepeatMode private int repeatMode;
private boolean shuffleModeEnabled;
private int pendingOperationAcks;
private @DiscontinuityReason int pendingDiscontinuityReason;
@DiscontinuityReason private int pendingDiscontinuityReason;
private boolean pendingDiscontinuity;
private @PlayWhenReadyChangeReason int pendingPlayWhenReadyChangeReason;
@PlayWhenReadyChangeReason private int pendingPlayWhenReadyChangeReason;
private boolean foregroundMode;
private SeekParameters seekParameters;
private ShuffleOrder shuffleOrder;
......@@ -238,8 +238,8 @@ import java.util.concurrent.TimeoutException;
@Nullable private SphericalGLSurfaceView sphericalGLSurfaceView;
private boolean surfaceHolderSurfaceIsVideoOutput;
@Nullable private TextureView textureView;
private @C.VideoScalingMode int videoScalingMode;
private @C.VideoChangeFrameRateStrategy int videoChangeFrameRateStrategy;
@C.VideoScalingMode private int videoScalingMode;
@C.VideoChangeFrameRateStrategy private int videoChangeFrameRateStrategy;
private int surfaceWidth;
private int surfaceHeight;
@Nullable private DecoderCounters videoDecoderCounters;
......@@ -515,12 +515,14 @@ import java.util.concurrent.TimeoutException;
return availableCommands;
}
public @State int getPlaybackState() {
@State
public int getPlaybackState() {
verifyApplicationThread();
return playbackInfo.playbackState;
}
public @PlaybackSuppressionReason int getPlaybackSuppressionReason() {
@PlaybackSuppressionReason
public int getPlaybackSuppressionReason() {
verifyApplicationThread();
return playbackInfo.playbackSuppressionReason;
}
......@@ -812,7 +814,8 @@ import java.util.concurrent.TimeoutException;
}
}
public @RepeatMode int getRepeatMode() {
@RepeatMode
public int getRepeatMode() {
verifyApplicationThread();
return repeatMode;
}
......@@ -1268,7 +1271,8 @@ import java.util.concurrent.TimeoutException;
sendRendererMessage(TRACK_TYPE_VIDEO, MSG_SET_SCALING_MODE, videoScalingMode);
}
public @C.VideoScalingMode int getVideoScalingMode() {
@C.VideoScalingMode
public int getVideoScalingMode() {
return videoScalingMode;
}
......@@ -1283,7 +1287,8 @@ import java.util.concurrent.TimeoutException;
TRACK_TYPE_VIDEO, MSG_SET_CHANGE_FRAME_RATE_STRATEGY, videoChangeFrameRateStrategy);
}
public @C.VideoChangeFrameRateStrategy int getVideoChangeFrameRateStrategy() {
@C.VideoChangeFrameRateStrategy
public int getVideoChangeFrameRateStrategy() {
return videoChangeFrameRateStrategy;
}
......@@ -2963,13 +2968,15 @@ import java.util.concurrent.TimeoutException;
private static final class FrameMetadataListener
implements VideoFrameMetadataListener, CameraMotionListener, PlayerMessage.Target {
public static final @MessageType int MSG_SET_VIDEO_FRAME_METADATA_LISTENER =
@MessageType
public static final int MSG_SET_VIDEO_FRAME_METADATA_LISTENER =
Renderer.MSG_SET_VIDEO_FRAME_METADATA_LISTENER;
public static final @MessageType int MSG_SET_CAMERA_MOTION_LISTENER =
@MessageType
public static final int MSG_SET_CAMERA_MOTION_LISTENER =
Renderer.MSG_SET_CAMERA_MOTION_LISTENER;
public static final @MessageType int MSG_SET_SPHERICAL_SURFACE_VIEW = Renderer.MSG_CUSTOM_BASE;
@MessageType public static final int MSG_SET_SPHERICAL_SURFACE_VIEW = Renderer.MSG_CUSTOM_BASE;
@Nullable private VideoFrameMetadataListener videoFrameMetadataListener;
@Nullable private CameraMotionListener cameraMotionListener;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImplInternal.java
......@@ -93,9 +93,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
public PlaybackInfo playbackInfo;
public int operationAcks;
public boolean positionDiscontinuity;
public @DiscontinuityReason int discontinuityReason;
@DiscontinuityReason public int discontinuityReason;
public boolean hasPlayWhenReadyChangeReason;
public @PlayWhenReadyChangeReason int playWhenReadyChangeReason;
@PlayWhenReadyChangeReason public int playWhenReadyChangeReason;
public PlaybackInfoUpdate(PlaybackInfo playbackInfo) {
this.playbackInfo = playbackInfo;
......@@ -216,7 +216,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
private boolean pendingPauseAtEndOfPeriod;
private boolean isRebuffering;
private boolean shouldContinueLoading;
private @Player.RepeatMode int repeatMode;
@Player.RepeatMode private int repeatMode;
private boolean shuffleModeEnabled;
private boolean foregroundMode;
private boolean requestForRendererSleep;
......@@ -2943,8 +2943,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* @return The uid in the new timeline of the first subsequent period, or null if no such period
* was found.
*/
/* package */ @Nullable
static Object resolveSubsequentPeriod(
/* package */ static @Nullable Object resolveSubsequentPeriod(
Timeline.Window window,
Timeline.Period period,
@Player.RepeatMode int repeatMode,
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoTimeoutException.java
......@@ -62,7 +62,7 @@ public final class ExoTimeoutException extends RuntimeException {
public static final int TIMEOUT_OPERATION_DETACH_SURFACE = 3;
/** The operation on the ExoPlayer playback thread that timed out. */
public final @TimeoutOperation int timeoutOperation;
@TimeoutOperation public final int timeoutOperation;
/**
* Creates the timeout exception.
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/NoSampleRenderer.java
......@@ -169,12 +169,14 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
// RendererCapabilities implementation.
@Override
public @Capabilities int supportsFormat(Format format) throws ExoPlaybackException {
@Capabilities
public int supportsFormat(Format format) throws ExoPlaybackException {
return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
}
@Override
public @AdaptiveSupport int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
@AdaptiveSupport
public int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
return ADAPTIVE_NOT_SUPPORTED;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/PlaybackInfo.java
......@@ -55,7 +55,7 @@ import java.util.List;
/** The start position after a reported position discontinuity, in microseconds. */
public final long discontinuityStartPositionUs;
/** The current playback state. One of the {@link Player}.STATE_ constants. */
public final @Player.State int playbackState;
@Player.State public final int playbackState;
/** The current playback error, or null if this is not an error state. */
@Nullable public final ExoPlaybackException playbackError;
/** Whether the player is currently loading. */
......@@ -71,7 +71,7 @@ import java.util.List;
/** Whether playback should proceed when {@link #playbackState} == {@link Player#STATE_READY}. */
public final boolean playWhenReady;
/** Reason why playback is suppressed even though {@link #playWhenReady} is {@code true}. */
public final @PlaybackSuppressionReason int playbackSuppressionReason;
@PlaybackSuppressionReason public final int playbackSuppressionReason;
/** The playback parameters. */
public final PlaybackParameters playbackParameters;
/** Whether offload scheduling is enabled for the main player loop. */
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererCapabilities.java
......@@ -191,7 +191,8 @@ public interface RendererCapabilities {
* @return The combined {@link Capabilities} of the given {@link C.FormatSupport}, {@link
* #ADAPTIVE_NOT_SUPPORTED} and {@link #TUNNELING_NOT_SUPPORTED}.
*/
static @Capabilities int create(@C.FormatSupport int formatSupport) {
@Capabilities
static int create(@C.FormatSupport int formatSupport) {
return create(formatSupport, ADAPTIVE_NOT_SUPPORTED, TUNNELING_NOT_SUPPORTED);
}
......@@ -207,7 +208,8 @@ public interface RendererCapabilities {
* @param tunnelingSupport The {@link TunnelingSupport}.
* @return The combined {@link Capabilities}.
*/
static @Capabilities int create(
@Capabilities
static int create(
@C.FormatSupport int formatSupport,
@AdaptiveSupport int adaptiveSupport,
@TunnelingSupport int tunnelingSupport) {
......@@ -233,7 +235,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @Capabilities int create(
@Capabilities
static int create(
@C.FormatSupport int formatSupport,
@AdaptiveSupport int adaptiveSupport,
@TunnelingSupport int tunnelingSupport,
......@@ -254,7 +257,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @C.FormatSupport int getFormatSupport(@Capabilities int supportFlags) {
@C.FormatSupport
static int getFormatSupport(@Capabilities int supportFlags) {
return supportFlags & FORMAT_SUPPORT_MASK;
}
......@@ -266,7 +270,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @AdaptiveSupport int getAdaptiveSupport(@Capabilities int supportFlags) {
@AdaptiveSupport
static int getAdaptiveSupport(@Capabilities int supportFlags) {
return supportFlags & ADAPTIVE_SUPPORT_MASK;
}
......@@ -278,7 +283,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @TunnelingSupport int getTunnelingSupport(@Capabilities int supportFlags) {
@TunnelingSupport
static int getTunnelingSupport(@Capabilities int supportFlags) {
return supportFlags & TUNNELING_SUPPORT_MASK;
}
......@@ -290,8 +296,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @HardwareAccelerationSupport int getHardwareAccelerationSupport(
@Capabilities int supportFlags) {
@HardwareAccelerationSupport
static int getHardwareAccelerationSupport(@Capabilities int supportFlags) {
return supportFlags & HARDWARE_ACCELERATION_SUPPORT_MASK;
}
......@@ -303,7 +309,8 @@ public interface RendererCapabilities {
*/
// Suppression needed for IntDef casting.
@SuppressLint("WrongConstant")
static @DecoderSupport int getDecoderSupport(@Capabilities int supportFlags) {
@DecoderSupport
static int getDecoderSupport(@Capabilities int supportFlags) {
return supportFlags & MODE_SUPPORT_MASK;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
......@@ -398,7 +398,8 @@ public class SimpleExoPlayer extends BasePlayer
}
@Override
public @C.VideoScalingMode int getVideoScalingMode() {
@C.VideoScalingMode
public int getVideoScalingMode() {
return player.getVideoScalingMode();
}
......@@ -409,7 +410,8 @@ public class SimpleExoPlayer extends BasePlayer
}
@Override
public @C.VideoChangeFrameRateStrategy int getVideoChangeFrameRateStrategy() {
@C.VideoChangeFrameRateStrategy
public int getVideoChangeFrameRateStrategy() {
return player.getVideoChangeFrameRateStrategy();
}
......@@ -637,12 +639,14 @@ public class SimpleExoPlayer extends BasePlayer
}
@Override
public @State int getPlaybackState() {
@State
public int getPlaybackState() {
return player.getPlaybackState();
}
@Override
public @PlaybackSuppressionReason int getPlaybackSuppressionReason() {
@PlaybackSuppressionReason
public int getPlaybackSuppressionReason() {
return player.getPlaybackSuppressionReason();
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/StreamVolumeManager.java
......@@ -55,7 +55,7 @@ import androidx.media3.common.util.Util;
private final AudioManager audioManager;
@Nullable private VolumeChangeReceiver receiver;
private @C.StreamType int streamType;
@C.StreamType private int streamType;
private int volume;
private boolean muted;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
......@@ -150,7 +150,8 @@ public interface AnalyticsListener {
* @param index The index. Must be between 0 (inclusive) and {@link #size()} (exclusive).
* @return The {@link EventFlags event} at the given index.
*/
public @EventFlags int get(int index) {
@EventFlags
public int get(int index) {
return flags.get(index);
}
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java
......@@ -120,7 +120,7 @@ public final class MediaMetricsListener
@Nullable private String activeSessionId;
@Nullable private PlaybackMetrics.Builder metricsBuilder;
private @Player.DiscontinuityReason int discontinuityReason;
@Player.DiscontinuityReason private int discontinuityReason;
private int currentPlaybackState;
private int currentNetworkType;
@Nullable private PlaybackException pendingPlayerError;
......@@ -887,7 +887,7 @@ public final class MediaMetricsListener
private static final class PendingFormatUpdate {
public final Format format;
public final @C.SelectionReason int selectionReason;
@C.SelectionReason public final int selectionReason;
public final String sessionId;
public PendingFormatUpdate(
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/PlaybackStatsListener.java
......@@ -84,7 +84,7 @@ public final class PlaybackStatsListener
@Nullable private String discontinuityFromSession;
private long discontinuityFromPositionMs;
private @Player.DiscontinuityReason int discontinuityReason;
@Player.DiscontinuityReason private int discontinuityReason;
private int droppedFrames;
@Nullable private Exception nonFatalException;
private long bandwidthTimeMs;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioProcessor.java
......@@ -45,7 +45,7 @@ public interface AudioProcessor {
/** The number of interleaved channels. */
public final int channelCount;
/** The type of linear PCM encoding. */
public final @C.PcmEncoding int encoding;
@C.PcmEncoding public final int encoding;
/** The number of bytes used to represent one audio frame. */
public final int bytesPerFrame;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
......@@ -138,7 +138,7 @@ public abstract class DecoderAudioRenderer<
@Nullable private DrmSession decoderDrmSession;
@Nullable private DrmSession sourceDrmSession;
private @ReinitializationState int decoderReinitializationState;
@ReinitializationState private int decoderReinitializationState;
private boolean decoderReceivedBuffers;
private boolean audioTrackNeedsConfigure;
......@@ -228,7 +228,8 @@ public abstract class DecoderAudioRenderer<
}
@Override
public final @Capabilities int supportsFormat(Format format) {
@Capabilities
public final int supportsFormat(Format format) {
if (!MimeTypes.isAudio(format.sampleMimeType)) {
return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
}
......@@ -247,7 +248,8 @@ public abstract class DecoderAudioRenderer<
* @param format The format, which has an audio {@link Format#sampleMimeType}.
* @return The {@link C.FormatSupport} for this {@link Format}.
*/
protected abstract @C.FormatSupport int supportsFormatInternal(Format format);
@C.FormatSupport
protected abstract int supportsFormatInternal(Format format);
/**
* Returns whether the renderer's {@link AudioSink} supports a given {@link Format}.
......@@ -264,7 +266,8 @@ public abstract class DecoderAudioRenderer<
*
* @see AudioSink#getFormatSupport(Format) (Format)
*/
protected final @SinkFormatSupport int getSinkFormatSupport(Format format) {
@SinkFormatSupport
protected final int getSinkFormatSupport(Format format) {
return audioSink.getFormatSupport(format);
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
......@@ -482,8 +482,8 @@ public final class DefaultAudioSink implements AudioSink {
private final AudioTrackPositionTracker audioTrackPositionTracker;
private final ArrayDeque<MediaPositionParameters> mediaPositionParametersCheckpoints;
private final boolean enableAudioTrackPlaybackParams;
private final @OffloadMode int offloadMode;
private @MonotonicNonNull StreamEventCallbackV29 offloadStreamEventCallbackV29;
@OffloadMode private final int offloadMode;
@MonotonicNonNull private StreamEventCallbackV29 offloadStreamEventCallbackV29;
private final PendingExceptionHolder<InitializationException>
initializationExceptionPendingExceptionHolder;
private final PendingExceptionHolder<WriteException> writeExceptionPendingExceptionHolder;
......@@ -492,7 +492,7 @@ public final class DefaultAudioSink implements AudioSink {
@Nullable private PlayerId playerId;
@Nullable private Listener listener;
@Nullable private Configuration pendingConfiguration;
private @MonotonicNonNull Configuration configuration;
@MonotonicNonNull private Configuration configuration;
@Nullable private AudioTrack audioTrack;
private AudioAttributes audioAttributes;
......@@ -518,7 +518,7 @@ public final class DefaultAudioSink implements AudioSink {
@Nullable private ByteBuffer inputBuffer;
private int inputBufferAccessUnitCount;
@Nullable private ByteBuffer outputBuffer;
private @MonotonicNonNull byte[] preV21OutputBuffer;
@MonotonicNonNull private byte[] preV21OutputBuffer;
private int preV21OutputBufferOffset;
private int drainingAudioProcessorIndex;
private boolean handledEndOfStream;
......@@ -661,7 +661,8 @@ public final class DefaultAudioSink implements AudioSink {
}
@Override
public @SinkFormatSupport int getFormatSupport(Format format) {
@SinkFormatSupport
public int getFormatSupport(Format format) {
if (MimeTypes.AUDIO_RAW.equals(format.sampleMimeType)) {
if (!Util.isEncodingLinearPcm(format.pcmEncoding)) {
Log.w(TAG, "Invalid PCM encoding: " + format.pcmEncoding);
......@@ -2135,11 +2136,11 @@ public final class DefaultAudioSink implements AudioSink {
public final Format inputFormat;
public final int inputPcmFrameSize;
public final @OutputMode int outputMode;
@OutputMode public final int outputMode;
public final int outputPcmFrameSize;
public final int outputSampleRate;
public final int outputChannelConfig;
public final @C.Encoding int outputEncoding;
@C.Encoding public final int outputEncoding;
public final int bufferSize;
public final AudioProcessor[] availableAudioProcessors;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java
......@@ -50,7 +50,8 @@ public class ForwardingAudioSink implements AudioSink {
}
@Override
public @SinkFormatSupport int getFormatSupport(Format format) {
@SinkFormatSupport
public int getFormatSupport(Format format) {
return sink.getFormatSupport(format);
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
......@@ -286,7 +286,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
}
@Override
protected @Capabilities int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
@Capabilities
protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
throws DecoderQueryException {
if (!MimeTypes.isAudio(format.sampleMimeType)) {
return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/SilenceSkippingAudioProcessor.java
......@@ -88,7 +88,7 @@ public final class SilenceSkippingAudioProcessor extends BaseAudioProcessor {
*/
private byte[] paddingBuffer;
private @State int state;
@State private int state;
private int maybeSilenceBufferSize;
private int paddingSize;
private boolean hasOutputNoise;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/SpatializerDelegate.java
......@@ -129,7 +129,8 @@ import java.util.concurrent.Executor;
}
/** Delegates to Spatializer.getImmersiveAudioLevel() */
public @ImmersiveAudioLevel int getImmersiveAudioLevel() {
@ImmersiveAudioLevel
public int getImmersiveAudioLevel() {
try {
return (int) Util.castNonNull(getImmersiveAudioLevel.invoke(spatializer));
} catch (IllegalAccessException | InvocationTargetException e) {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/TeeAudioProcessor.java
......@@ -128,7 +128,7 @@ public final class TeeAudioProcessor extends BaseAudioProcessor {
private int sampleRateHz;
private int channelCount;
private @C.PcmEncoding int encoding;
@C.PcmEncoding private int encoding;
@Nullable private RandomAccessFile randomAccessFile;
private int counter;
private int bytesWritten;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/TrimmingAudioProcessor.java
......@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
/** Audio processor for trimming samples from the start/end of data. */
/* package */ final class TrimmingAudioProcessor extends BaseAudioProcessor {
private static final @C.PcmEncoding int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
@C.PcmEncoding private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
private int trimStartFrames;
private int trimEndFrames;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java
......@@ -254,7 +254,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
// DrmSession implementation.
@Override
public final @DrmSession.State int getState() {
@DrmSession.State
public final int getState() {
return state;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java
......@@ -312,7 +312,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
@Nullable private byte[] offlineLicenseKeySetId;
private @MonotonicNonNull PlayerId playerId;
/* package */ @Nullable volatile MediaDrmHandler mediaDrmHandler;
/* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
/**
* @param uuid The UUID of the drm scheme.
......@@ -590,7 +590,8 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
}
@Override
public @C.CryptoType int getCryptoType(Format format) {
@C.CryptoType
public int getCryptoType(Format format) {
@C.CryptoType int cryptoType = checkNotNull(exoMediaDrm).getCryptoType();
if (format.drmInitData == null) {
int trackType = MimeTypes.getTrackType(format.sampleMimeType);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSession.java
......@@ -65,7 +65,7 @@ public interface DrmSession {
class DrmSessionException extends IOException {
/** The {@link PlaybackException.ErrorCode} that corresponds to the failure. */
public final @PlaybackException.ErrorCode int errorCode;
@PlaybackException.ErrorCode public final int errorCode;
public DrmSessionException(Throwable cause, @PlaybackException.ErrorCode int errorCode) {
super(cause);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionManager.java
......@@ -66,7 +66,8 @@ public interface DrmSessionManager {
}
@Override
public @C.CryptoType int getCryptoType(Format format) {
@C.CryptoType
public int getCryptoType(Format format) {
return format.drmInitData != null ? C.CRYPTO_TYPE_UNSUPPORTED : C.CRYPTO_TYPE_NONE;
}
};
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmUtil.java
......@@ -72,7 +72,8 @@ public final class DrmUtil {
* @return The {@link PlaybackException.ErrorCode} that corresponds to the given DRM-related
* exception.
*/
public static @PlaybackException.ErrorCode int getErrorCodeForMediaDrmException(
@PlaybackException.ErrorCode
public static int getErrorCodeForMediaDrmException(
Exception exception, @ErrorSource int errorSource) {
if (Util.SDK_INT >= 21 && Api21.isMediaDrmStateException(exception)) {
return Api21.mediaDrmStateExceptionToErrorCode(exception);
......@@ -127,8 +128,8 @@ public final class DrmUtil {
}
@DoNotInline
public static @PlaybackException.ErrorCode int mediaDrmStateExceptionToErrorCode(
Throwable throwable) {
@PlaybackException.ErrorCode
public static int mediaDrmStateExceptionToErrorCode(Throwable throwable) {
@Nullable
String diagnosticsInfo = ((MediaDrm.MediaDrmStateException) throwable).getDiagnosticInfo();
int drmErrorCode = Util.getErrorCodeFromPlatformDiagnosticsInfo(diagnosticsInfo);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DummyExoMediaDrm.java
......@@ -153,7 +153,8 @@ public final class DummyExoMediaDrm implements ExoMediaDrm {
}
@Override
public @C.CryptoType int getCryptoType() {
@C.CryptoType
public int getCryptoType() {
return C.CRYPTO_TYPE_UNSUPPORTED;
}
}
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/ExoMediaDrm.java
......@@ -267,7 +267,7 @@ public interface ExoMediaDrm {
private final byte[] data;
private final String licenseServerUrl;
private final @RequestType int requestType;
@RequestType private final int requestType;
/**
* Creates an instance with {@link #REQUEST_TYPE_UNKNOWN}.
......@@ -307,7 +307,8 @@ public interface ExoMediaDrm {
* request does not specify a type. Note that when using a platform {@link MediaDrm} instance,
* key requests only specify a type on API levels 23 and above.
*/
public @RequestType int getRequestType() {
@RequestType
public int getRequestType() {
return requestType;
}
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
......@@ -342,7 +342,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
}
@Override
public @C.CryptoType int getCryptoType() {
@C.CryptoType
public int getCryptoType() {
return C.CRYPTO_TYPE_FRAMEWORK;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/UnsupportedDrmException.java
......@@ -49,7 +49,7 @@ public final class UnsupportedDrmException extends Exception {
public static final int REASON_INSTANTIATION_ERROR = 2;
/** Either {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}. */
public final @Reason int reason;
@Reason public final int reason;
/** @param reason {@link #REASON_UNSUPPORTED_SCHEME} or {@link #REASON_INSTANTIATION_ERROR}. */
public UnsupportedDrmException(@Reason int reason) {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/WidevineUtil.java
......@@ -39,8 +39,7 @@ public final class WidevineUtil {
* @return A {@link Pair} consisting of the remaining license and playback durations in seconds,
* or null if called before the session has been opened or after it's been released.
*/
@Nullable
public static Pair<Long, Long> getLicenseDurationRemainingSec(DrmSession drmSession) {
public static @Nullable Pair<Long, Long> getLicenseDurationRemainingSec(DrmSession drmSession) {
Map<String, String> keyStatus = drmSession.queryKeyStatus();
if (keyStatus == null) {
return null;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecAdapter.java
......@@ -141,7 +141,7 @@ import java.nio.ByteBuffer;
private final boolean synchronizeCodecInteractionsWithQueueing;
private final boolean enableImmediateCodecStartAfterFlush;
private boolean codecReleased;
private @State int state;
@State private int state;
private AsynchronousMediaCodecAdapter(
MediaCodec codec,
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/DefaultMediaCodecAdapterFactory.java
......@@ -53,7 +53,7 @@ public final class DefaultMediaCodecAdapterFactory implements MediaCodecAdapter.
private static final String TAG = "DMCodecAdapterFactory";
private @Mode int asynchronousMode;
@Mode private int asynchronousMode;
private boolean enableSynchronizeCodecInteractionsWithQueueing;
private boolean enableImmediateCodecStartAfterFlush;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java
......@@ -327,7 +327,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
@Nullable private ArrayDeque<MediaCodecInfo> availableCodecInfos;
@Nullable private DecoderInitializationException preferredDecoderInitializationException;
@Nullable private MediaCodecInfo codecInfo;
private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode;
@AdaptationWorkaroundMode private int codecAdaptationWorkaroundMode;
private boolean codecNeedsDiscardToSpsWorkaround;
private boolean codecNeedsFlushWorkaround;
private boolean codecNeedsSosFlushWorkaround;
......@@ -349,9 +349,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
private boolean bypassSampleBufferPending;
private boolean bypassDrainAndReinitialize;
private boolean codecReconfigured;
private @ReconfigurationState int codecReconfigurationState;
private @DrainState int codecDrainState;
private @DrainAction int codecDrainAction;
@ReconfigurationState private int codecReconfigurationState;
@DrainState private int codecDrainState;
@DrainAction private int codecDrainAction;
private boolean codecReceivedBuffers;
private boolean codecReceivedEos;
private boolean codecHasOutputMediaFormat;
......@@ -437,12 +437,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
@Override
public final @AdaptiveSupport int supportsMixedMimeTypeAdaptation() {
@AdaptiveSupport
public final int supportsMixedMimeTypeAdaptation() {
return ADAPTIVE_NOT_SEAMLESS;
}
@Override
public final @Capabilities int supportsFormat(Format format) throws ExoPlaybackException {
@Capabilities
public final int supportsFormat(Format format) throws ExoPlaybackException {
try {
return supportsFormat(mediaCodecSelector, format);
} catch (DecoderQueryException e) {
......@@ -458,8 +460,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
* @return The {@link Capabilities} for this {@link Format}.
* @throws DecoderQueryException If there was an error querying decoders.
*/
protected abstract @Capabilities int supportsFormat(
MediaCodecSelector mediaCodecSelector, Format format) throws DecoderQueryException;
@Capabilities
protected abstract int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
throws DecoderQueryException;
/**
* Returns a list of decoders that can decode media in the specified format, in priority order.
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/metadata/MetadataRenderer.java
......@@ -94,7 +94,8 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
}
@Override
public @Capabilities int supportsFormat(Format format) {
@Capabilities
public int supportsFormat(Format format) {
if (decoderFactory.supportsFormat(format)) {
return RendererCapabilities.create(
format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/Download.java
......@@ -99,7 +99,7 @@ public final class Download {
/** The download request. */
public final DownloadRequest request;
/** The state of the download. */
public final @State int state;
@State public final int state;
/** The first time when download entry is created. */
public final long startTimeMs;
/** The last update time. */
......@@ -112,7 +112,7 @@ public final class Download {
* If {@link #state} is {@link #STATE_FAILED} then this is the cause, otherwise {@link
* #FAILURE_REASON_NONE}.
*/
public final @FailureReason int failureReason;
@FailureReason public final int failureReason;
/* package */ final DownloadProgress progress;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java
......@@ -1100,7 +1100,8 @@ public final class DownloadHelper {
}
@Override
public @C.SelectionReason int getSelectionReason() {
@C.SelectionReason
public int getSelectionReason() {
return C.SELECTION_REASON_UNKNOWN;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadManager.java
......@@ -351,7 +351,8 @@ public final class DownloadManager {
*
* @return The not met {@link Requirements.RequirementFlags}, or 0 if all requirements are met.
*/
public @Requirements.RequirementFlags int getNotMetRequirements() {
@Requirements.RequirementFlags
public int getNotMetRequirements() {
return notMetRequirements;
}
......@@ -704,7 +705,7 @@ public final class DownloadManager {
private final ArrayList<Download> downloads;
private final HashMap<String, Task> activeTasks;
private @Requirements.RequirementFlags int notMetRequirements;
@Requirements.RequirementFlags private int notMetRequirements;
private boolean downloadsPaused;
private int maxParallelDownloads;
private int minRetryCount;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/scheduler/Requirements.java
......@@ -74,7 +74,7 @@ public final class Requirements implements Parcelable {
*/
public static final int DEVICE_STORAGE_NOT_LOW = 1 << 4;
private final @RequirementFlags int requirements;
@RequirementFlags private final int requirements;
/** @param requirements A combination of requirement flags. */
public Requirements(@RequirementFlags int requirements) {
......@@ -86,7 +86,8 @@ public final class Requirements implements Parcelable {
}
/** Returns the requirements. */
public @RequirementFlags int getRequirements() {
@RequirementFlags
public int getRequirements() {
return requirements;
}
......@@ -143,7 +144,8 @@ public final class Requirements implements Parcelable {
* @param context Any context.
* @return The requirements that are not met, or 0.
*/
public @RequirementFlags int getNotMetRequirements(Context context) {
@RequirementFlags
public int getNotMetRequirements(Context context) {
@RequirementFlags int notMetRequirements = getNotMetNetworkRequirements(context);
if (isChargingRequired() && !isDeviceCharging(context)) {
notMetRequirements |= DEVICE_CHARGING;
......@@ -157,7 +159,8 @@ public final class Requirements implements Parcelable {
return notMetRequirements;
}
private @RequirementFlags int getNotMetNetworkRequirements(Context context) {
@RequirementFlags
private int getNotMetNetworkRequirements(Context context) {
if (!isNetworkRequired()) {
return 0;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/scheduler/RequirementsWatcher.java
......@@ -62,7 +62,7 @@ public final class RequirementsWatcher {
@Nullable private DeviceStatusChangeReceiver receiver;
private @Requirements.RequirementFlags int notMetRequirements;
@Requirements.RequirementFlags private int notMetRequirements;
@Nullable private NetworkCallback networkCallback;
/**
......@@ -83,7 +83,8 @@ public final class RequirementsWatcher {
*
* @return Initial {@link Requirements.RequirementFlags RequirementFlags} that are not met, or 0.
*/
public @Requirements.RequirementFlags int start() {
@Requirements.RequirementFlags
public int start() {
notMetRequirements = requirements.getNotMetRequirements(context);
IntentFilter filter = new IntentFilter();
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ClippingMediaSource.java
......@@ -63,7 +63,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
public static final int REASON_START_EXCEEDS_END = 2;
/** The reason clipping failed. */
public final @Reason int reason;
@Reason public final int reason;
/** @param reason The reason clipping failed. */
public IllegalClippingException(@Reason int reason) {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
......@@ -472,7 +472,8 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
mediaSourceFactories = new HashMap<>();
}
public @C.ContentType int[] getSupportedTypes() {
@C.ContentType
public int[] getSupportedTypes() {
ensureAllSuppliersAreLoaded();
return Ints.toArray(supportedTypes);
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaLoadData.java
......@@ -28,7 +28,7 @@ import androidx.media3.common.util.UnstableApi;
public final class MediaLoadData {
/** The {@link DataType data type}. */
public final @DataType int dataType;
@DataType public final int dataType;
/**
* One of the {@link TrackType track types}, which is a media track type if the data corresponds
* to media of a specific type, or {@link C#TRACK_TYPE_UNKNOWN} otherwise.
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceFactory.java
......@@ -47,7 +47,8 @@ public interface MediaSourceFactory extends MediaSource.Factory {
}
@Override
public @C.ContentType int[] getSupportedTypes() {
@C.ContentType
public int[] getSupportedTypes() {
throw new UnsupportedOperationException();
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MergingMediaSource.java
......@@ -61,7 +61,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
public static final int REASON_PERIOD_COUNT_MISMATCH = 0;
/** The reason the merge failed. */
public final @Reason int reason;
@Reason public final int reason;
/** @param reason The reason the merge failed. */
public IllegalMergeException(@Reason int reason) {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java
......@@ -131,7 +131,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private @MonotonicNonNull SeekMap seekMap;
private long durationUs;
private boolean isLive;
private @DataType int dataType;
@DataType private int dataType;
private boolean seenFirstTrackSelection;
private boolean notifyDiscontinuity;
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SilenceMediaSource.java
......@@ -87,7 +87,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
public static final String MEDIA_ID = "SilenceMediaSource";
private static final int SAMPLE_RATE_HZ = 44100;
private static final @C.PcmEncoding int PCM_ENCODING = C.ENCODING_PCM_16BIT;
@C.PcmEncoding private static final int PCM_ENCODING = C.ENCODING_PCM_16BIT;
private static final int CHANNEL_COUNT = 2;
private static final Format FORMAT =
new Format.Builder()
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java
......@@ -847,7 +847,8 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource
return positionUs;
}
public @SampleStream.ReadDataResult int readData(
@SampleStream.ReadDataResult
public int readData(
MediaPeriodImpl mediaPeriod,
int streamIndex,
FormatHolder formatHolder,
......@@ -1203,7 +1204,8 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource
}
@Override
public @ReadDataResult int readData(
@ReadDataResult
public int readData(
FormatHolder formatHolder, DecoderInputBuffer buffer, @ReadFlags int readFlags) {
return mediaPeriod.sharedPeriod.readData(
mediaPeriod, streamIndex, formatHolder, buffer, readFlags);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/Chunk.java
......@@ -42,7 +42,7 @@ public abstract class Chunk implements Loadable {
/** The {@link DataSpec} that defines the data to be loaded. */
public final DataSpec dataSpec;
/** The {@link DataType data type} of the chunk. For reporting only. */
public final @DataType int type;
@DataType public final int type;
/** The format of the track to which this chunk belongs. */
public final Format trackFormat;
/**
......@@ -50,7 +50,7 @@ public abstract class Chunk implements Loadable {
* C#SELECTION_REASON_UNKNOWN} if the chunk does not belong to a track, or if the selection reason
* is unknown.
*/
public final @C.SelectionReason int trackSelectionReason;
@C.SelectionReason public final int trackSelectionReason;
/**
* Optional data associated with the selection of the track to which this chunk belongs. Null if
* the chunk does not belong to a track, or if there is no associated track selection data.
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
......@@ -540,7 +540,8 @@ public final class OutputConsumerAdapterV30 implements MediaParser.OutputConsume
return new DrmInitData(schemeType, schemeDatas);
}
private static @SelectionFlags int getSelectionFlags(MediaFormat mediaFormat) {
@SelectionFlags
private static int getSelectionFlags(MediaFormat mediaFormat) {
int selectionFlags = 0;
selectionFlags |=
getFlag(
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/text/ExoplayerCuesDecoder.java
......@@ -63,7 +63,7 @@ public final class ExoplayerCuesDecoder implements SubtitleDecoder {
private final SubtitleInputBuffer inputBuffer;
private final Deque<SubtitleOutputBuffer> availableOutputBuffers;
private @InputBufferState int inputBufferState;
@InputBufferState private int inputBufferState;
private boolean released;
public ExoplayerCuesDecoder() {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/text/TextRenderer.java
......@@ -94,7 +94,7 @@ public final class TextRenderer extends BaseRenderer implements Callback {
private boolean inputStreamEnded;
private boolean outputStreamEnded;
private boolean waitingForKeyFrame;
private @ReplacementState int decoderReplacementState;
@ReplacementState private int decoderReplacementState;
@Nullable private Format streamFormat;
@Nullable private SubtitleDecoder decoder;
@Nullable private SubtitleInputBuffer nextInputBuffer;
......@@ -141,7 +141,8 @@ public final class TextRenderer extends BaseRenderer implements Callback {
}
@Override
public @Capabilities int supportsFormat(Format format) {
@Capabilities
public int supportsFormat(Format format) {
if (decoderFactory.supportsFormat(format)) {
return RendererCapabilities.create(
format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
......@@ -123,7 +123,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private boolean allowAudioMixedChannelCountAdaptiveness;
private boolean allowAudioMixedDecoderSupportAdaptiveness;
// Text
private @C.SelectionFlags int disabledTextTrackSelectionFlags;
@C.SelectionFlags private int disabledTextTrackSelectionFlags;
// General
private boolean exceedRendererCapabilitiesIfNecessary;
private boolean tunnelingEnabled;
......@@ -894,7 +894,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* Bitmask of selection flags that are disabled for text track selections. See {@link
* C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
*/
public final @C.SelectionFlags int disabledTextTrackSelectionFlags;
@C.SelectionFlags public final int disabledTextTrackSelectionFlags;
/** Returns an instance configured with default values. */
public static Parameters getDefaults(Context context) {
......@@ -2255,7 +2255,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
}
/** Returns to what extent the track is {@link SelectionEligibility eligible for selection}. */
public abstract @SelectionEligibility int getSelectionEligibility();
@SelectionEligibility
public abstract int getSelectionEligibility();
/**
* Returns whether this track is compatible for an adaptive selection with the specified other
......@@ -2307,7 +2308,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private final int preferredRoleFlagsScore;
private final boolean hasMainOrNoRoleFlag;
private final boolean allowMixedMimeTypes;
private final @SelectionEligibility int selectionEligibility;
@SelectionEligibility private final int selectionEligibility;
private final boolean usesPrimaryDecoder;
private final boolean usesHardwareAcceleration;
private final int codecPreferenceScore;
......@@ -2374,7 +2375,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
}
@Override
public @SelectionEligibility int getSelectionEligibility() {
@SelectionEligibility
public int getSelectionEligibility() {
return selectionEligibility;
}
......@@ -2387,7 +2389,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
&& this.usesHardwareAcceleration == otherTrack.usesHardwareAcceleration));
}
private @SelectionEligibility int evaluateSelectionEligibility(
@SelectionEligibility
private int evaluateSelectionEligibility(
@Capabilities int rendererSupport, @AdaptiveSupport int requiredAdaptiveSupport) {
if ((format.roleFlags & C.ROLE_FLAG_TRICK_PLAY) != 0) {
// Ignore trick-play tracks for now.
......@@ -2499,7 +2502,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return listBuilder.build();
}
private final @SelectionEligibility int selectionEligibility;
@SelectionEligibility private final int selectionEligibility;
private final boolean isWithinConstraints;
@Nullable private final String language;
private final Parameters parameters;
......@@ -2591,7 +2594,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
}
@Override
public @SelectionEligibility int getSelectionEligibility() {
@SelectionEligibility
public int getSelectionEligibility() {
return selectionEligibility;
}
......@@ -2660,7 +2664,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
.result();
}
private @SelectionEligibility int evaluateSelectionEligibility(
@SelectionEligibility
private int evaluateSelectionEligibility(
@Capabilities int rendererSupport, boolean hasMappedVideoTracks) {
if (!isSupported(rendererSupport, parameters.exceedRendererCapabilitiesIfNecessary)) {
return SELECTION_ELIGIBILITY_NO;
......@@ -2707,7 +2712,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return listBuilder.build();
}
private final @SelectionEligibility int selectionEligibility;
@SelectionEligibility private final int selectionEligibility;
private final boolean isWithinRendererCapabilities;
private final boolean isDefault;
private final boolean isForced;
......@@ -2772,7 +2777,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
}
@Override
public @SelectionEligibility int getSelectionEligibility() {
@SelectionEligibility
public int getSelectionEligibility() {
return selectionEligibility;
}
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/MappingTrackSelector.java
......@@ -107,8 +107,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
private final String[] rendererNames;
private final @C.TrackType int[] rendererTrackTypes;
private final TrackGroupArray[] rendererTrackGroups;
private final @AdaptiveSupport int[] rendererMixedMimeTypeAdaptiveSupports;
private final @Capabilities int[][][] rendererFormatSupports;
@AdaptiveSupport private final int[] rendererMixedMimeTypeAdaptiveSupports;
@Capabilities private final int[][][] rendererFormatSupports;
private final TrackGroupArray unmappedTrackGroups;
/**
......@@ -181,7 +181,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @param rendererIndex The renderer index.
* @return The {@link RendererSupport}.
*/
public @RendererSupport int getRendererSupport(int rendererIndex) {
@RendererSupport
public int getRendererSupport(int rendererIndex) {
@RendererSupport int bestRendererSupport = RENDERER_SUPPORT_NO_TRACKS;
@Capabilities int[][] rendererFormatSupport = rendererFormatSupports[rendererIndex];
for (@Capabilities int[] trackGroupFormatSupport : rendererFormatSupport) {
......@@ -216,7 +217,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @param trackType The {@link C.TrackType track type}.
* @return The {@link RendererSupport}.
*/
public @RendererSupport int getTypeSupport(@C.TrackType int trackType) {
@RendererSupport
public int getTypeSupport(@C.TrackType int trackType) {
@RendererSupport int bestRendererSupport = RENDERER_SUPPORT_NO_TRACKS;
for (int i = 0; i < rendererCount; i++) {
if (rendererTrackTypes[i] == trackType) {
......@@ -234,7 +236,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @param trackIndex The index of the track within the track group.
* @return The {@link Capabilities}.
*/
public @Capabilities int getCapabilities(int rendererIndex, int groupIndex, int trackIndex) {
@Capabilities
public int getCapabilities(int rendererIndex, int groupIndex, int trackIndex) {
return rendererFormatSupports[rendererIndex][groupIndex][trackIndex];
}
......@@ -246,7 +249,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @param trackIndex The index of the track within the track group.
* @return The {@link FormatSupport}.
*/
public @FormatSupport int getTrackSupport(int rendererIndex, int groupIndex, int trackIndex) {
@FormatSupport
public int getTrackSupport(int rendererIndex, int groupIndex, int trackIndex) {
return RendererCapabilities.getFormatSupport(
getCapabilities(rendererIndex, groupIndex, trackIndex));
}
......@@ -268,7 +272,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* renderer are included when determining support.
* @return The {@link AdaptiveSupport}.
*/
public @AdaptiveSupport int getAdaptiveSupport(
@AdaptiveSupport
public int getAdaptiveSupport(
int rendererIndex, int groupIndex, boolean includeCapabilitiesExceededTracks) {
int trackCount = rendererTrackGroups[rendererIndex].get(groupIndex).length;
// Iterate over the tracks in the group, recording the indices of those to consider.
......@@ -294,8 +299,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @param groupIndex The index of the track group.
* @return The {@link AdaptiveSupport}.
*/
public @AdaptiveSupport int getAdaptiveSupport(
int rendererIndex, int groupIndex, int[] trackIndices) {
@AdaptiveSupport
public int getAdaptiveSupport(int rendererIndex, int groupIndex, int[] trackIndices) {
int handledTrackCount = 0;
@AdaptiveSupport int adaptiveSupport = RendererCapabilities.ADAPTIVE_SEAMLESS;
boolean multipleMimeTypes = false;
......@@ -535,8 +540,9 @@ public abstract class MappingTrackSelector extends TrackSelector {
* @return An array containing {@link Capabilities} for each track in the group.
* @throws ExoPlaybackException If an error occurs determining the format support.
*/
private static @Capabilities int[] getFormatSupport(
RendererCapabilities rendererCapabilities, TrackGroup group) throws ExoPlaybackException {
@Capabilities
private static int[] getFormatSupport(RendererCapabilities rendererCapabilities, TrackGroup group)
throws ExoPlaybackException {
@Capabilities int[] formatSupport = new int[group.length];
for (int i = 0; i < group.length; i++) {
formatSupport[i] = rendererCapabilities.supportsFormat(group.getFormat(i));
......@@ -553,7 +559,8 @@ public abstract class MappingTrackSelector extends TrackSelector {
* renderer.
* @throws ExoPlaybackException If an error occurs determining the adaptation support.
*/
private static @AdaptiveSupport int[] getMixedMimeTypeAdaptationSupports(
@AdaptiveSupport
private static int[] getMixedMimeTypeAdaptationSupports(
RendererCapabilities[] rendererCapabilities) throws ExoPlaybackException {
@AdaptiveSupport int[] mixedMimeTypeAdaptationSupport = new int[rendererCapabilities.length];
for (int i = 0; i < mixedMimeTypeAdaptationSupport.length; i++) {
......
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeter.java
......@@ -281,14 +281,14 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
private long sampleStartTimeMs;
private long sampleBytesTransferred;
private @C.NetworkType int networkType;
@C.NetworkType private int networkType;
private long totalElapsedTimeMs;
private long totalBytesTransferred;
private long bitrateEstimate;
private long lastReportedBitrateEstimate;
private boolean networkTypeOverrideSet;
private @C.NetworkType int networkTypeOverride;
@C.NetworkType private int networkTypeOverride;
/** @deprecated Use {@link Builder} instead. */
@Deprecated
......
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