Simplify VideoEncoder interface.

remoting/host/video_scheduler.cc

 // Copyright (c) 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/host/video_scheduler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 277 matching lines @@
     scoped_ptr<VideoPacket> packet(new VideoPacket());
     packet->set_flags(VideoPacket::LAST_PARTITION);
     packet->set_client_sequence_number(sequence_number);
     network_task_runner_->PostTask(
         FROM_HERE, base::Bind(&VideoScheduler::SendVideoPacket, this,
                               base::Passed(&packet)));
     capture_task_runner_->DeleteSoon(FROM_HERE, frame.release());
     return;
   }
 
-  encoder_->Encode(
-      frame.get(), base::Bind(&VideoScheduler::EncodedDataAvailableCallback,
-                              this, sequence_number));
-  capture_task_runner_->DeleteSoon(FROM_HERE, frame.release());
-}
+  scoped_ptr<VideoPacket> packet = encoder_->Encode(*frame);
+  packet->set_client_sequence_number(sequence_number);
 
-void VideoScheduler::EncodedDataAvailableCallback(
-    int64 sequence_number,
-    scoped_ptr<VideoPacket> packet) {
-  DCHECK(encode_task_runner_->BelongsToCurrentThread());
-
-  packet->set_client_sequence_number(sequence_number);
+  // Destroy the frame before sending |packet| because SendVideoPacket() may
+  // trigger another frame to be captured, and the screen capturer expects the
+  // old frame to be freed by then.
+  frame.reset();
 
   bool last = (packet->flags() & VideoPacket::LAST_PACKET) != 0;
   if (last) {
     scheduler_.RecordEncodeTime(
         base::TimeDelta::FromMilliseconds(packet->encode_time_ms()));
   }
 
   network_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VideoScheduler::SendVideoPacket, this,
                             base::Passed(&packet)));
 }
 
 }  // namespace remoting