Follow up: stop mirroring session when tab is closed. Rename the callback function and clarify the …

content/renderer/media/media_stream_video_capturer_source.cc

 // 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.
 
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 349 matching lines @@
 
     case VIDEO_CAPTURE_STATE_STOPPING:
     case VIDEO_CAPTURE_STATE_STOPPED:
     case VIDEO_CAPTURE_STATE_ERROR:
     case VIDEO_CAPTURE_STATE_ENDED:
       base::ResetAndReturn(&running_callback_).Run(false);
       break;
 
     case VIDEO_CAPTURE_STATE_PAUSED:
     case VIDEO_CAPTURE_STATE_RESUMED:
-      // Not applicable to reporting on device start success/failure.
+      // Not applicable to reporting on device starts or errors.
       break;
   }
 }
 
 void LocalVideoCapturerSource::OnDeviceFormatsInUseReceived(
     const media::VideoCaptureFormats& formats_in_use) {
   DVLOG(3) << __func__ << ", #formats received: " << formats_in_use.size();
   DCHECK(thread_checker_.CalledOnValidThread());
   // StopCapture() might have destroyed |formats_enumerated_callback_| before
   // arriving here.
@@ skipping 94 matching lines @@
     const VideoCaptureDeliverFrameCB& frame_callback) {
   media::VideoCaptureParams new_params;
   new_params.requested_format = format;
   if (IsContentVideoCaptureDevice(device_info())) {
     SetContentCaptureParamsFromConstraints(
         constraints, device_info().device.type, &new_params);
   } else if (device_info().device.type == MEDIA_DEVICE_VIDEO_CAPTURE) {
     SetPowerLineFrequencyParamFromConstraints(constraints, &new_params);
   }
 
-  source_->StartCapture(new_params,
-                          frame_callback,
-                          base::Bind(&MediaStreamVideoCapturerSource::OnStarted,
-                                     base::Unretained(this)));
+  is_capture_starting_ = true;
+  source_->StartCapture(
+      new_params, frame_callback,
+      base::Bind(&MediaStreamVideoCapturerSource::OnRunStateChanged,
+                 base::Unretained(this)));
 }
 
 void MediaStreamVideoCapturerSource::StopSourceImpl() {
   source_->StopCapture();
 }
 
-void MediaStreamVideoCapturerSource::OnStarted(bool result) {
-  OnStartDone(result ? MEDIA_DEVICE_OK : MEDIA_DEVICE_TRACK_START_FAILURE);
+void MediaStreamVideoCapturerSource::OnRunStateChanged(bool is_running) {
+  if (is_capture_starting_) {
+    OnStartDone(is_running ? MEDIA_DEVICE_OK
+                           : MEDIA_DEVICE_TRACK_START_FAILURE);
+    is_capture_starting_ = false;
+  } else if (!is_running) {
+    StopSource();
+  }
 }
 
 const char*
 MediaStreamVideoCapturerSource::GetPowerLineFrequencyForTesting() const {
   return kPowerLineFrequency;
 }
 
 }  // namespace content