Adds load info to DrmSessionEventListeneronDrmKeysLoaded()
#1134
+253
−44
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package androidx.media3.exoplayer.drm; | ||
|
|
||
| import androidx.annotation.Nullable; | ||
| import androidx.media3.common.DrmInitData.SchemeData; | ||
| import androidx.media3.common.util.Assertions; | ||
| import androidx.media3.exoplayer.source.LoadEventInfo; | ||
| import com.google.common.collect.ImmutableList; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import org.checkerframework.checker.nullness.qual.MonotonicNonNull; | ||
|
|
||
| /** | ||
| * Encapsulates info for the sequence of load requests ({@link LoadEventInfo}, which were required | ||
| * to complete loading a DRM key | ||
| */ | ||
| public class KeyRequestInfo { | ||
|
There was a problem hiding this comment. Refactor renamed, in prep for other license requests beside Key load. |
||
|
|
||
| public static class Builder { | ||
| @MonotonicNonNull private LoadEventInfo loadEventInfo; | ||
| private final List<LoadEventInfo> retriedLoadRequests; | ||
| @Nullable private final List<SchemeData> schemeDatas; | ||
|
|
||
|
There was a problem hiding this comment. Clean up the lint,
|
||
| public Builder(@Nullable List<SchemeData> schemeDatas) { | ||
| this.schemeDatas = schemeDatas; | ||
| retriedLoadRequests = new ArrayList<>(); | ||
| loadEventInfo = null; | ||
| } | ||
|
|
||
| public Builder setMainLoadRequest(LoadEventInfo loadEventInfo) { | ||
| this.loadEventInfo = loadEventInfo; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder addRetryLoadRequest(LoadEventInfo loadEventInfo) { | ||
| retriedLoadRequests.add(loadEventInfo); | ||
| return this; | ||
| } | ||
|
|
||
| public KeyRequestInfo build() { | ||
| Assertions.checkNotNull(loadEventInfo, "build() called before setMainLoadRequest()"); | ||
| return new KeyRequestInfo(this); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * The {@link LoadEventInfo} for the initial request to laod the key, or null if no load required | ||
| */ | ||
| public final LoadEventInfo loadEventInfo; | ||
|
|
||
| /** If the load required multiple retries, the {@link LoadEventInfo} for each retry */ | ||
| public final ImmutableList<LoadEventInfo> retriedLoadRequests; | ||
|
|
||
| /** | ||
| * The DRM {@link SchemeData} that identifies the loaded key, or null if this session uses offline | ||
| * keys. // TODO add sessionId to the KeyLoadInfo maybe? | ||
| */ | ||
| @Nullable public final ImmutableList<SchemeData> schemeDatas; | ||
|
|
||
| private KeyRequestInfo(Builder builder) { | ||
| retriedLoadRequests = | ||
| new ImmutableList.Builder<LoadEventInfo>().addAll(builder.retriedLoadRequests).build(); | ||
| loadEventInfo = builder.loadEventInfo; | ||
| schemeDatas = builder.schemeDatas == null ? null : ImmutableList.copyOf(builder.schemeDatas); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might be useful if you want the trails of
LoadEventInfo's including redirects in the path. The mainLoadEventInfoshould include all the time.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this will report all (most? any?) redirects - because at least some types of redirect will be 'silently' handled inside the
HttpDataSourceimplementation underneathHttpMediaDrmCallback, e.g.media/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java
Line 594 in 0480bc3
So I think we need to be quite careful we can usefully describe what this field holds, because i think it will only show retries that happened at this
DefaultDrmSessionlayer.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is certainly true for
DefaultHttpDataSource, not sure forCronet. something we'll look into, as our servers are using this as a method to hold off clients when they are loaded. Also, the POST data is retained in theHttpMediaDrmCallbackso not sure if the POST redirect in the stack will do this correctly.We'll have a look and let you know, definitely preference would be to do it in the
HttpMediaDrmCallbackas the default redirect following code in lower layers usually is much higher than 5 tries.FWIW this is the same as how other
Loader/Loadableimplementations handle this.Definitely something to look into.