Hold video frame in Bitmap instead of keeping a ByteBuffer reference.

remoting/client/jni/chromoting_jni_runtime.cc

 // Copyright 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 "remoting/client/jni/chromoting_jni_runtime.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/base/yuv_convert.h"
 #include "net/android/net_jni_registrar.h"
 #include "remoting/base/url_request_context.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace {
 
 // Class and package name of the Java class supporting the methods we call.
 const char* const kJavaClass = "org/chromium/chromoting/jni/JniInterface";
 
 const int kBytesPerPixel = 4;
 
 }  // namespace
 
@@ skipping 136 matching lines @@
           "commitPairingCredentials",
           "(Ljava/lang/String;[B[B)V"),
       host_jstr,
       id_arr,
       secret_arr);
 
   // Because we passed them as arguments, their corresponding Java objects were
   // GCd as soon as the managed method returned, so we mustn't release it here.
 }
 
-void ChromotingJniRuntime::UpdateImageBuffer(int width,
-                                             int height,
-                                             jobject buffer) {
+base::android::ScopedJavaLocalRef<jobject> ChromotingJniRuntime::NewBitmap(
+    webrtc::DesktopSize size) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+
+  jobject bitmap = env->CallStaticObjectMethod(

[Yaron, 2013/10/09 06:42:30]

Any reason not to start switching this over to the JNI generator? 

[Lambros, 2013/10/10 01:35:58]

Can it be realistically done as part of this CL? I'd prefer not to hold up
landing this CL on that work, as I've spent too much time on this already :) We
have a bug to track that work here:
https://code.google.com/p/chromium/issues/detail?id=304225 and I want to get to
it ASAP.

[Yaron, 2013/10/10 11:13:37]

Ok fair enough

+      class_,
+      env->GetStaticMethodID(
+          class_,
+          "newBitmap",
+          "(II)Landroid/graphics/Bitmap;"),
+      size.width(),
+      size.height());
+  return base::android::ScopedJavaLocalRef<jobject>(env, bitmap);
+}
+
+void ChromotingJniRuntime::UpdateFrameBitmap(jobject bitmap) {
   DCHECK(display_task_runner_->BelongsToCurrentThread());
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  env->SetStaticIntField(
+
+  env->CallStaticVoidMethod(
       class_,
-      env->GetStaticFieldID(class_, "sWidth", "I"),
-      width);
-  env->SetStaticIntField(
-      class_,
-      env->GetStaticFieldID(class_, "sHeight", "I"),
-      height);
-  env->SetStaticObjectField(
-      class_,
-      env->GetStaticFieldID(class_, "sBuffer", "Ljava/nio/ByteBuffer;"),
-      buffer);
+      env->GetStaticMethodID(
+          class_,
+          "setVideoFrame",
+          "(Landroid/graphics/Bitmap;)V"),
+      bitmap);
 }
 
 void ChromotingJniRuntime::UpdateCursorShape(
     const protocol::CursorShapeInfo& cursor_shape) {
   DCHECK(display_task_runner_->BelongsToCurrentThread());
 
   // const_cast<> is safe as long as the Java updateCursorShape() method copies
   // the data out of the buffer without mutating it, and doesn't keep any
   // reference to the buffer afterwards. Unfortunately, there seems to be no way
   // to create a read-only ByteBuffer from a pointer-to-const.
@@ skipping 25 matching lines @@
       class_,
       env->GetStaticMethodID(class_, "redrawGraphicsInternal", "()V"));
 }
 
 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) {
   base::android::DetachFromVM();
   waiter->Signal();
 }
 
 }  // namespace remoting