Move android mediaplayer from render process to browser process.

content/browser/android/surface_texture_peer_browser_impl.cc

Index: content/browser/android/surface_texture_peer_browser_impl.cc
diff --git a/content/browser/android/surface_texture_peer_browser_impl.cc b/content/browser/android/surface_texture_peer_browser_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..daf375c94761f15799993451c134ddb0eced237e
--- /dev/null
+++ b/content/browser/android/surface_texture_peer_browser_impl.cc
@@ -0,0 +1,93 @@
+// 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 "content/browser/android/surface_texture_peer_browser_impl.h"
+
+#include "content/browser/android/media_player_manager_android.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/common/android/surface_callback.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "media/base/android/media_player_bridge.h"
+
+#include "jni/BrowserProcessSurfaceTexture_jni.h"
+
+namespace content {
+
+void SetSurfacePeer(jobject j_surface,
+                    base::ProcessHandle pid,
+                    int primary_id,
+                    int secondary_id) {
+  int renderer_id = 0;
+  RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
+  while (!it.IsAtEnd()) {
+    if (it.GetCurrentValue()->GetHandle() == pid) {
+      renderer_id = it.GetCurrentValue()->GetID();
+      break;
+    }
+    it.Advance();
+  }
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  DCHECK(env);
+  if (renderer_id) {
+    RenderViewHostImpl* host = RenderViewHostImpl::FromID(
+        renderer_id, primary_id);
+    if (host) {
+      media::MediaPlayerBridge* player =
+          host->media_player_manager()->GetPlayer(secondary_id);
+      if (player) {
+          player->SetVideoSurface(j_surface);
+      }
+    }
+  }
+
+  ReleaseSurface(j_surface);
+  env->DeleteGlobalRef(j_surface);
+}
+
+SurfaceTexturePeerBrowserImpl::SurfaceTexturePeerBrowserImpl(
+    bool player_in_render_process)
+    : player_in_render_process_(player_in_render_process) {
+}
+
+SurfaceTexturePeerBrowserImpl::~SurfaceTexturePeerBrowserImpl() {
+  if (surface_.obj())
+    ReleaseSurface(surface_.obj());
+}
+
+void SurfaceTexturePeerBrowserImpl::EstablishSurfaceTexturePeer(
+    base::ProcessHandle pid,
+    SurfaceTextureTarget type,
+    jobject j_surface_texture,
+    int primary_id,
+    int secondary_id) {
+  if (j_surface_texture == NULL)
+    return;
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  DCHECK(env);
+  if (player_in_render_process_) {
+    Java_BrowserProcessSurfaceTexture_establishSurfaceTexturePeer(
+        env, pid, type, j_surface_texture, primary_id, secondary_id);
+  } else {
+    base::android::ScopedJavaLocalRef<jclass> cls(
+        base::android::GetClass(env, "android/view/Surface"));
+    jmethodID constructor = GetMethodID(env, cls, "<init>",
+        "(Landroid/graphics/SurfaceTexture;)V");
+    ScopedJavaLocalRef<jobject> tmp(env,
+        env->NewObject(cls.obj(), constructor, j_surface_texture));
+    jobject surface = env->NewGlobalRef(tmp.obj());

[Yaron, 2012/09/05 07:03:56]

Use ScopedJavaGlobalRef?

[qinmin, 2012/09/05 19:34:42]

This is problematic as we cannot pass a ScopedJavaGlobalRef to setSurfacePeer
using bind. If we use another callback from SetSurfacePeer() to notify surface
texture has been set and release the stored global ref in this class, then we
face the problem that this function cannot be called simultaneously by more than
2 callers.

+
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+        base::Bind(&SetSurfacePeer, surface,
+                   pid, primary_id, secondary_id));
+  }
+}
+
+bool RegisterBrowserProcessSurfaceTexture(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+}  // namespace content