mirror of
https://github.com/samsonjs/media.git
synced 2026-04-27 15:07:40 +00:00
More demo app unstable API opt-in and reshuffling
Follow-up to <unknown commit> PiperOrigin-RevId: 437777871
This commit is contained in:
parent
1168c419d1
commit
544bb8546c
1 changed files with 21 additions and 22 deletions
|
|
@ -509,29 +509,28 @@ public class PlayerActivity extends AppCompatActivity
|
||||||
private static List<MediaItem> createMediaItems(Intent intent, DownloadTracker downloadTracker) {
|
private static List<MediaItem> createMediaItems(Intent intent, DownloadTracker downloadTracker) {
|
||||||
List<MediaItem> mediaItems = new ArrayList<>();
|
List<MediaItem> mediaItems = new ArrayList<>();
|
||||||
for (MediaItem item : IntentUtil.createMediaItemsFromIntent(intent)) {
|
for (MediaItem item : IntentUtil.createMediaItemsFromIntent(intent)) {
|
||||||
@Nullable
|
mediaItems.add(
|
||||||
DownloadRequest downloadRequest =
|
maybeSetDownloadProperties(
|
||||||
downloadTracker.getDownloadRequest(item.localConfiguration.uri);
|
item, downloadTracker.getDownloadRequest(item.localConfiguration.uri)));
|
||||||
if (downloadRequest != null) {
|
|
||||||
MediaItem.Builder builder = item.buildUpon();
|
|
||||||
builder
|
|
||||||
.setMediaId(downloadRequest.id)
|
|
||||||
.setUri(downloadRequest.uri)
|
|
||||||
.setCustomCacheKey(downloadRequest.customCacheKey)
|
|
||||||
.setMimeType(downloadRequest.mimeType)
|
|
||||||
.setStreamKeys(downloadRequest.streamKeys);
|
|
||||||
@Nullable
|
|
||||||
MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
|
|
||||||
if (drmConfiguration != null) {
|
|
||||||
builder.setDrmConfiguration(
|
|
||||||
drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build());
|
|
||||||
}
|
|
||||||
|
|
||||||
mediaItems.add(builder.build());
|
|
||||||
} else {
|
|
||||||
mediaItems.add(item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return mediaItems;
|
return mediaItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static MediaItem maybeSetDownloadProperties(
|
||||||
|
MediaItem item, @Nullable DownloadRequest downloadRequest) {
|
||||||
|
MediaItem.Builder builder = item.buildUpon();
|
||||||
|
builder
|
||||||
|
.setMediaId(downloadRequest.id)
|
||||||
|
.setUri(downloadRequest.uri)
|
||||||
|
.setCustomCacheKey(downloadRequest.customCacheKey)
|
||||||
|
.setMimeType(downloadRequest.mimeType)
|
||||||
|
.setStreamKeys(downloadRequest.streamKeys);
|
||||||
|
@Nullable
|
||||||
|
MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
|
||||||
|
if (drmConfiguration != null) {
|
||||||
|
builder.setDrmConfiguration(
|
||||||
|
drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build());
|
||||||
|
}
|
||||||
|
return builder.build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue