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

remoting/host/session_manager.cc

 // 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.
 
 #include "remoting/host/session_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 310 matching lines @@
   }
   DCHECK_NE(new_rate, -1.0);
 
   // Then set the rate.
   capture_loop_->PostTask(
       FROM_HERE,
       NewTracedMethod(this, &SessionManager::DoSetRate, new_rate));
   ScheduleNextRateControl();
 }
 
-void SessionManager::DoSendVideoPacket(VideoPacket* packet) {
+void SessionManager::DoSendUpdate(ChromotingHostMessage* message,
+                                  Encoder::EncodingState state) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
   TraceContext::tracer()->PrintString("DoSendUpdate");
 
   for (ClientConnectionList::const_iterator i = clients_.begin();
        i < clients_.end(); ++i) {
-    (*i)->SendVideoPacket(*packet);
+    (*i)->SendUpdateStreamPacketMessage(*message);
   }
-  delete packet;
+
+  delete message;
 
   TraceContext::tracer()->PrintString("DoSendUpdate done");
 }
 
 void SessionManager::DoSendInit(scoped_refptr<ClientConnection> client,
                                 int width, int height) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
   // Sends the client init information.
   client->SendInitClientMessage(width, height);
@@ skipping 39 matching lines @@
   }
 
   // TODO(hclam): Enable |force_refresh| if a new client was
   // added.
   TraceContext::tracer()->PrintString("Encode start");
   encoder_->Encode(capture_data, false,
                    NewCallback(this, &SessionManager::EncodeDataAvailableTask));
   TraceContext::tracer()->PrintString("Encode Done");
 }
 
-void SessionManager::EncodeDataAvailableTask(VideoPacket* packet) {
+void SessionManager::EncodeDataAvailableTask(
+    ChromotingHostMessage* message, Encoder::EncodingState state) {
   DCHECK_EQ(encode_loop_, MessageLoop::current());
 
-  bool last = (packet->flags() & VideoPacket::LAST_PACKET) != 0;
-
   // Before a new encode task starts, notify clients a new update
   // stream is coming.
   // Notify this will keep a reference to the DataBuffer in the
   // task. The ownership will eventually pass to the ClientConnections.
   network_loop_->PostTask(
       FROM_HERE,
-      NewTracedMethod(this, &SessionManager::DoSendVideoPacket, packet));
+      NewTracedMethod(this, &SessionManager::DoSendUpdate, message, state));
 
-  if (last) {
+  if (state & Encoder::EncodingEnded) {
     capture_loop_->PostTask(
         FROM_HERE, NewTracedMethod(this, &SessionManager::DoFinishEncode));
   }
 }
 
 }  // namespace remoting