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
556dd7e9
authored
Dec 05, 2018
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge pull request #5187 from BrainCrumbz:feat/get-tag
PiperOrigin-RevId: 224166374
parents
b993367a
a11a8716
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
87 additions
and
0 deletions
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.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/MediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.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
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java
View file @
556dd7e9
...
...
@@ -77,6 +77,12 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
}
@Override
@Nullable
public
Object
getTag
()
{
return
adsMediaSource
.
getTag
();
}
@Override
public
void
prepareSourceInternal
(
final
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
View file @
556dd7e9
...
...
@@ -187,6 +187,12 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
}
@Override
@Nullable
public
Object
getTag
()
{
return
mediaSource
.
getTag
();
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
View file @
556dd7e9
...
...
@@ -454,6 +454,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
}
@Override
@Nullable
public
Object
getTag
()
{
return
null
;
}
@Override
public
final
synchronized
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
@@ -1070,6 +1076,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
}
@Override
@Nullable
public
Object
getTag
()
{
return
null
;
}
@Override
protected
void
releaseSourceInternal
()
{
// Do nothing.
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View file @
556dd7e9
...
...
@@ -359,6 +359,12 @@ public final class ExtractorMediaSource extends BaseMediaSource
}
@Override
@Nullable
public
Object
getTag
()
{
return
tag
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
View file @
556dd7e9
...
...
@@ -65,6 +65,12 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
}
@Override
@Nullable
public
Object
getTag
()
{
return
childSource
.
getTag
();
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
View file @
556dd7e9
...
...
@@ -219,6 +219,12 @@ public interface MediaSource {
*/
void
removeEventListener
(
MediaSourceEventListener
eventListener
);
/** Returns the tag set on the media source, or null if none was set. */
@Nullable
default
Object
getTag
()
{
return
null
;
}
/**
* Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
* updates.
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
View file @
556dd7e9
...
...
@@ -99,6 +99,12 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
}
@Override
@Nullable
public
Object
getTag
()
{
return
mediaSources
.
length
>
0
?
mediaSources
[
0
].
getTag
()
:
null
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
View file @
556dd7e9
...
...
@@ -185,6 +185,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
private
final
LoadErrorHandlingPolicy
loadErrorHandlingPolicy
;
private
final
boolean
treatLoadErrorsAsEndOfStream
;
private
final
Timeline
timeline
;
@Nullable
private
final
Object
tag
;
private
@Nullable
TransferListener
transferListener
;
...
...
@@ -287,6 +288,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
this
.
durationUs
=
durationUs
;
this
.
loadErrorHandlingPolicy
=
loadErrorHandlingPolicy
;
this
.
treatLoadErrorsAsEndOfStream
=
treatLoadErrorsAsEndOfStream
;
this
.
tag
=
tag
;
dataSpec
=
new
DataSpec
(
uri
,
DataSpec
.
FLAG_ALLOW_GZIP
);
timeline
=
new
SinglePeriodTimeline
(
durationUs
,
/* isSeekable= */
true
,
/* isDynamic= */
false
,
tag
);
...
...
@@ -295,6 +297,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
// MediaSource implementation.
@Override
@Nullable
public
Object
getTag
()
{
return
tag
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
View file @
556dd7e9
...
...
@@ -320,6 +320,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
}
@Override
@Nullable
public
Object
getTag
()
{
return
contentMediaSource
.
getTag
();
}
@Override
public
void
prepareSourceInternal
(
final
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
556dd7e9
...
...
@@ -608,6 +608,12 @@ public final class DashMediaSource extends BaseMediaSource {
// MediaSource implementation.
@Override
@Nullable
public
Object
getTag
()
{
return
tag
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
556dd7e9
...
...
@@ -391,6 +391,12 @@ public final class HlsMediaSource extends BaseMediaSource
}
@Override
@Nullable
public
Object
getTag
()
{
return
tag
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file @
556dd7e9
...
...
@@ -504,6 +504,12 @@ public final class SsMediaSource extends BaseMediaSource
// MediaSource implementation.
@Override
@Nullable
public
Object
getTag
()
{
return
tag
;
}
@Override
public
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
View file @
556dd7e9
...
...
@@ -89,6 +89,13 @@ public class FakeMediaSource extends BaseMediaSource {
}
@Override
@Nullable
public
Object
getTag
()
{
boolean
hasTimeline
=
timeline
!=
null
&&
!
timeline
.
isEmpty
();
return
hasTimeline
?
timeline
.
getWindow
(
0
,
new
Timeline
.
Window
()).
tag
:
null
;
}
@Override
public
synchronized
void
prepareSourceInternal
(
ExoPlayer
player
,
boolean
isTopLevelSource
,
...
...
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