Commit adf457dc authored by xhwang's avatar xhwang Committed by Commit bot

media: Fix MediaDrmBridge::SetServerCertificate().

BUG=582194
TEST=Tested with local test and makes sure the certificate is passed from JS to
MediaDrm.

Review URL: https://codereview.chromium.org/1648073002

Cr-Commit-Position: refs/heads/master@{#372195}
parent bfec595e
...@@ -303,12 +303,13 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport( ...@@ -303,12 +303,13 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport(
void MediaDrmBridge::SetServerCertificate( void MediaDrmBridge::SetServerCertificate(
const std::vector<uint8_t>& certificate, const std::vector<uint8_t>& certificate,
scoped_ptr<media::SimpleCdmPromise> promise) { scoped_ptr<media::SimpleCdmPromise> promise) {
DVLOG(2) << __FUNCTION__; DVLOG(2) << __FUNCTION__ << "(" << certificate.size() << " bytes)";
DCHECK(!certificate.empty()); DCHECK(!certificate.empty());
JNIEnv* env = AttachCurrentThread(); JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jbyteArray> j_certificate; ScopedJavaLocalRef<jbyteArray> j_certificate = base::android::ToJavaByteArray(
env, certificate.data(), certificate.size());
if (Java_MediaDrmBridge_setServerCertificate(env, j_media_drm_.obj(), if (Java_MediaDrmBridge_setServerCertificate(env, j_media_drm_.obj(),
j_certificate.obj())) { j_certificate.obj())) {
promise->resolve(); promise->resolve();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment