diff options
| author | Xiaohan Wang <xhwang@chromium.org> | 2016-01-28 16:00:26 -0800 |
|---|---|---|
| committer | Xiaohan Wang <xhwang@chromium.org> | 2016-01-29 00:01:41 +0000 |
| commit | a87d83bbf400474ced280572bc161c52c9a24b4c (patch) | |
| tree | 1d8cd6c42e796ba49bde9df02d92afb3b5c91f5d /media | |
| parent | 796f6dab549a5c883977bfa2f4fa38a7cd5858e9 (diff) | |
| download | chromium_src-a87d83bbf400474ced280572bc161c52c9a24b4c.zip chromium_src-a87d83bbf400474ced280572bc161c52c9a24b4c.tar.gz chromium_src-a87d83bbf400474ced280572bc161c52c9a24b4c.tar.bz2 | |
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}
(cherry picked from commit adf457dc99de743900c30f46cc2cc6f136ee81f0)
Review URL: https://codereview.chromium.org/1645813003 .
Cr-Commit-Position: refs/branch-heads/2623@{#180}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/media_drm_bridge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc index 4b877be..0633c31 100644 --- a/media/base/android/media_drm_bridge.cc +++ b/media/base/android/media_drm_bridge.cc @@ -303,12 +303,13 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport( void MediaDrmBridge::SetServerCertificate( const std::vector<uint8_t>& certificate, scoped_ptr<media::SimpleCdmPromise> promise) { - DVLOG(2) << __FUNCTION__; + DVLOG(2) << __FUNCTION__ << "(" << certificate.size() << " bytes)"; DCHECK(!certificate.empty()); 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(), j_certificate.obj())) { promise->resolve(); |