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

remoting/client/jni/jni_frame_consumer.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/jni_frame_consumer.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "remoting/client/frame_producer.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
-namespace {
-
-// Allocates its buffer within a Java direct byte buffer, where it can be
-// accessed by both native and managed code.
-class DirectDesktopFrame : public webrtc::BasicDesktopFrame {
- public:
-  DirectDesktopFrame(int width, int height);
-
-  virtual ~DirectDesktopFrame();
-
-  jobject buffer() const {
-    return buffer_;
-  }
-
- private:
-  jobject buffer_;
-};
-
-DirectDesktopFrame::DirectDesktopFrame(int width, int height)
-    : webrtc::BasicDesktopFrame(webrtc::DesktopSize(width, height)) {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  buffer_ = env->NewDirectByteBuffer(data(), stride()*height);
-}
-
-DirectDesktopFrame::~DirectDesktopFrame() {}
-
-}  // namespace
-
 namespace remoting {
 
 JniFrameConsumer::JniFrameConsumer(ChromotingJniRuntime* jni_runtime)
     : jni_runtime_(jni_runtime),
       in_dtor_(false),
       frame_producer_(NULL) {
 }
 
 JniFrameConsumer::~JniFrameConsumer() {
   // Stop giving the producer a buffer to work with.
@@ skipping 10 matching lines @@
   frame_producer_ = producer;
 }
 
 void JniFrameConsumer::ApplyBuffer(const SkISize& view_size,
                                    const SkIRect& clip_area,
                                    webrtc::DesktopFrame* buffer,
                                    const SkRegion& region) {
   DCHECK(jni_runtime_->display_task_runner()->BelongsToCurrentThread());
 
   scoped_ptr<webrtc::DesktopFrame> buffer_scoped(buffer);
-  jni_runtime_->RedrawCanvas();
+
+  jni_runtime_->UpdateImageBuffer(view_size.width(), view_size.height(),
+                                  buffer->data());
 
   if (view_size.width() > view_size_.width() ||
       view_size.height() > view_size_.height()) {
     LOG(INFO) << "Existing buffer is too small";
     view_size_ = view_size;
 
     // Manually destroy the old buffer before allocating a new one to prevent
     // our memory footprint from temporarily ballooning.
     buffer_scoped.reset();
     AllocateBuffer();
@@ skipping 28 matching lines @@
 void JniFrameConsumer::AllocateBuffer() {
   // Only do anything if we're not being destructed.
   if (!in_dtor_) {
     if (!jni_runtime_->display_task_runner()->BelongsToCurrentThread()) {
       jni_runtime_->display_task_runner()->PostTask(FROM_HERE,
           base::Bind(&JniFrameConsumer::AllocateBuffer,
                      base::Unretained(this)));
       return;
     }
 
-    DirectDesktopFrame* buffer = new DirectDesktopFrame(view_size_.width(),
-                                                        view_size_.height());
-
-    // Update Java's reference to the buffer and record of its dimensions.
-    jni_runtime_->UpdateImageBuffer(view_size_.width(),
-                                        view_size_.height(),
-                                        buffer->buffer());
-
+    webrtc::DesktopSize size(view_size_.width(), view_size_.height());
+    webrtc::DesktopFrame* buffer = new webrtc::BasicDesktopFrame(size);
     frame_producer_->DrawBuffer(buffer);
   }
 }
 
 }  // namespace remoting