More cleanups in FrameStats

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 <stdint.h>
 
 #include <memory>
@@ skipping 14 matching lines @@
 class DesktopFrame;
 }  // namespace webrtc
 
 namespace remoting {
 
 class VideoDecoder;
 
 namespace protocol {
 class FrameConsumer;
 struct FrameStats;
-class PerformanceTracker;
+class FrameStatsConsumer;
 }  // namespace protocol
 
 // Implementation of VideoRenderer interface that decodes frame on CPU (on a
 // decode thread) and then passes decoded frames to a FrameConsumer.
 class SoftwareVideoRenderer : public protocol::VideoRenderer,
                               public protocol::VideoStub {
  public:
   // The renderer can be created on any thread but afterwards all methods must
   // be called on the same thread.
-  SoftwareVideoRenderer(protocol::FrameConsumer* consumer);
+  explicit SoftwareVideoRenderer(protocol::FrameConsumer* consumer);
 
   // Deprecated constructor. TODO(yuweih): remove.
   // Constructs the renderer and initializes it immediately. Caller should not
   // call Initialize() after using this constructor.
   // All methods must be called on the same thread the renderer is created. The
-  // |decode_task_runner_| is used to decode the video packets. |perf_tracker|
-  // must outlive the renderer. |perf_tracker| may be nullptr, performance
-  // tracking is disabled in that case.
+  // |decode_task_runner_| is used to decode the video packets. |consumer| and
+  // |stats_consumer| must outlive the renderer. |stats_consumer| may be
+  // nullptr, performance tracking is disabled in that case.
   SoftwareVideoRenderer(
       scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
       protocol::FrameConsumer* consumer,
-      protocol::PerformanceTracker* perf_tracker);
+      protocol::FrameStatsConsumer* stats_consumer);
   ~SoftwareVideoRenderer() override;
 
   // VideoRenderer interface.
   bool Initialize(const ClientContext& client_context,
-                  protocol::PerformanceTracker* perf_tracker) override;
+                  protocol::FrameStatsConsumer* stats_consumer) override;
   void OnSessionConfig(const protocol::SessionConfig& config) override;
   protocol::VideoStub* GetVideoStub() override;
   protocol::FrameConsumer* GetFrameConsumer() override;
+  protocol::FrameStatsConsumer* GetFrameStatsConsumer() override;
 
   // protocol::VideoStub interface.
   void ProcessVideoPacket(std::unique_ptr<VideoPacket> packet,
                           const base::Closure& done) override;
 
  private:
   void RenderFrame(std::unique_ptr<protocol::FrameStats> stats,
                    const base::Closure& done,
                    std::unique_ptr<webrtc::DesktopFrame> frame);
   void OnFrameRendered(std::unique_ptr<protocol::FrameStats> stats,
                        const base::Closure& done);
 
   scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
-  protocol::FrameConsumer* consumer_;
-  protocol::PerformanceTracker* perf_tracker_ = nullptr;
+  protocol::FrameConsumer* const consumer_;
+  protocol::FrameStatsConsumer* stats_consumer_ = nullptr;
 
   std::unique_ptr<VideoDecoder> decoder_;
 
   webrtc::DesktopSize source_size_;
   webrtc::DesktopVector source_dpi_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_