[Chromoting] Send DesktopFrame::capturer_id() to client through WebrtcVideoStream

remoting/protocol/webrtc_video_stream.h

 // Copyright 2015 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_PROTOCOL_WEBRTC_VIDEO_STREAM_H_
 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_STREAM_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 34 matching lines @@
 
   // VideoStream interface.
   void SetEventTimestampsSource(scoped_refptr<InputEventTimestampsSource>
                                     event_timestamps_source) override;
   void Pause(bool pause) override;
   void SetLosslessEncode(bool want_lossless) override;
   void SetLosslessColor(bool want_lossless) override;
   void SetObserver(Observer* observer) override;
 
  private:
-  struct FrameTimestamps;
-  struct EncodedFrameWithTimestamps;
+  struct FrameStats;
+  struct EncodedFrameWithStats;
 
   // webrtc::DesktopCapturer::Callback interface.
   void OnCaptureResult(webrtc::DesktopCapturer::Result result,
                        std::unique_ptr<webrtc::DesktopFrame> frame) override;
 
   // HostVideoStatsDispatcher::EventHandler interface.
   void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
   void OnChannelClosed(ChannelDispatcherBase* channel_dispatcher) override;
 
   // Called by the |scheduler_|.
   void CaptureNextFrame();
 
   // Task running on the encoder thread to encode the |frame|.
-  static EncodedFrameWithTimestamps EncodeFrame(
+  static EncodedFrameWithStats EncodeFrame(
       WebrtcVideoEncoder* encoder,
       std::unique_ptr<webrtc::DesktopFrame> frame,
       WebrtcVideoEncoder::FrameParams params,
-      std::unique_ptr<WebrtcVideoStream::FrameTimestamps> timestamps);
-  void OnFrameEncoded(EncodedFrameWithTimestamps frame);
+      std::unique_ptr<WebrtcVideoStream::FrameStats> stats);
+  void OnFrameEncoded(EncodedFrameWithStats frame);
 
   // Capturer used to capture the screen.
   std::unique_ptr<webrtc::DesktopCapturer> capturer_;
   // Used to send across encoded frames.
   WebrtcTransport* webrtc_transport_ = nullptr;
   // Task runner used to run |encoder_|.
   scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_;
   // Used to encode captured frames. Always accessed on the encode thread.
   std::unique_ptr<WebrtcVideoEncoder> encoder_;
 
   scoped_refptr<InputEventTimestampsSource> event_timestamps_source_;
 
   scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
   scoped_refptr<webrtc::MediaStreamInterface> stream_;
 
   HostVideoStatsDispatcher video_stats_dispatcher_;
 
-  // Timestamps for the frame that's being captured.
-  std::unique_ptr<FrameTimestamps> captured_frame_timestamps_;
+  // Stats of the frame that's being captured.
+  std::unique_ptr<FrameStats> captured_frame_stats_;
 
   std::unique_ptr<WebrtcFrameScheduler> scheduler_;
 
   webrtc::DesktopSize frame_size_;
   webrtc::DesktopVector frame_dpi_;
   Observer* observer_ = nullptr;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<WebrtcVideoStream> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebrtcVideoStream);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_WEBRTC_VIDEO_STREAM_H_