Commit b069a567 by olly Committed by Ian Baker

Rename DUMMY_MEDIA_ID and related cleanup

Issue: #7565
PiperOrigin-RevId: 353616594
parent 5433b83a
...@@ -31,10 +31,7 @@ public final class SinglePeriodTimeline extends Timeline { ...@@ -31,10 +31,7 @@ public final class SinglePeriodTimeline extends Timeline {
private static final Object UID = new Object(); private static final Object UID = new Object();
private static final MediaItem MEDIA_ITEM = private static final MediaItem MEDIA_ITEM =
new MediaItem.Builder() new MediaItem.Builder().setMediaId("SinglePeriodTimeline").setUri(Uri.EMPTY).build();
.setMediaId("com.google.android.exoplayer2.source.SinglePeriodTimeline")
.setUri(Uri.EMPTY)
.build();
private final long presentationStartTimeMs; private final long presentationStartTimeMs;
private final long windowStartTimeMs; private final long windowStartTimeMs;
......
...@@ -295,7 +295,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -295,7 +295,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifest, manifest,
new MediaItem.Builder() new MediaItem.Builder()
.setUri(Uri.EMPTY) .setUri(Uri.EMPTY)
.setMediaId(DUMMY_MEDIA_ID) .setMediaId(DEFAULT_MEDIA_ID)
.setMimeType(MimeTypes.APPLICATION_MPD) .setMimeType(MimeTypes.APPLICATION_MPD)
.setStreamKeys(streamKeys) .setStreamKeys(streamKeys)
.setTag(tag) .setTag(tag)
...@@ -427,8 +427,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -427,8 +427,7 @@ public final class DashMediaSource extends BaseMediaSource {
/** @deprecated Use {@link #DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS} instead. */ /** @deprecated Use {@link #DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS} instead. */
@Deprecated public static final long DEFAULT_LIVE_PRESENTATION_DELAY_MS = 30_000; @Deprecated public static final long DEFAULT_LIVE_PRESENTATION_DELAY_MS = 30_000;
/** The media id used by media items of dash media sources without a manifest URI. */ /** The media id used by media items of dash media sources without a manifest URI. */
public static final String DUMMY_MEDIA_ID = public static final String DEFAULT_MEDIA_ID = "DashMediaSource";
"com.google.android.exoplayer2.source.dash.DashMediaSource";
/** /**
* The interval in milliseconds between invocations of {@link * The interval in milliseconds between invocations of {@link
......
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