ScreenCapture for Android phase1, part II

content/browser/renderer_host/media/peer_connection_tracker_host.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/peer_connection_tracker_host.h"
 
 #include "base/power_monitor/power_monitor.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/webrtc/webrtc_eventlog_host.h"
 #include "content/browser/webrtc/webrtc_internals.h"
+#include "content/common/media/media_stream_options.h"
 #include "content/common/media/peer_connection_tracker_messages.h"
 
 namespace content {
 
 PeerConnectionTrackerHost::PeerConnectionTrackerHost(
     int render_process_id,
     const base::WeakPtr<WebRTCEventLogHost>& event_log_host)
     : BrowserMessageFilter(PeerConnectionTrackerMsgStart),
       render_process_id_(render_process_id),
+      is_screen_capture_(false),
       event_log_host_(event_log_host) {
   DCHECK(event_log_host);
 }
 
 bool PeerConnectionTrackerHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(PeerConnectionTrackerHost, message)
     IPC_MESSAGE_HANDLER(PeerConnectionTrackerHost_AddPeerConnection,
                         OnAddPeerConnection)
@@ skipping 67 matching lines @@
 }
 
 void PeerConnectionTrackerHost::OnAddStats(int lid,
                                            const base::ListValue& value) {
   WebRTCInternals::GetInstance()->OnAddStats(peer_pid(), lid, value);
 }
 
 void PeerConnectionTrackerHost::OnGetUserMedia(
     const std::string& origin,
     bool audio,
-    bool video,
+    const VideoInfo& video_info,
     const std::string& audio_constraints,
     const std::string& video_constraints) {
+  base::AutoLock lock(lock_);

[Sergey Ulanov, 2016/08/19 05:54:15]

Why do you need this lock? If it's just for is_screen_capture_ then you don't
want to acquire it before calling 
WebRTCInternals::GetInstance()->OnGetUserMedia().

[braveyao, 2016/08/23 21:18:55]

Done.

   WebRTCInternals::GetInstance()->OnGetUserMedia(render_process_id_,
                                                  peer_pid(),
                                                  origin,
                                                  audio,
-                                                 video,
+                                                 video_info.video,
                                                  audio_constraints,
                                                  video_constraints);
+#if defined(OS_ANDROID)
+  is_screen_capture_ =
+      video_info.video_stream_source == kMediaStreamSourceScreen;
+#endif
 }
 
 void PeerConnectionTrackerHost::OnSuspend() {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&PeerConnectionTrackerHost::SendOnSuspendOnUIThread, this));
 }
 
 void PeerConnectionTrackerHost::SendOnSuspendOnUIThread() {
+  base::AutoLock lock(lock_);
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(render_process_id_);
-  if (host)
+  if (host && !is_screen_capture_)
     host->Send(new PeerConnectionTracker_OnSuspend());
 }
 
 }  // namespace content