Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: media/base/android/media_drm_bridge.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_util.cc ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_drm_bridge.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index a7e7469b492385508569d8234f5e0d600d5324ed..0c4d0d6ef0a54787fab1308f47210ebeb6c8eb35 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -192,8 +192,8 @@ bool IsKeySystemSupportedWithTypeImpl(const std::string& key_system,
base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size());
ScopedJavaLocalRef<jstring> j_container_mime_type =
ConvertUTF8ToJavaString(env, container_mime_type);
- return Java_MediaDrmBridge_isCryptoSchemeSupported(
- env, j_scheme_uuid.obj(), j_container_mime_type.obj());
+ return Java_MediaDrmBridge_isCryptoSchemeSupported(env, j_scheme_uuid,
+ j_container_mime_type);
}
MediaDrmBridge::SecurityLevel GetSecurityLevelFromString(
@@ -355,8 +355,8 @@ void MediaDrmBridge::SetServerCertificate(
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jbyteArray> j_certificate = base::android::ToJavaByteArray(
env, certificate.data(), certificate.size());
- if (Java_MediaDrmBridge_setServerCertificate(env, j_media_drm_.obj(),
- j_certificate.obj())) {
+ if (Java_MediaDrmBridge_setServerCertificate(env, j_media_drm_,
+ j_certificate)) {
promise->resolve();
} else {
promise->reject(INVALID_ACCESS_ERROR, 0, "Set server certificate failed.");
@@ -415,9 +415,9 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
ScopedJavaLocalRef<jstring> j_mime =
ConvertUTF8ToJavaString(env, ConvertInitDataType(init_data_type));
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
- Java_MediaDrmBridge_createSessionFromNative(
- env, j_media_drm_.obj(), j_init_data.obj(), j_mime.obj(),
- j_optional_parameters.obj(), promise_id);
+ Java_MediaDrmBridge_createSessionFromNative(env, j_media_drm_, j_init_data,
+ j_mime, j_optional_parameters,
+ promise_id);
}
void MediaDrmBridge::LoadSession(
@@ -445,8 +445,8 @@ void MediaDrmBridge::UpdateSession(
env, reinterpret_cast<const uint8_t*>(session_id.data()),
session_id.size());
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
- Java_MediaDrmBridge_updateSession(env, j_media_drm_.obj(), j_session_id.obj(),
- j_response.obj(), promise_id);
+ Java_MediaDrmBridge_updateSession(env, j_media_drm_, j_session_id, j_response,
+ promise_id);
}
void MediaDrmBridge::CloseSession(
@@ -460,8 +460,7 @@ void MediaDrmBridge::CloseSession(
env, reinterpret_cast<const uint8_t*>(session_id.data()),
session_id.size());
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
- Java_MediaDrmBridge_closeSession(env, j_media_drm_.obj(), j_session_id.obj(),
- promise_id);
+ Java_MediaDrmBridge_closeSession(env, j_media_drm_, j_session_id, promise_id);
}
void MediaDrmBridge::RemoveSession(
@@ -518,7 +517,7 @@ void MediaDrmBridge::ResetDeviceCredentials(
DCHECK(reset_credentials_cb_.is_null());
reset_credentials_cb_ = callback;
JNIEnv* env = AttachCurrentThread();
- Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
+ Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_);
}
void MediaDrmBridge::ResolvePromise(uint32_t promise_id) {
@@ -682,12 +681,12 @@ void MediaDrmBridge::OnSessionKeysChange(
env, env->GetObjectArrayElement(j_keys_info, i));
ScopedJavaLocalRef<jbyteArray> j_key_id =
- Java_KeyStatus_getKeyId(env, j_key_status.obj());
+ Java_KeyStatus_getKeyId(env, j_key_status);
std::vector<uint8_t> key_id;
JavaByteArrayToByteVector(env, j_key_id.obj(), &key_id);
DCHECK(!key_id.empty());
- jint j_status_code = Java_KeyStatus_getStatusCode(env, j_key_status.obj());
+ jint j_status_code = Java_KeyStatus_getStatusCode(env, j_key_status);
CdmKeyInformation::KeyStatus key_status =
ConvertKeyStatus(static_cast<KeyStatus>(j_status_code));
@@ -797,8 +796,7 @@ MediaDrmBridge::MediaDrmBridge(
// Note: OnMediaCryptoReady() could be called in this call.
j_media_drm_.Reset(Java_MediaDrmBridge_create(
- env, j_scheme_uuid.obj(), j_security_level.obj(),
- reinterpret_cast<intptr_t>(this)));
+ env, j_scheme_uuid, j_security_level, reinterpret_cast<intptr_t>(this)));
}
MediaDrmBridge::~MediaDrmBridge() {
@@ -810,7 +808,7 @@ MediaDrmBridge::~MediaDrmBridge() {
// After the call to Java_MediaDrmBridge_destroy() Java won't call native
// methods anymore, this is ensured by MediaDrmBridge.java.
if (!j_media_drm_.is_null())
- Java_MediaDrmBridge_destroy(env, j_media_drm_.obj());
+ Java_MediaDrmBridge_destroy(env, j_media_drm_);
player_tracker_.NotifyCdmUnset();
@@ -833,7 +831,7 @@ bool MediaDrmBridge::IsSecureDecoderRequired(SecurityLevel security_level) {
MediaDrmBridge::SecurityLevel MediaDrmBridge::GetSecurityLevel() {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> j_security_level =
- Java_MediaDrmBridge_getSecurityLevel(env, j_media_drm_.obj());
+ Java_MediaDrmBridge_getSecurityLevel(env, j_media_drm_);
std::string security_level_str =
ConvertJavaStringToUTF8(env, j_security_level.obj());
return GetSecurityLevelFromString(security_level_str);
@@ -894,8 +892,8 @@ void MediaDrmBridge::ProcessProvisionResponse(bool success,
ScopedJavaLocalRef<jbyteArray> j_response = base::android::ToJavaByteArray(
env, reinterpret_cast<const uint8_t*>(response.data()), response.size());
- Java_MediaDrmBridge_processProvisionResponse(env, j_media_drm_.obj(), success,
- j_response.obj());
+ Java_MediaDrmBridge_processProvisionResponse(env, j_media_drm_, success,
+ j_response);
}
void MediaDrmBridge::OnHasAdditionalUsableKey() {
« no previous file with comments | « media/base/android/media_codec_util.cc ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698