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

Add useful DownloadRequest to MediaItem conversion method

Browse Source 
PiperOrigin-RevId: 329722775
This commit is contained in:
olly 2020-09-02 17:01:01 +01:00 committed by Oliver Woodman
parent b5a4dc8f36
commit fe2fc8b73f
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View File

@ -550,17 +550,7 @@ public class PlayerActivity extends AppCompatActivity
@Nullable
DownloadRequest downloadRequest =
downloadTracker.getDownloadRequest(checkNotNull(item.playbackProperties).uri);
if (downloadRequest != null) {
MediaItem mediaItem =
item.buildUpon()
.setStreamKeys(downloadRequest.streamKeys)
.setCustomCacheKey(downloadRequest.customCacheKey)
.setDrmKeySetId(downloadRequest.keySetId)
.build();
mediaItems.add(mediaItem);
} else {
mediaItems.add(item);
}
mediaItems.add(downloadRequest != null ? downloadRequest.toMediaItem() : item);
}
return mediaItems;
}

9
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
View File

@ -448,14 +448,7 @@ public final class DownloadHelper {
DataSource.Factory dataSourceFactory,
@Nullable DrmSessionManager drmSessionManager) {
return createMediaSourceInternal(
new MediaItem.Builder()
.setUri(downloadRequest.uri)
.setCustomCacheKey(downloadRequest.customCacheKey)
.setMimeType(downloadRequest.mimeType)
.setStreamKeys(downloadRequest.streamKeys)
.build(),
dataSourceFactory,
drmSessionManager);
downloadRequest.toMediaItem(), dataSourceFactory, drmSessionManager);
}
private final MediaItem.PlaybackProperties playbackProperties;

13
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
View File

@ -22,6 +22,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList;
@ -220,6 +221,18 @@ public final class DownloadRequest implements Parcelable {
newRequest.data);
}
/** Returns a {@link MediaItem} for the content defined by the request. */
public MediaItem toMediaItem() {
return new MediaItem.Builder()
.setMediaId(id)
.setUri(uri)
.setCustomCacheKey(customCacheKey)
.setMimeType(mimeType)
.setStreamKeys(streamKeys)
.setDrmKeySetId(keySetId)
.build();
}
@Override
public String toString() {
return mimeType + ":" + id;