Simplify VideoReader and VideoWriter

remoting/protocol/connection_to_client.cc

 // Copyright 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 "remoting/protocol/connection_to_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "net/base/io_buffer.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_control_dispatcher.h"
 #include "remoting/protocol/host_event_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
+#include "remoting/protocol/host_video_dispatcher.h"
 #include "remoting/protocol/input_stub.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToClient::ConnectionToClient(protocol::Session* session)
     : handler_(NULL),
       clipboard_stub_(NULL),
       host_stub_(NULL),
       input_stub_(NULL),
@@ skipping 24 matching lines @@
   session_->Close();
 }
 
 void ConnectionToClient::UpdateSequenceNumber(int64 sequence_number) {
   DCHECK(CalledOnValidThread());
   handler_->OnSequenceNumberUpdated(this, sequence_number);
 }
 
 VideoStub* ConnectionToClient::video_stub() {
   DCHECK(CalledOnValidThread());
-  return video_writer_.get();
+  return video_dispatcher_.get();
 }
 
 AudioStub* ConnectionToClient::audio_stub() {
   DCHECK(CalledOnValidThread());
   return audio_writer_.get();
 }
 
 // Return pointer to ClientStub.
 ClientStub* ConnectionToClient::client_stub() {
   DCHECK(CalledOnValidThread());
@@ skipping 57 matching lines @@
 
       event_dispatcher_.reset(new HostEventDispatcher());
       event_dispatcher_->Init(
           session_.get(), session_->config().event_config(),
           base::Bind(&ConnectionToClient::OnChannelInitialized,
                      base::Unretained(this)));
       event_dispatcher_->set_input_stub(input_stub_);
       event_dispatcher_->set_sequence_number_callback(base::Bind(
           &ConnectionToClient::UpdateSequenceNumber, base::Unretained(this)));
 
-      video_writer_ = VideoWriter::Create(session_->config());
-      video_writer_->Init(session_.get(), base::Bind(
-          &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
+      video_dispatcher_.reset(new HostVideoDispatcher());
+      video_dispatcher_->Init(
+          session_.get(), session_->config().video_config(),
+          base::Bind(&ConnectionToClient::OnChannelInitialized,
+                     base::Unretained(this)));
 
       audio_writer_ = AudioWriter::Create(session_->config());
       if (audio_writer_.get()) {
         audio_writer_->Init(
             session_.get(), session_->config().audio_config(),
             base::Bind(&ConnectionToClient::OnChannelInitialized,
                        base::Unretained(this)));
       }
 
       // Notify the handler after initializing the channels, so that
@@ skipping 29 matching lines @@
   NotifyIfChannelsReady();
 }
 
 void ConnectionToClient::NotifyIfChannelsReady() {
   DCHECK(CalledOnValidThread());
 
   if (!control_dispatcher_.get() || !control_dispatcher_->is_connected())
     return;
   if (!event_dispatcher_.get() || !event_dispatcher_->is_connected())
     return;
-  if (!video_writer_.get() || !video_writer_->is_connected())
+  if (!video_dispatcher_.get() || !video_dispatcher_->is_connected())
     return;
   if ((!audio_writer_.get() || !audio_writer_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
   handler_->OnConnectionChannelsConnected(this);
 }
 
 void ConnectionToClient::Close(ErrorCode error) {
   CloseChannels();
   handler_->OnConnectionClosed(this, error);
 }
 
 void ConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
-  video_writer_.reset();
+  video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting