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
2a765f6b
authored
Jun 27, 2019
by
tonihei
Committed by
Oliver Woodman
Jul 02, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Visibility clean-up: Don't extend visibility of protected methods in overrides.
PiperOrigin-RevId: 255412493
parent
1bd73eb7
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
24 additions
and
24 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.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
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
View file @
2a765f6b
...
...
@@ -193,7 +193,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
super
.
prepareSourceInternal
(
mediaTransferListener
);
prepareChildSource
(
/* id= */
null
,
mediaSource
);
}
...
...
@@ -228,7 +228,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
super
.
releaseSourceInternal
();
clippingError
=
null
;
clippingTimeline
=
null
;
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
View file @
2a765f6b
...
...
@@ -44,7 +44,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
@Override
@CallSuper
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
eventHandler
=
new
Handler
();
}
...
...
@@ -59,7 +59,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
@Override
@CallSuper
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
for
(
MediaSourceAndListener
childSource
:
childSources
.
values
())
{
childSource
.
mediaSource
.
releaseSource
(
childSource
.
listener
);
childSource
.
mediaSource
.
removeEventListener
(
childSource
.
eventListener
);
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View file @
2a765f6b
...
...
@@ -339,7 +339,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
progressiveMediaSource
.
prepareSource
(
/* listener= */
this
,
mediaTransferListener
);
}
...
...
@@ -359,7 +359,7 @@ public final class ExtractorMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
progressiveMediaSource
.
releaseSource
(
/* listener= */
this
);
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
View file @
2a765f6b
...
...
@@ -71,7 +71,7 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
super
.
prepareSourceInternal
(
mediaTransferListener
);
prepareChildSource
(
/* id= */
null
,
childSource
);
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
View file @
2a765f6b
...
...
@@ -104,7 +104,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
super
.
prepareSourceInternal
(
mediaTransferListener
);
for
(
int
i
=
0
;
i
<
mediaSources
.
length
;
i
++)
{
prepareChildSource
(
i
,
mediaSources
[
i
]);
...
...
@@ -140,7 +140,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
super
.
releaseSourceInternal
();
Arrays
.
fill
(
timelines
,
null
);
primaryManifest
=
null
;
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file @
2a765f6b
...
...
@@ -228,7 +228,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
transferListener
=
mediaTransferListener
;
notifySourceInfoRefreshed
(
timelineDurationUs
,
timelineIsSeekable
);
}
...
...
@@ -262,7 +262,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
// Do nothing.
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
View file @
2a765f6b
...
...
@@ -66,7 +66,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
refreshSourceInfo
(
new
SinglePeriodTimeline
(
durationUs
,
/* isSeekable= */
true
,
/* isDynamic= */
false
),
/* manifest= */
null
);
...
...
@@ -84,7 +84,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
public
void
releasePeriod
(
MediaPeriod
mediaPeriod
)
{}
@Override
p
ublic
void
releaseSourceInternal
()
{}
p
rotected
void
releaseSourceInternal
()
{}
private
static
final
class
SilenceMediaPeriod
implements
MediaPeriod
{
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
View file @
2a765f6b
...
...
@@ -302,7 +302,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
transferListener
=
mediaTransferListener
;
refreshSourceInfo
(
timeline
,
/* manifest= */
null
);
}
...
...
@@ -331,7 +331,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
// Do nothing.
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
View file @
2a765f6b
...
...
@@ -193,7 +193,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
super
.
prepareSourceInternal
(
mediaTransferListener
);
ComponentListener
componentListener
=
new
ComponentListener
();
this
.
componentListener
=
componentListener
;
...
...
@@ -259,7 +259,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
super
.
releaseSourceInternal
();
Assertions
.
checkNotNull
(
componentListener
).
release
();
componentListener
=
null
;
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
2a765f6b
...
...
@@ -630,7 +630,7 @@ public final class DashMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
if
(
sideloadedManifest
)
{
processManifest
(
false
);
...
...
@@ -679,7 +679,7 @@ public final class DashMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
manifestLoadPending
=
false
;
dataSource
=
null
;
if
(
loader
!=
null
)
{
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
2a765f6b
...
...
@@ -333,7 +333,7 @@ public final class HlsMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
EventDispatcher
eventDispatcher
=
createEventDispatcher
(
/* mediaPeriodId= */
null
);
playlistTracker
.
start
(
manifestUri
,
eventDispatcher
,
/* listener= */
this
);
...
...
@@ -366,7 +366,7 @@ public final class HlsMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
playlistTracker
.
stop
();
}
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file @
2a765f6b
...
...
@@ -525,7 +525,7 @@ public final class SsMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
p
rotected
void
prepareSourceInternal
(
@Nullable
TransferListener
mediaTransferListener
)
{
this
.
mediaTransferListener
=
mediaTransferListener
;
if
(
sideloadedManifest
)
{
manifestLoaderErrorThrower
=
new
LoaderErrorThrower
.
Dummy
();
...
...
@@ -568,7 +568,7 @@ public final class SsMediaSource extends BaseMediaSource
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
manifest
=
sideloadedManifest
?
manifest
:
null
;
manifestDataSource
=
null
;
manifestLoadStartTimestamp
=
0
;
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
View file @
2a765f6b
...
...
@@ -137,7 +137,7 @@ public class FakeMediaSource extends BaseMediaSource {
}
@Override
p
ublic
void
releaseSourceInternal
()
{
p
rotected
void
releaseSourceInternal
()
{
assertThat
(
preparedSource
).
isTrue
();
assertThat
(
releasedSource
).
isFalse
();
assertThat
(
activeMediaPeriods
.
isEmpty
()).
isTrue
();
...
...
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