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
25d9f76a
authored
Mar 26, 2020
by
bachinger
Committed by
Oliver Woodman
Mar 27, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
deprecate createMediaSource with uri argument
PiperOrigin-RevId: 303217607
parent
777d99da
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
37 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
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/ExtractorMediaSource.java
View file @
25d9f76a
...
@@ -168,12 +168,9 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
...
@@ -168,12 +168,9 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
throw
new
UnsupportedOperationException
();
throw
new
UnsupportedOperationException
();
}
}
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Returns a new {@link ExtractorMediaSource} using the current parameters.
@SuppressWarnings
(
"deprecation"
)
*
@Deprecated
* @param uri The {@link Uri uri}.
* @return The new {@link ExtractorMediaSource}.
*/
@Override
@Override
public
ExtractorMediaSource
createMediaSource
(
Uri
uri
)
{
public
ExtractorMediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
View file @
25d9f76a
...
@@ -66,13 +66,9 @@ public interface MediaSourceFactory {
...
@@ -66,13 +66,9 @@ public interface MediaSourceFactory {
*/
*/
MediaSource
createMediaSource
(
MediaItem
mediaItem
);
MediaSource
createMediaSource
(
MediaItem
mediaItem
);
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Creates a new {@link MediaSource} with the specified {@code uri}.
@Deprecated
*
* @param uri The URI to play.
* @return The new {@link MediaSource media source}.
*/
default
MediaSource
createMediaSource
(
Uri
uri
)
{
default
MediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
(
));
return
createMediaSource
(
MediaItem
.
fromUri
(
uri
));
}
}
}
}
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file @
25d9f76a
...
@@ -164,12 +164,9 @@ public final class ProgressiveMediaSource extends BaseMediaSource
...
@@ -164,12 +164,9 @@ public final class ProgressiveMediaSource extends BaseMediaSource
return
this
;
return
this
;
}
}
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Returns a new {@link ProgressiveMediaSource} using the current parameters.
@SuppressWarnings
(
"deprecation"
)
*
@Deprecated
* @param uri The {@link Uri uri}.
* @return The new {@link ProgressiveMediaSource}.
*/
@Override
@Override
public
ProgressiveMediaSource
createMediaSource
(
Uri
uri
)
{
public
ProgressiveMediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
25d9f76a
...
@@ -307,12 +307,9 @@ public final class DashMediaSource extends BaseMediaSource {
...
@@ -307,12 +307,9 @@ public final class DashMediaSource extends BaseMediaSource {
return
mediaSource
;
return
mediaSource
;
}
}
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Returns a new {@link DashMediaSource} using the current parameters.
@SuppressWarnings
(
"deprecation"
)
*
@Deprecated
* @param uri The {@link Uri uri}.
* @return The new {@link DashMediaSource}.
*/
@Override
@Override
public
DashMediaSource
createMediaSource
(
Uri
uri
)
{
public
DashMediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
25d9f76a
...
@@ -327,12 +327,9 @@ public final class HlsMediaSource extends BaseMediaSource
...
@@ -327,12 +327,9 @@ public final class HlsMediaSource extends BaseMediaSource
return
mediaSource
;
return
mediaSource
;
}
}
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Returns a new {@link HlsMediaSource} using the current parameters.
@SuppressWarnings
(
"deprecation"
)
*
@Deprecated
* @param uri The {@link Uri uri}.
* @return The new {@link HlsMediaSource}.
*/
@Override
@Override
public
HlsMediaSource
createMediaSource
(
Uri
uri
)
{
public
HlsMediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file @
25d9f76a
...
@@ -217,12 +217,9 @@ public final class SsMediaSource extends BaseMediaSource
...
@@ -217,12 +217,9 @@ public final class SsMediaSource extends BaseMediaSource
return
this
;
return
this
;
}
}
/**
/** @deprecated Use {@link #createMediaSource(MediaItem)} instead. */
* Returns a new {@link SsMediaSource} using the current parameters.
@SuppressWarnings
(
"deprecation"
)
*
@Deprecated
* @param uri The {@link Uri uri}.
* @return The new {@link SsMediaSource}.
*/
@Override
@Override
public
SsMediaSource
createMediaSource
(
Uri
uri
)
{
public
SsMediaSource
createMediaSource
(
Uri
uri
)
{
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
return
createMediaSource
(
new
MediaItem
.
Builder
().
setSourceUri
(
uri
).
build
());
...
...
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