loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deprecate createMediaSource with uri argument

Browse Source 
PiperOrigin-RevId: 303217607
This commit is contained in:
bachinger 2020-03-26 23:28:21 +00:00 committed by Oliver Woodman
parent 777d99da8a
commit 25d9f76a07
6 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View File

@ -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());

10
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
View File

@ -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));
} }
} }

9
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View File

@ -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());

9
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -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());

9
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View File

@ -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());

9
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View File

@ -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());