Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8....

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/host/capturer.h"
-#include "remoting/proto/video.pb.h"
+// TODO(hclam): This class should not know the internal protobuf types.
+#include "remoting/proto/internal.pb.h"
 
 namespace remoting {
 
 class CaptureData;
 class ClientConnection;
 
 // A class for controlling and coordinate Capturer, Encoder
 // and NetworkChannel in a record session.
 //
 // THREADING
@@ skipping 90 matching lines @@
 
   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 DoSendVideoPacket(VideoPacket* packet);
+  void DoSendUpdate(ChromotingHostMessage* 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<CaptureData> capture_data);
 
   // EncodeDataAvailableTask takes ownership of header and is responsible for
   // deleting it.
-  void EncodeDataAvailableTask(VideoPacket* packet);
+  void EncodeDataAvailableTask(ChromotingHostMessage* message,
+                               Encoder::EncodingState state);
 
   // Message loops used by this class.
   MessageLoop* capture_loop_;
   MessageLoop* encode_loop_;
   MessageLoop* network_loop_;
 
   // Reference to the capturer. This member is always accessed on the capture
   // thread.
   scoped_ptr<Capturer> capturer_;
 
@@ skipping 21 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_