Skip to content

Commit

Permalink
Update supported-formats and DrmSessionManager#canAcquireSession
Browse files Browse the repository at this point in the history
Issue:#4022

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192297801
  • Loading branch information
AquilesCanta authored and ojw28 committed Apr 10, 2018
1 parent 3c93142 commit 2084ba7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
* DRM:
* Allow multiple listeners for `DefaultDrmSessionManager`.
* Pass `DrmSessionManager` to `ExoPlayerFactory` instead of `RendererFactory`.
* Change minimum API requirement for CBC and pattern encryption from 24 to 25
([#4022][https://github.com/google/ExoPlayer/issues/4022]).
* Removed default renderer time offset of 60000000 from internal player. The
actual renderer timestamp offset can be obtained by listening to
`BaseRenderer.onStreamChanged`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,9 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
return true;
} else if (C.CENC_TYPE_cbc1.equals(schemeType) || C.CENC_TYPE_cbcs.equals(schemeType)
|| C.CENC_TYPE_cens.equals(schemeType)) {
// AES-CBC and pattern encryption are supported on API 24 onwards.
return Util.SDK_INT >= 24;
// API support for AES-CBC and pattern encryption was added in API 24. However, the
// implementation was not stable until API 25.
return Util.SDK_INT >= 25;
}
// Unknown schemes, assume one of them is supported.
return true;
Expand Down

0 comments on commit 2084ba7

Please sign in to comment.