Refactor VideoStub interface to accept ownership of video packets.

remoting/host/screen_recorder.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/screen_recorder.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 222 matching lines @@
 }
 
 // Network thread --------------------------------------------------------------
 
 void ScreenRecorder::DoSendVideoPacket(scoped_ptr<VideoPacket> packet) {
   DCHECK(network_loop_->BelongsToCurrentThread());
 
   if (network_stopped_ || connections_.empty())
     return;
 
-  VideoPacket* packet_ptr = packet.get();
+  base::Closure callback;
+  if ((packet->flags() & VideoPacket::LAST_PARTITION) != 0)
+    callback = base::Bind(&ScreenRecorder::VideoFrameSentCallback, this);
 
   // TODO(sergeyu): Currently we send the data only to the first
   // connection. Send it to all connections if necessary.
   connections_.front()->video_stub()->ProcessVideoPacket(
-      packet_ptr, base::Bind(
-          &ScreenRecorder::VideoPacketSentCallback, this,
-          base::Passed(packet.Pass())));
+      packet.Pass(), callback);
 }
 
-void ScreenRecorder::VideoPacketSentCallback(scoped_ptr<VideoPacket> packet) {
+void ScreenRecorder::VideoFrameSentCallback() {
+  DCHECK(network_loop_->BelongsToCurrentThread());
+
   if (network_stopped_)
     return;
 
-  if ((packet->flags() & VideoPacket::LAST_PARTITION) != 0) {
-    // Post DoFinishOneRecording() if that was the last packet for the
-    // frame.
-    capture_loop_->PostTask(
-        FROM_HERE, base::Bind(&ScreenRecorder::DoFinishOneRecording, this));
-  }
+  capture_loop_->PostTask(
+      FROM_HERE, base::Bind(&ScreenRecorder::DoFinishOneRecording, this));
 }
 
 void ScreenRecorder::DoStopOnNetworkThread(const base::Closure& done_task) {
   DCHECK(network_loop_->BelongsToCurrentThread());
 
   // There could be tasks on the network thread when this method is being
   // executed. By setting the flag we'll not post anymore tasks from network
   // thread.
   //
   // After that a task is posted on encode thread to continue the stop
@@ skipping 54 matching lines @@
     packet->set_encode_time_ms(encode_time_ms);
     scheduler_.RecordEncodeTime(encode_time);
   }
 
   network_loop_->PostTask(
       FROM_HERE, base::Bind(&ScreenRecorder::DoSendVideoPacket, this,
                             base::Passed(packet.Pass())));
 }
 
 }  // namespace remoting