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

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

Issue 1014093002: media: Do not call into native MediaDrmBridge after it's destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaDrmBridge.java ('k') | no next file » | 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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 ScopedJavaLocalRef<jbyteArray> j_scheme_uuid = 345 ScopedJavaLocalRef<jbyteArray> j_scheme_uuid =
346 base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size()); 346 base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size());
347 j_media_drm_.Reset(Java_MediaDrmBridge_create( 347 j_media_drm_.Reset(Java_MediaDrmBridge_create(
348 env, j_scheme_uuid.obj(), reinterpret_cast<intptr_t>(this))); 348 env, j_scheme_uuid.obj(), reinterpret_cast<intptr_t>(this)));
349 } 349 }
350 350
351 MediaDrmBridge::~MediaDrmBridge() { 351 MediaDrmBridge::~MediaDrmBridge() {
352 JNIEnv* env = AttachCurrentThread(); 352 JNIEnv* env = AttachCurrentThread();
353 player_tracker_.NotifyCdmUnset(); 353 player_tracker_.NotifyCdmUnset();
354 if (!j_media_drm_.is_null()) 354 if (!j_media_drm_.is_null())
355 Java_MediaDrmBridge_release(env, j_media_drm_.obj()); 355 Java_MediaDrmBridge_destroy(env, j_media_drm_.obj());
356 } 356 }
357 357
358 // static 358 // static
359 // TODO(xhwang): Enable SessionExpirationUpdateCB when it is supported. 359 // TODO(xhwang): Enable SessionExpirationUpdateCB when it is supported.
360 scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create( 360 scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
361 const std::string& key_system, 361 const std::string& key_system,
362 const SessionMessageCB& session_message_cb, 362 const SessionMessageCB& session_message_cb,
363 const SessionClosedCB& session_closed_cb, 363 const SessionClosedCB& session_closed_cb,
364 const SessionErrorCB& session_error_cb, 364 const SessionErrorCB& session_error_cb,
365 const SessionKeysChangeCB& session_keys_change_cb, 365 const SessionKeysChangeCB& session_keys_change_cb,
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 JNIEnv* env = AttachCurrentThread(); 645 JNIEnv* env = AttachCurrentThread();
646 Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj()); 646 Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
647 } 647 }
648 648
649 void MediaDrmBridge::OnResetDeviceCredentialsCompleted( 649 void MediaDrmBridge::OnResetDeviceCredentialsCompleted(
650 JNIEnv* env, jobject, bool success) { 650 JNIEnv* env, jobject, bool success) {
651 base::ResetAndReturn(&reset_credentials_cb_).Run(success); 651 base::ResetAndReturn(&reset_credentials_cb_).Run(success);
652 } 652 }
653 653
654 } // namespace media 654 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaDrmBridge.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698