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

remoting/protocol/webrtc_video_stream.cc

 // 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.
 
 #include "remoting/protocol/webrtc_video_stream.h"
 
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 23 matching lines @@
   base::TimeTicks capture_started_time;
   base::TimeTicks capture_ended_time;
   base::TimeDelta capture_delay;
   base::TimeTicks encode_started_time;
   base::TimeTicks encode_ended_time;
 };
 
 struct WebrtcVideoStream::EncodedFrameWithTimestamps {
   std::unique_ptr<WebrtcVideoEncoder::EncodedFrame> frame;
   std::unique_ptr<FrameTimestamps> timestamps;
+  uint32_t capturer_id;

[Sergey Ulanov, 2017/03/24 23:54:26]

I think it's better to put this in WebrtcVideoStream::FrameTimestamps.
And then rename FrameTimestamps -> FrameStats and 
EncodedFrameWithTimestamps -> EncodedFrameWithStats.

Also please initialize this field.

[Hzj_jie, 2017/03/25 02:15:49]

I intended to do so, but it's a little bit complex comparing to this small
change.
No matter, I will do it if you suggest so.

 };
 
 WebrtcVideoStream::WebrtcVideoStream()
     : video_stats_dispatcher_(kStreamLabel), weak_factory_(this) {}
 
 WebrtcVideoStream::~WebrtcVideoStream() {
   if (stream_) {
     for (const auto& track : stream_->GetVideoTracks()) {
       stream_->RemoveTrack(track.get());
     }
@@ skipping 142 matching lines @@
 WebrtcVideoStream::EncodedFrameWithTimestamps WebrtcVideoStream::EncodeFrame(
     WebrtcVideoEncoder* encoder,
     std::unique_ptr<webrtc::DesktopFrame> frame,
     WebrtcVideoEncoder::FrameParams params,
     std::unique_ptr<WebrtcVideoStream::FrameTimestamps> timestamps) {
   EncodedFrameWithTimestamps result;
   result.timestamps = std::move(timestamps);
   result.timestamps->encode_started_time = base::TimeTicks::Now();
   result.frame = encoder->Encode(frame.get(), params);
   result.timestamps->encode_ended_time = base::TimeTicks::Now();
+  result.capturer_id = frame->capturer_id();
   return result;
 }
 
 void WebrtcVideoStream::OnFrameEncoded(EncodedFrameWithTimestamps frame) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   HostFrameStats stats;
   scheduler_->OnFrameEncoded(frame.frame.get(), &stats);
 
   if (!frame.frame) {
@@ skipping 27 matching lines @@
     stats.capture_overhead_delay = (frame.timestamps->capture_ended_time -
                                     frame.timestamps->capture_started_time) -
                                    stats.capture_delay;
 
     stats.encode_pending_delay = frame.timestamps->encode_started_time -
                                  frame.timestamps->capture_ended_time;
 
     stats.encode_delay = frame.timestamps->encode_ended_time -
                          frame.timestamps->encode_started_time;
 
+    stats.capturer_id = frame.capturer_id;
+
     video_stats_dispatcher_.OnVideoFrameStats(result.frame_id, stats);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting