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
18b9304f
authored
Sep 20, 2019
by
aquilescanta
Committed by
Oliver Woodman
Sep 22, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Call prepare and release from MediaSources
Issue:#4721 PiperOrigin-RevId: 270342454
parent
7fc9c848
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
1 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file @
18b9304f
...
@@ -252,6 +252,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
...
@@ -252,6 +252,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override
@Override
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
transferListener
=
mediaTransferListener
;
transferListener
=
mediaTransferListener
;
drmSessionManager
.
prepare
();
notifySourceInfoRefreshed
(
timelineDurationUs
,
timelineIsSeekable
);
notifySourceInfoRefreshed
(
timelineDurationUs
,
timelineIsSeekable
);
}
}
...
@@ -286,7 +287,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
...
@@ -286,7 +287,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
@Override
@Override
protected
void
releaseSourceInternal
()
{
protected
void
releaseSourceInternal
()
{
// Do nothing.
drmSessionManager
.
release
();
}
}
// ProgressiveMediaPeriod.Listener implementation.
// ProgressiveMediaPeriod.Listener implementation.
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
18b9304f
...
@@ -657,6 +657,7 @@ public final class DashMediaSource extends BaseMediaSource {
...
@@ -657,6 +657,7 @@ public final class DashMediaSource extends BaseMediaSource {
@Override
@Override
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
this
.
mediaTransferListener
=
mediaTransferListener
;
drmSessionManager
.
prepare
();
if
(
sideloadedManifest
)
{
if
(
sideloadedManifest
)
{
processManifest
(
false
);
processManifest
(
false
);
}
else
{
}
else
{
...
@@ -726,6 +727,7 @@ public final class DashMediaSource extends BaseMediaSource {
...
@@ -726,6 +727,7 @@ public final class DashMediaSource extends BaseMediaSource {
expiredManifestPublishTimeUs
=
C
.
TIME_UNSET
;
expiredManifestPublishTimeUs
=
C
.
TIME_UNSET
;
firstPeriodId
=
0
;
firstPeriodId
=
0
;
periodsById
.
clear
();
periodsById
.
clear
();
drmSessionManager
.
release
();
}
}
// PlayerEmsgCallback callbacks.
// PlayerEmsgCallback callbacks.
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
18b9304f
...
@@ -357,6 +357,7 @@ public final class HlsMediaSource extends BaseMediaSource
...
@@ -357,6 +357,7 @@ public final class HlsMediaSource extends BaseMediaSource
@Override
@Override
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
this
.
mediaTransferListener
=
mediaTransferListener
;
drmSessionManager
.
prepare
();
EventDispatcher
eventDispatcher
=
createEventDispatcher
(
/* mediaPeriodId= */
null
);
EventDispatcher
eventDispatcher
=
createEventDispatcher
(
/* mediaPeriodId= */
null
);
playlistTracker
.
start
(
manifestUri
,
eventDispatcher
,
/* listener= */
this
);
playlistTracker
.
start
(
manifestUri
,
eventDispatcher
,
/* listener= */
this
);
}
}
...
@@ -391,6 +392,7 @@ public final class HlsMediaSource extends BaseMediaSource
...
@@ -391,6 +392,7 @@ public final class HlsMediaSource extends BaseMediaSource
@Override
@Override
protected
void
releaseSourceInternal
()
{
protected
void
releaseSourceInternal
()
{
playlistTracker
.
stop
();
playlistTracker
.
stop
();
drmSessionManager
.
release
();
}
}
@Override
@Override
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file @
18b9304f
...
@@ -552,6 +552,7 @@ public final class SsMediaSource extends BaseMediaSource
...
@@ -552,6 +552,7 @@ public final class SsMediaSource extends BaseMediaSource
@Override
@Override
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
protected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
this
.
mediaTransferListener
=
mediaTransferListener
;
drmSessionManager
.
prepare
();
if
(
sideloadedManifest
)
{
if
(
sideloadedManifest
)
{
manifestLoaderErrorThrower
=
new
LoaderErrorThrower
.
Dummy
();
manifestLoaderErrorThrower
=
new
LoaderErrorThrower
.
Dummy
();
processManifest
();
processManifest
();
...
@@ -606,6 +607,7 @@ public final class SsMediaSource extends BaseMediaSource
...
@@ -606,6 +607,7 @@ public final class SsMediaSource extends BaseMediaSource
manifestRefreshHandler
.
removeCallbacksAndMessages
(
null
);
manifestRefreshHandler
.
removeCallbacksAndMessages
(
null
);
manifestRefreshHandler
=
null
;
manifestRefreshHandler
=
null
;
}
}
drmSessionManager
.
release
();
}
}
// Loader.Callback implementation
// Loader.Callback implementation
...
...
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