loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tighten the demo app's handling of DrmInitData for downloads

Browse Source 
This code is Widevine specific. `OfflineLicenseHelper.downloadLicense`
requires the passed `Format` to have a `DrmInitData.SchemeData` with
Widevine UUID and non-null `data` field. The demo app tries to check
this in advance (to avoid an exception later), but its checks are
looser than those made by `OfflineLicenseHelper`. This change tightens
the checks to match.

Issue: androidx/media#512
PiperOrigin-RevId: 549587506
(cherry picked from commit 1ccedf84142bec02ee52e76e714c7fc8dc394eea)
This commit is contained in:
ibaker 2023-07-20 12:03:36 +01:00 committed by Tianyi Feng
parent 7352a1be0a
commit eaf4a2b448
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/main/src/main/java/androidx/media3/demo/main/DownloadTracker.java
View File

@ -26,6 +26,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.OptIn; import androidx.annotation.OptIn;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.media3.common.C;
import androidx.media3.common.DrmInitData; import androidx.media3.common.DrmInitData;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.MediaItem; import androidx.media3.common.MediaItem;
@ -51,6 +52,7 @@ import androidx.media3.exoplayer.source.TrackGroupArray;
import androidx.media3.exoplayer.trackselection.MappingTrackSelector.MappedTrackInfo; import androidx.media3.exoplayer.trackselection.MappingTrackSelector.MappedTrackInfo;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
/** Tracks media that has been downloaded. */ /** Tracks media that has been downloaded. */
@ -202,7 +204,7 @@ public class DownloadTracker {
return; return;
} }
// TODO(internal b/163107948): Support cases where DrmInitData are not in the manifest. // TODO(internal b/163107948): Support cases where DrmInitData are not in the manifest.
if (!hasSchemaData(format.drmInitData)) { if (!hasNonNullWidevineSchemaData(format.drmInitData)) {
Toast.makeText(context, R.string.download_start_error_offline_license, Toast.LENGTH_LONG) Toast.makeText(context, R.string.download_start_error_offline_license, Toast.LENGTH_LONG)
.show(); .show();
Log.e( Log.e(
@ -323,12 +325,14 @@ public class DownloadTracker {
} }
/** /**
* Returns whether any the {@link DrmInitData.SchemeData} contained in {@code drmInitData} has * Returns whether any {@link DrmInitData.SchemeData} that {@linkplain
* non-null {@link DrmInitData.SchemeData#data}. * DrmInitData.SchemeData#matches(UUID) matches} {@link C#WIDEVINE_UUID} has non-null {@link
* DrmInitData.SchemeData#data}.
*/ */
private boolean hasSchemaData(DrmInitData drmInitData) { private boolean hasNonNullWidevineSchemaData(DrmInitData drmInitData) {
for (int i = 0; i < drmInitData.schemeDataCount; i++) { for (int i = 0; i < drmInitData.schemeDataCount; i++) {
if (drmInitData.get(i).hasData()) { DrmInitData.SchemeData schemeData = drmInitData.get(i);
if (schemeData.matches(C.WIDEVINE_UUID) && schemeData.hasData()) {
return true; return true;
} }
} }