sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename DUMMY_MEDIA_ID and related cleanup

Browse source 
Issue: #7565
PiperOrigin-RevId: 353616594
This commit is contained in:
olly 2021-01-25 11:59:19 +00:00 committed by Ian Baker
parent 5433b83a81
commit b069a567ea
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
View file

@ -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;

5
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file

@ -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 {
/** @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