From 8a910fd0aad2abb759c524c0779d73a755ffd2ec Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 20 Sep 2021 12:21:53 +0100 Subject: [PATCH] Make @HlsMediaSource.MetadataType `TYPE_USE` PiperOrigin-RevId: 397717018 --- .../google/android/exoplayer2/source/hls/HlsMediaSource.java | 5 ++++- .../exoplayer2/source/hls/HlsSampleStreamWrapper.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 4b225d7743..7736b26b4c 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -57,7 +57,9 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.Target; import java.util.Collections; import java.util.List; @@ -83,6 +85,7 @@ public final class HlsMediaSource extends BaseMediaSource */ @Documented @Retention(SOURCE) + @Target({ElementType.TYPE_USE}) @IntDef({METADATA_TYPE_ID3, METADATA_TYPE_EMSG}) public @interface MetadataType {} @@ -104,7 +107,7 @@ public final class HlsMediaSource extends BaseMediaSource private DrmSessionManagerProvider drmSessionManagerProvider; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private boolean allowChunklessPreparation; - @MetadataType private int metadataType; + private @MetadataType int metadataType; private boolean useSessionKeys; private List streamKeys; @Nullable private Object tag; diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java index 8f639518bc..ca72c5516d 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java @@ -135,7 +135,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; private final LoadErrorHandlingPolicy loadErrorHandlingPolicy; private final Loader loader; private final MediaSourceEventListener.EventDispatcher mediaSourceEventDispatcher; - @HlsMediaSource.MetadataType private final int metadataType; + private final @HlsMediaSource.MetadataType int metadataType; private final HlsChunkSource.HlsChunkHolder nextChunkHolder; private final ArrayList mediaChunks; private final List readOnlyMediaChunks;