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

Side by Side Diff: content/browser/media/android/media_drm_credential_manager.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Partially addressed Xiaohan's comments Created 5 years, 2 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "content/browser/media/android/media_drm_credential_manager.h" 5 #include "content/browser/media/android/media_drm_credential_manager.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 SecurityLevel security_level) { 93 SecurityLevel security_level) {
94 media_drm_bridge_ = 94 media_drm_bridge_ =
95 media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem); 95 media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem);
96 if (!media_drm_bridge_) 96 if (!media_drm_bridge_)
97 return false; 97 return false;
98 98
99 ResetCredentialsCB reset_credentials_cb = 99 ResetCredentialsCB reset_credentials_cb =
100 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted, 100 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted,
101 base::Unretained(this), security_level); 101 base::Unretained(this), security_level);
102 102
103 if (!media_drm_bridge_->SetSecurityLevel(security_level)) { 103 media::MediaDrmBridge* media_drm_bridge =
104 static_cast<media::MediaDrmBridge*>(media_drm_bridge_.get());
105
106 if (!media_drm_bridge->SetSecurityLevel(security_level)) {
104 // No need to reset credentials for unsupported |security_level|. 107 // No need to reset credentials for unsupported |security_level|.
105 base::ThreadTaskRunnerHandle::Get()->PostTask( 108 base::ThreadTaskRunnerHandle::Get()->PostTask(
106 FROM_HERE, base::Bind(reset_credentials_cb, true)); 109 FROM_HERE, base::Bind(reset_credentials_cb, true));
107 return true; 110 return true;
108 } 111 }
109 112
110 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); 113 media_drm_bridge->ResetDeviceCredentials(reset_credentials_cb);
111 return true; 114 return true;
112 } 115 }
113 116
114 // static 117 // static
115 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { 118 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) {
116 return RegisterNativesImpl(env); 119 return RegisterNativesImpl(env);
117 } 120 }
118 121
119 } // namespace content 122 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698