Add VideoProcessor interface.

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 <android/log.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/jni/android_keymap.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
+#include "remoting/client/software_video_renderer.h"
 #include "remoting/jingle_glue/chromium_port_allocator.h"
 #include "remoting/jingle_glue/chromium_socket_factory.h"
 #include "remoting/jingle_glue/network_settings.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 
 namespace remoting {
 
 namespace {
 
@@ skipping 156 matching lines @@
 
 void ChromotingJniInstance::RecordPaintTime(int64 paint_time_ms) {
   if (!jni_runtime_->network_task_runner()->BelongsToCurrentThread()) {
     jni_runtime_->network_task_runner()->PostTask(
         FROM_HERE, base::Bind(&ChromotingJniInstance::RecordPaintTime, this,
                               paint_time_ms));
     return;
   }
 
   if (stats_logging_enabled_)
-    client_->GetStats()->video_paint_ms()->Record(paint_time_ms);
+    video_renderer_->GetStats()->video_paint_ms()->Record(paint_time_ms);
 }
 
 void ChromotingJniInstance::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   EnableStatsLogging(state == protocol::ConnectionToHost::CONNECTED);
 
   if (create_pairing_ && state == protocol::ConnectionToHost::CONNECTED) {
@@ skipping 89 matching lines @@
 
 void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   client_context_.reset(new ClientContext(
       jni_runtime_->network_task_runner().get()));
   client_context_->Start();
 
   connection_.reset(new protocol::ConnectionToHost(true));
 
+  SoftwareVideoRenderer* renderer =
+      new SoftwareVideoRenderer(client_context_->main_task_runner(),
+                                client_context_->decode_task_runner(),
+                                frame_consumer_);
+  view_->set_frame_producer(renderer);
+  video_renderer_.reset(renderer);
+
   client_.reset(new ChromotingClient(
       client_config_, client_context_.get(), connection_.get(),
-      this, frame_consumer_, scoped_ptr<AudioPlayer>()));
+      this, video_renderer_.get(), scoped_ptr<AudioPlayer>()));
 
-  view_->set_frame_producer(client_->GetFrameProducer());
 
   signaling_.reset(new XmppSignalStrategy(
       net::ClientSocketFactory::GetDefaultFactory(),
       jni_runtime_->url_requester(), xmpp_config_));
 
   NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_ENABLED);
 
   // Use Chrome's network stack to allocate ports for peer-to-peer channels.
   scoped_ptr<ChromiumPortAllocator> port_allocator(
       ChromiumPortAllocator::Create(jni_runtime_->url_requester(),
@@ skipping 50 matching lines @@
   }
   stats_logging_enabled_ = enabled;
 }
 
 void ChromotingJniInstance::LogPerfStats() {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   if (!stats_logging_enabled_)
     return;
 
-  ChromotingStats* stats = client_->GetStats();
+  ChromotingStats* stats = video_renderer_->GetStats();
   __android_log_print(ANDROID_LOG_INFO, "stats",
                       "Bandwidth:%.0f FrameRate:%.1f Capture:%.1f Encode:%.1f "
                       "Decode:%.1f Render:%.1f Latency:%.0f",
                       stats->video_bandwidth()->Rate(),
                       stats->video_frame_rate()->Rate(),
                       stats->video_capture_ms()->Average(),
                       stats->video_encode_ms()->Average(),
                       stats->video_decode_ms()->Average(),
                       stats->video_paint_ms()->Average(),
                       stats->round_trip_ms()->Average());
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 }  // namespace remoting