Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b069a567
authored
Jan 25, 2021
by
olly
Committed by
Ian Baker
Jan 25, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Rename DUMMY_MEDIA_ID and related cleanup
Issue: #7565 PiperOrigin-RevId: 353616594
parent
5433b83a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
View file @
b069a567
...
@@ -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
;
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
b069a567
...
@@ -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
(
D
UMMY
_MEDIA_ID
)
.
setMediaId
(
D
EFAULT
_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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment