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

Side by Side Diff: media/base/android/media_drm_bridge.cc

Issue 23545029: EME: Handle NO_KEY and resume playback after key is added. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/android/media_drm_bridge.h" 5 #include "media/base/android/media_drm_bridge.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 base::android::ToJavaByteArray(env, &pssh_data[0], pssh_data.size()); 228 base::android::ToJavaByteArray(env, &pssh_data[0], pssh_data.size());
229 ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, type); 229 ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, type);
230 Java_MediaDrmBridge_generateKeyRequest( 230 Java_MediaDrmBridge_generateKeyRequest(
231 env, j_media_drm_.obj(), j_pssh_data.obj(), j_mime.obj()); 231 env, j_media_drm_.obj(), j_pssh_data.obj(), j_mime.obj());
232 return true; 232 return true;
233 } 233 }
234 234
235 void MediaDrmBridge::AddKey(const uint8* key, int key_length, 235 void MediaDrmBridge::AddKey(const uint8* key, int key_length,
236 const uint8* init_data, int init_data_length, 236 const uint8* init_data, int init_data_length,
237 const std::string& session_id) { 237 const std::string& session_id) {
238 DVLOG(1) << __FUNCTION__;
238 JNIEnv* env = AttachCurrentThread(); 239 JNIEnv* env = AttachCurrentThread();
239 ScopedJavaLocalRef<jbyteArray> j_key_data = 240 ScopedJavaLocalRef<jbyteArray> j_key_data =
240 base::android::ToJavaByteArray(env, key, key_length); 241 base::android::ToJavaByteArray(env, key, key_length);
241 ScopedJavaLocalRef<jstring> j_session_id = 242 ScopedJavaLocalRef<jstring> j_session_id =
242 ConvertUTF8ToJavaString(env, session_id); 243 ConvertUTF8ToJavaString(env, session_id);
243 Java_MediaDrmBridge_addKey( 244 Java_MediaDrmBridge_addKey(
244 env, j_media_drm_.obj(), j_session_id.obj(), j_key_data.obj()); 245 env, j_media_drm_.obj(), j_session_id.obj(), j_key_data.obj());
245 } 246 }
246 247
247 void MediaDrmBridge::CancelKeyRequest(const std::string& session_id) { 248 void MediaDrmBridge::CancelKeyRequest(const std::string& session_id) {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 std::string security_level_str = 316 std::string security_level_str =
316 ConvertJavaStringToUTF8(env, j_security_level.obj()); 317 ConvertJavaStringToUTF8(env, j_security_level.obj());
317 return GetSecurityLevelFromString(security_level_str); 318 return GetSecurityLevelFromString(security_level_str);
318 } 319 }
319 320
320 bool MediaDrmBridge::IsProtectedSurfaceRequired() { 321 bool MediaDrmBridge::IsProtectedSurfaceRequired() {
321 return IsSecureDecoderRequired(GetSecurityLevel()); 322 return IsSecureDecoderRequired(GetSecurityLevel());
322 } 323 }
323 324
324 } // namespace media 325 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698