Commit 0477d0d3 by ibaker Committed by tonihei

Restrict the visibility of some `DefaultDrmSession` methods

These are only used from within the package, so demote them from public
to package-private.

PiperOrigin-RevId: 515029018
parent 68578be3
...@@ -16,6 +16,14 @@ ...@@ -16,6 +16,14 @@
`AudioProcessors` are active, e.g. for gapless trimming `AudioProcessors` are active, e.g. for gapless trimming
([#10847](https://github.com/google/ExoPlayer/issues/10847)). ([#10847](https://github.com/google/ExoPlayer/issues/10847)).
* Encapsulate Opus frames in Ogg packets in direct playbacks (offload). * Encapsulate Opus frames in Ogg packets in direct playbacks (offload).
* DRM:
* Reduce the visibility of several internal-only methods on
`DefaultDrmSession` that aren't expected to be called from outside the
DRM package:
* `void onMediaDrmEvent(int)`
* `void provision()`
* `void onProvisionCompleted()`
* `onProvisionError(Exception, boolean)`
* Transformer: * Transformer:
* Remove `Transformer.Builder.setMediaSourceFactory(MediaSource.Factory)`. * Remove `Transformer.Builder.setMediaSourceFactory(MediaSource.Factory)`.
Use `ExoPlayerAssetLoader.Factory(MediaSource.Factory)` and Use `ExoPlayerAssetLoader.Factory(MediaSource.Factory)` and
......
...@@ -216,7 +216,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -216,7 +216,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
return Arrays.equals(this.sessionId, sessionId); return Arrays.equals(this.sessionId, sessionId);
} }
public void onMediaDrmEvent(int what) { /* package */ void onMediaDrmEvent(int what) {
switch (what) { switch (what) {
case ExoMediaDrm.EVENT_KEY_REQUIRED: case ExoMediaDrm.EVENT_KEY_REQUIRED:
onKeysRequired(); onKeysRequired();
...@@ -228,7 +228,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -228,7 +228,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
// Provisioning implementation. // Provisioning implementation.
public void provision() { /* package */ void provision() {
currentProvisionRequest = mediaDrm.getProvisionRequest(); currentProvisionRequest = mediaDrm.getProvisionRequest();
Util.castNonNull(requestHandler) Util.castNonNull(requestHandler)
.post( .post(
...@@ -237,13 +237,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -237,13 +237,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/* allowRetry= */ true); /* allowRetry= */ true);
} }
public void onProvisionCompleted() { /* package */ void onProvisionCompleted() {
if (openInternal()) { if (openInternal()) {
doLicense(true); doLicense(true);
} }
} }
public void onProvisionError(Exception error, boolean thrownByExoMediaDrm) { /* package */ void onProvisionError(Exception error, boolean thrownByExoMediaDrm) {
onError( onError(
error, error,
thrownByExoMediaDrm thrownByExoMediaDrm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment