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

Update supported-formats and DrmSessionManager#canAcquireSession

Browse Source 
Issue:#4022

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192297801
This commit is contained in:
aquilescanta 2018-04-10 09:35:06 -07:00 committed by Oliver Woodman
parent 3c93142a4e
commit 2084ba7b05
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

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

5
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -491,8 +491,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
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;