Allow shaped-desktop hosts to send shape only when it changes.

remoting/client/software_video_renderer.h

 // Copyright 2014 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_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
 #define REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "remoting/client/chromoting_stats.h"
-#include "remoting/client/frame_consumer_proxy.h"
+#include "remoting/client/frame_consumer.h"
 #include "remoting/client/frame_producer.h"
 #include "remoting/client/video_renderer.h"
 #include "remoting/protocol/video_stub.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
 class ChromotingStats;
 
 // Implementation of VideoRenderer interface that decodes frame on CPU (on a
 // decode thread) and then passes decoded frames to a FrameConsumer.
 // FrameProducer methods can be called on any thread. All other methods must be
-// called on the main thread. Owned must ensure that this class outlives
-// FrameConsumer (which calls FrameProducer interface).
+// called on the main thread.
 class SoftwareVideoRenderer : public VideoRenderer,
                               public protocol::VideoStub,
                               public FrameProducer,
                               public base::NonThreadSafe {
  public:
   // Creates an update decoder on |main_task_runner_| and |decode_task_runner_|,
   // outputting to |consumer|. The |main_task_runner_| is responsible for
   // receiving and queueing packets. The |decode_task_runner_| is responsible
-  // for decoding the video packets.
-  // TODO(wez): Replace the ref-counted proxy with an owned FrameConsumer.
+  // for decoding the video packets. |consumer| must remain valid until the
+  // SoftwareVideoRenderer is destroyed, but the caller must also ensure that
+  // the |consumer| makes no more FrameProducer API calls beyond that point.
   SoftwareVideoRenderer(
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
-      scoped_refptr<FrameConsumerProxy> consumer);
+      FrameConsumer* consumer);
   ~SoftwareVideoRenderer() override;
 
   // VideoRenderer interface.
   void OnSessionConfig(const protocol::SessionConfig& config) override;
   ChromotingStats* GetStats() override;
   protocol::VideoStub* GetVideoStub() override;
 
   // protocol::VideoStub interface.
   void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                           const base::Closure& done) override;
@@ skipping 19 matching lines @@
   void OnPacketDone(base::Time decode_start, const base::Closure& done);
 
   scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
   scoped_ptr<Core> core_;
 
   ChromotingStats stats_;
 
   // Keep track of the latest event timestamp bounced back from the host.
   int64 latest_event_timestamp_;
 
+  // Used to decouple the Core from the FrameConsumer during teardown.
+  base::WeakPtrFactory<FrameConsumer> weak_frame_consumer_;
+
   base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_