sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restrict the visibility of some DefaultDrmSession methods

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

PiperOrigin-RevId: 515029018
This commit is contained in:
ibaker 2023-03-08 15:15:34 +00:00 committed by tonihei
parent 68578be372
commit 0477d0d338
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
RELEASENOTES.md
View file

@ -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

8
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java
View file

@ -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;
// 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;
/* 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