Support creating secure decoder in MediaCodecBridge.

media/base/android/media_drm_bridge.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_drm_bridge.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback_helpers.h"
@@ skipping 134 matching lines @@
     const std::string& security_level_str) {
   if (0 == security_level_str.compare("L1"))
     return MediaDrmBridge::SECURITY_LEVEL_1;
   if (0 == security_level_str.compare("L3"))
     return MediaDrmBridge::SECURITY_LEVEL_3;
   DCHECK(security_level_str.empty());
   return MediaDrmBridge::SECURITY_LEVEL_NONE;
 }
 
 // static
-MediaDrmBridge* MediaDrmBridge::Create(int media_keys_id,
-                                       const std::vector<uint8>& scheme_uuid,
-                                       const std::string& security_level,
-                                       MediaPlayerManager* manager) {
-  if (!IsAvailable() || scheme_uuid.empty())
-    return NULL;
+scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
+    int media_keys_id,
+    const std::vector<uint8>& scheme_uuid,
+    const std::string& security_level,
+    MediaPlayerManager* manager) {
+  scoped_ptr<MediaDrmBridge> media_drm_bridge;
 
-  // TODO(qinmin): check whether the uuid is valid.
-  return new MediaDrmBridge(
-      media_keys_id, scheme_uuid, security_level, manager);
+  if (IsAvailable() && !scheme_uuid.empty()) {
+    // TODO(qinmin): check whether the uuid is valid.
+    media_drm_bridge.reset(
+      new MediaDrmBridge(media_keys_id, scheme_uuid, security_level, manager));
+    if (media_drm_bridge->j_media_drm_.is_null())
+      media_drm_bridge.reset();
+  }
+
+  return media_drm_bridge.Pass();
 }
 
 // static
 bool MediaDrmBridge::IsAvailable() {
   return base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
 }
 
 // static
 bool MediaDrmBridge::IsSecureDecoderRequired(
     const std::string& security_level_str) {
@@ skipping 31 matching lines @@
       base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size());
   ScopedJavaLocalRef<jstring> j_security_level =
       ConvertUTF8ToJavaString(env, security_level);
   j_media_drm_.Reset(Java_MediaDrmBridge_create(
       env, j_scheme_uuid.obj(), j_security_level.obj(),
       reinterpret_cast<intptr_t>(this)));
 }
 
 MediaDrmBridge::~MediaDrmBridge() {
   JNIEnv* env = AttachCurrentThread();
-  Java_MediaDrmBridge_release(env, j_media_drm_.obj());
+  if (!j_media_drm_.is_null()) {
+    Java_MediaDrmBridge_release(env, j_media_drm_.obj());
+    j_media_drm_.Reset();

[qinmin, 2013/09/05 22:15:31]

ScopedJavaGlobalRef will do this for you

[xhwang, 2013/09/06 02:17:47]

Done.

+  }
 }
 
 bool MediaDrmBridge::GenerateKeyRequest(const std::string& type,
                                         const uint8* init_data,
                                         int init_data_length) {
   std::vector<uint8> pssh_data;
   if (!GetPsshData(init_data, init_data_length, scheme_uuid_, &pssh_data))
     return false;
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 88 matching lines @@
   std::string security_level_str =
       ConvertJavaStringToUTF8(env, j_security_level.obj());
   return GetSecurityLevelFromString(security_level_str);
 }
 
 bool MediaDrmBridge::IsProtectedSurfaceRequired() {
   return IsSecureDecoderRequired(GetSecurityLevel());
 }
 
 }  // namespace media