Release media player resources when device is locked

media/base/android/media_player_bridge.cc

 // Copyright (c) 2012 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_player_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 56 matching lines @@
   resource_getter->GetCookies(url_, first_party_for_cookies_, base::Bind(
       &MediaPlayerBridge::OnCookiesRetrieved, weak_this_.GetWeakPtr()));
 }
 
 void MediaPlayerBridge::CreateJavaMediaPlayerBridge() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   j_media_player_bridge_.Reset(Java_MediaPlayerBridge_create(env));
 
+  if (!surface_.IsEmpty()) {
+    JNIEnv* env = base::android::AttachCurrentThread();

[qinmin, 2013/11/22 18:06:55]

env is already defined inside this function.

+    CHECK(env);
+    Java_MediaPlayerBridge_setSurface(
+        env, j_media_player_bridge_.obj(), surface_.j_surface().obj());
+  }
+
   SetMediaPlayerListener();
 }
 
 void MediaPlayerBridge::SetJavaMediaPlayerBridge(
     jobject j_media_player_bridge) {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   j_media_player_bridge_.Reset(env, j_media_player_bridge);
 }
@@ skipping 16 matching lines @@
   duration_ = duration;
 }
 
 void MediaPlayerBridge::SetVideoSurface(gfx::ScopedJavaSurface surface) {
   if (j_media_player_bridge_.is_null()) {
     if (surface.IsEmpty())
       return;
     Prepare();
   }
 
+  surface_ = surface.Pass();
+
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   Java_MediaPlayerBridge_setSurface(
-      env, j_media_player_bridge_.obj(), surface.j_surface().obj());
+      env, j_media_player_bridge_.obj(), surface_.j_surface().obj());
 }
 
 void MediaPlayerBridge::Prepare() {
   DCHECK(j_media_player_bridge_.is_null());
   CreateJavaMediaPlayerBridge();
   if (url_.SchemeIsFileSystem()) {
     manager()->GetMediaResourceGetter()->GetPlatformPathFromFileSystemURL(
             url_, base::Bind(&MediaPlayerBridge::SetDataSource,
                              weak_this_.GetWeakPtr()));
   } else {
@@ skipping 130 matching lines @@
 
 void MediaPlayerBridge::Release() {
   if (j_media_player_bridge_.is_null())
     return;
 
   time_update_timer_.Stop();
   if (prepared_)
     pending_seek_ = GetCurrentTime();
   prepared_ = false;
   pending_play_ = false;
-  SetVideoSurface(gfx::ScopedJavaSurface());
 
+  // Detach the surface from the java side player. We still hold our reference
+  // to it because we might reuse it when restarting with a new player.
   JNIEnv* env = base::android::AttachCurrentThread();
+  Java_MediaPlayerBridge_setSurface(env, j_media_player_bridge_.obj(), NULL);
+
   Java_MediaPlayerBridge_release(env, j_media_player_bridge_.obj());
   j_media_player_bridge_.Reset();
   manager()->ReleaseMediaResources(player_id());
   listener_.ReleaseMediaPlayerListenerResources();
 }
 
 void MediaPlayerBridge::SetVolume(double volume) {
   if (j_media_player_bridge_.is_null())
     return;
 
@@ skipping 140 matching lines @@
 
 GURL MediaPlayerBridge::GetUrl() {
   return url_;
 }
 
 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
   return first_party_for_cookies_;
 }
 
 }  // namespace media