Add support for drawing video onto a Java ByteBuffer

remoting/client/jni/chromoting_jni_instance.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_instance.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/jni/chromoting_jni.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 
 namespace {
 // TODO(solb) Move into location shared with client plugin.
 const char* const CHAT_SERVER = "talk.google.com";

[Wez, 2013/07/16 18:45:53]

IIRC 'const' at file scope is implicitly static-linked so you don't need the
anonymous namespace here.

[solb, 2013/07/16 21:35:41]

Done.

 const int CHAT_PORT = 5222;
 const bool CHAT_USE_TLS = true;
 const char* const CHAT_AUTH_METHOD = "oauth2";
 }  // namespace
 
 namespace remoting {
 
 ChromotingJniInstance::ChromotingJniInstance(const char* username,
                                                   const char* auth_token,

[Wez, 2013/07/16 18:45:53]

nit: Indentation

[solb, 2013/07/16 21:35:41]

Done.

                                                   const char* host_jid,
                                                   const char* host_id,
                                                   const char* host_pubkey) {
   DCHECK(ChromotingJni::GetInstance()->
       ui_task_runner()->BelongsToCurrentThread());
 
   username_ = username;
   auth_token_ = auth_token;
   host_jid_ = host_jid;
   host_id_ = host_id;
   host_pubkey_ = host_pubkey;
 
   ChromotingJni::GetInstance()->display_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChromotingJniInstance::ConnectToHostOnDisplayThread,
                  this));
 }
 
-ChromotingJniInstance::~ChromotingJniInstance() {}
+ChromotingJniInstance::~ChromotingJniInstance() {
+  // Invalidate weak pointers to |view_| before it is destroyed.
+  view_weak_factory_->InvalidateWeakPtrs();

[Wez, 2013/07/16 18:45:53]

nit: Since you only grab a WeakPtr to the view at construction time, you could
just reset() view_weak_factory_ here, or even leave it to invalidate the WeakPtr
when the scoped_ptr<> holding it tears it down, though that would mean you'd
need the |view| and |view_weak_factory| member order to be correct (I think it
currently is). Up to you.

[solb, 2013/07/16 21:35:41]

Done.

+}
 
 void ChromotingJniInstance::Cleanup() {
   if (!ChromotingJni::GetInstance()->
       network_task_runner()->BelongsToCurrentThread()) {
     ChromotingJni::GetInstance()->network_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&ChromotingJniInstance::Cleanup, this));
     return;
   }
 
   username_ = "";
   auth_token_ = "";
   host_jid_ = "";
   host_id_ = "";
   host_pubkey_ = "";
 
-  // |client_| must be torn down before |signaling_|.
+  // We reset these manually because they must be destroyed on the network
+  // thread. |client_| must be torn down before |signaling_|.
   pin_callback_.Reset();
   client_.reset();
   connection_.reset();
   client_context_.reset();
   client_config_.reset();
   signaling_.reset();
   signaling_config_.reset();
   network_settings_.reset();
 }
 
 void ChromotingJniInstance::ProvideSecret(const char* pin) {
   DCHECK(ChromotingJni::GetInstance()->
       ui_task_runner()->BelongsToCurrentThread());
   DCHECK(!pin_callback_.is_null());
 
   // We invoke the string constructor to ensure |pin| gets copied *before* the
   // asynchronous run, since Java might want it back as soon as we return.
   ChromotingJni::GetInstance()->network_task_runner()->PostTask(FROM_HERE,
                                  base::Bind(pin_callback_, pin));
 }
 
+void ChromotingJniInstance::RedrawDesktop() {
+  if (!ChromotingJni::GetInstance()->
+      display_task_runner()->BelongsToCurrentThread()) {
+    ChromotingJni::GetInstance()->display_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&ChromotingJniInstance::RedrawDesktop,
+                   this));
+    return;
+  }
+
+  ChromotingJni::GetInstance()->RedrawCanvas();
+}
+
 void ChromotingJniInstance::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
   if (!ChromotingJni::GetInstance()->
       ui_task_runner()->BelongsToCurrentThread()) {
     ChromotingJni::GetInstance()->
         ui_task_runner()->PostTask(
             FROM_HERE,
             base::Bind(&ChromotingJniInstance::OnConnectionState,
                        this,
@@ skipping 29 matching lines @@
 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
     ChromotingJniInstance::GetTokenFetcher(const std::string& host_public_key) {
   // Return null to indicate that third-party authentication is unsupported.
   return scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>();
 }
 
 void ChromotingJniInstance::ConnectToHostOnDisplayThread() {
   DCHECK(ChromotingJni::GetInstance()->
       display_task_runner()->BelongsToCurrentThread());
 
-  if (!frame_consumer_.get()) {
-    frame_consumer_ = new FrameConsumerProxy(
-        ChromotingJni::GetInstance()->display_task_runner());
-    // TODO(solb) Instantiate some FrameConsumer implementation and attach it.
-  }
+  frame_consumer_ = new FrameConsumerProxy(
+      ChromotingJni::GetInstance()->display_task_runner());
+  view_.reset(new JniFrameConsumer());
+  view_weak_factory_.reset(new base::WeakPtrFactory<JniFrameConsumer>(
+      view_.get()));
+  frame_consumer_->Attach(view_weak_factory_->GetWeakPtr());
 
   ChromotingJni::GetInstance()->network_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChromotingJniInstance::ConnectToHostOnNetworkThread,
                  this));
 }
 
 void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
   DCHECK(ChromotingJni::GetInstance()->
       network_task_runner()->BelongsToCurrentThread());
@@ skipping 19 matching lines @@
 
   connection_.reset(new protocol::ConnectionToHost(true));
 
   client_.reset(new ChromotingClient(*client_config_,
                                      client_context_.get(),
                                      connection_.get(),
                                      this,
                                      frame_consumer_,
                                      scoped_ptr<AudioPlayer>()));
 
+  view_->set_frame_producer(client_->GetFrameProducer());
+
   signaling_config_.reset(new XmppSignalStrategy::XmppServerConfig());
   signaling_config_->host = CHAT_SERVER;
   signaling_config_->port = CHAT_PORT;
   signaling_config_->use_tls = CHAT_USE_TLS;
 
   signaling_.reset(new XmppSignalStrategy(
       ChromotingJni::GetInstance()->url_requester(),
       username_,
       auth_token_,
       CHAT_AUTH_METHOD,
@@ skipping 21 matching lines @@
                    pairable,
                    callback));
     return;
   }
 
   pin_callback_ = callback;
   ChromotingJni::GetInstance()->DisplayAuthenticationPrompt();
 }
 
 }  // namespace remoting