Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/media_stream_video_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_source.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
 
 namespace content {
 
 // Constraint keys. Specified by draft-alvestrand-constraints-resolution-00b
 const char MediaStreamVideoSource::kMinAspectRatio[] = "minAspectRatio";
 const char MediaStreamVideoSource::kMaxAspectRatio[] = "maxAspectRatio";
 const char MediaStreamVideoSource::kMaxWidth[] = "maxWidth";
 const char MediaStreamVideoSource::kMinWidth[] = "minWidth";
 const char MediaStreamVideoSource::kMaxHeight[] = "maxHeight";
 const char MediaStreamVideoSource::kMinHeight[] = "minHeight";
 const char MediaStreamVideoSource::kMaxFrameRate[] = "maxFrameRate";
 const char MediaStreamVideoSource::kMinFrameRate[] = "minFrameRate";
 
 const char* kSupportedConstraints[] = {
     MediaStreamVideoSource::kMaxAspectRatio,

[tommi (sloooow) - chröme, 2014/04/07 10:05:44]

2 space indent

[perkj_chrome, 2014/04/07 15:33:52]

Done.

     MediaStreamVideoSource::kMinAspectRatio,
     MediaStreamVideoSource::kMaxWidth,
     MediaStreamVideoSource::kMinWidth,
     MediaStreamVideoSource::kMaxHeight,
     MediaStreamVideoSource::kMinHeight,
     MediaStreamVideoSource::kMaxFrameRate,
     MediaStreamVideoSource::kMinFrameRate,
 };
 
 const int MediaStreamVideoSource::kDefaultWidth = 640;
@@ skipping 308 matching lines @@
     }
     case ENDED:
     case STARTED: {
       // Currently, reconfiguring the source is not supported.
       FinalizeAddTrack();
     }
   }
 }
 
 void MediaStreamVideoSource::RemoveTrack(MediaStreamVideoTrack* video_track) {
+  DCHECK(CalledOnValidThread());
   std::vector<MediaStreamVideoTrack*>::iterator it =
       std::find(tracks_.begin(), tracks_.end(), video_track);
   DCHECK(it != tracks_.end());
   tracks_.erase(it);
+  if (tracks_.empty())
+    StopSource();
 }
 
 void MediaStreamVideoSource::InitAdapter() {
   if (adapter_)
     return;
   // Create the webrtc::MediaStreamVideoSourceInterface adapter.
   // It needs the constraints so that constraints used by a PeerConnection
   // will be available such as constraints for CPU adaptation and a tab
   // capture.
   bool is_screencast =
       device_info().device.type == MEDIA_TAB_VIDEO_CAPTURE ||
       device_info().device.type == MEDIA_DESKTOP_VIDEO_CAPTURE;
   capture_adapter_ = factory_->CreateVideoCapturer(is_screencast);
   adapter_ = factory_->CreateVideoSource(capture_adapter_,
                                          current_constraints_);
 }
 
 webrtc::VideoSourceInterface* MediaStreamVideoSource::GetAdapter() {
   if (!adapter_) {
     InitAdapter();
   }
   return adapter_;
 }
 
 void MediaStreamVideoSource::DoStopSource() {
+  DCHECK(CalledOnValidThread());
   DVLOG(3) << "DoStopSource()";
   StopSourceImpl();
   state_ = ENDED;
   SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamVideoSource::DeliverVideoFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
   scoped_refptr<media::VideoFrame> video_frame(frame);
 
@@ skipping 131 matching lines @@
 MediaStreamVideoSource::RequestedConstraints::RequestedConstraints(
     const blink::WebMediaConstraints& constraints,
     const ConstraintsCallback& callback)
     : constraints(constraints), callback(callback) {
 }
 
 MediaStreamVideoSource::RequestedConstraints::~RequestedConstraints() {
 }
 
 }  // namespace content