Moving Encoder and Decoder to remoting/base

remoting/host/session_manager.h

 // Copyright (c) 2010 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.
 
 #ifndef REMOTING_HOST_RECORD_SESSION_H_
 #define REMOTING_HOST_RECORD_SESSION_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "remoting/base/encoder.h"
 #include "remoting/base/protocol/chromotocol.pb.h"
 #include "remoting/host/capturer.h"
-#include "remoting/host/encoder.h"
 
 namespace media {
 
 class DataBuffer;
 
 }  // namespace media
 
 namespace remoting {
 
-class Encoder;
+class CaptureData;
 class ClientConnection;
 
 // A class for controlling and coordinate Capturer, Encoder
 // and NetworkChannel in a record session.
 //
 // THREADING
 //
 // This class works on three threads, namely capture, encode and network
 // thread. The main function of this class is to coordinate and schedule
 // capture, encode and transmission of data on different threads.
@@ skipping 70 matching lines @@
   void DoStart();
   void DoPause();
 
   void DoSetRate(double rate);
   void DoSetMaxRate(double max_rate);
 
   // Hepler method to schedule next capture using the current rate.
   void ScheduleNextCapture();
 
   void DoCapture();
-  void CaptureDoneCallback(scoped_refptr<Capturer::CaptureData> capture_data);
+  void CaptureDoneCallback(scoped_refptr<CaptureData> capture_data);
   void DoFinishEncode();
 
   void DoGetInitInfo(scoped_refptr<ClientConnection> client);
 
   // Network thread -----------------------------------------------------------
 
   void DoStartRateControl();
   void DoPauseRateControl();
 
   // Helper method to schedule next rate regulation task.
   void ScheduleNextRateControl();
 
   void DoRateControl();
 
   // DoSendUpdate takes ownership of header and is responsible for deleting it.
   void DoSendUpdate(HostMessage* message,
                     Encoder::EncodingState state);
   void DoSendInit(scoped_refptr<ClientConnection> client,
                   int width, int height);
 
   void DoAddClient(scoped_refptr<ClientConnection> client);
   void DoRemoveClient(scoped_refptr<ClientConnection> client);
   void DoRemoveAllClients();
 
   // Encoder thread -----------------------------------------------------------
 
-  void DoEncode(scoped_refptr<Capturer::CaptureData> capture_data);
+  void DoEncode(scoped_refptr<CaptureData> capture_data);
 
   // EncodeDataAvailableTask takes ownership of header and is responsible for
   // deleting it.
   void EncodeDataAvailableTask(HostMessage* message,
                                Encoder::EncodingState state);
 
   // Message loops used by this class.
   MessageLoop* capture_loop_;
   MessageLoop* encode_loop_;
   MessageLoop* network_loop_;
@@ skipping 26 matching lines @@
 
   // The following member is accessed on the network thread.
   bool rate_control_started_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionManager);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_RECORD_SESSION_H_