| Index: media/base/android/media_drm_bridge.h
|
| diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
|
| index 04e57fc6ee197986eaf695edcaa9165078b4b45d..d5408c1c06e26b1bc3f251a7efc89f4e96231384 100644
|
| --- a/media/base/android/media_drm_bridge.h
|
| +++ b/media/base/android/media_drm_bridge.h
|
| @@ -55,9 +55,9 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys, public PlayerTracker {
|
| using MediaCryptoReadyCB = base::Callback<void(JavaObjectPtr media_crypto,
|
| bool needs_protected_surface)>;
|
|
|
| - // Checks whether MediaDRM is available.
|
| - // All other static methods check IsAvailable() internally. There's no need
|
| - // to check IsAvailable() explicitly before calling them.
|
| + // Checks whether MediaDRM is available and usable, including for decoding.
|
| + // All other static methods check IsAvailable() or equivalent internally.
|
| + // There is no need to check IsAvailable() explicitly before calling them.
|
| static bool IsAvailable();
|
|
|
| static bool RegisterMediaDrmBridge(JNIEnv* env);
|
| @@ -243,6 +243,16 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys, public PlayerTracker {
|
| // For DeleteSoon() in DeleteOnCorrectThread().
|
| friend class base::DeleteHelper<MediaDrmBridge>;
|
|
|
| + static scoped_refptr<MediaDrmBridge> CreateInternal(
|
| + const std::string& key_system,
|
| + SecurityLevel security_level,
|
| + const CreateFetcherCB& create_fetcher_cb,
|
| + const SessionMessageCB& session_message_cb,
|
| + const SessionClosedCB& session_closed_cb,
|
| + const LegacySessionErrorCB& legacy_session_error_cb,
|
| + const SessionKeysChangeCB& session_keys_change_cb,
|
| + const SessionExpirationUpdateCB& session_expiration_update_cb);
|
| +
|
| // Constructs a MediaDrmBridge for |scheme_uuid| and |security_level|. The
|
| // default security level will be used if |security_level| is
|
| // SECURITY_LEVEL_DEFAULT. Sessions should not be created if session callbacks
|
|
|