| Index: content/renderer/media/media_stream_video_source.cc
|
| diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
|
| index 51da6bb96cf1c55895857a36e438361c3e0e5640..b3d512d5cef8a9ceafb133d2a354beaf48fa1736 100644
|
| --- a/content/renderer/media/media_stream_video_source.cc
|
| +++ b/content/renderer/media/media_stream_video_source.cc
|
| @@ -27,14 +27,14 @@ const char MediaStreamVideoSource::kMaxFrameRate[] = "maxFrameRate";
|
| const char MediaStreamVideoSource::kMinFrameRate[] = "minFrameRate";
|
|
|
| const char* kSupportedConstraints[] = {
|
| - MediaStreamVideoSource::kMaxAspectRatio,
|
| - MediaStreamVideoSource::kMinAspectRatio,
|
| - MediaStreamVideoSource::kMaxWidth,
|
| - MediaStreamVideoSource::kMinWidth,
|
| - MediaStreamVideoSource::kMaxHeight,
|
| - MediaStreamVideoSource::kMinHeight,
|
| - MediaStreamVideoSource::kMaxFrameRate,
|
| - MediaStreamVideoSource::kMinFrameRate,
|
| + MediaStreamVideoSource::kMaxAspectRatio,
|
| + MediaStreamVideoSource::kMinAspectRatio,
|
| + MediaStreamVideoSource::kMaxWidth,
|
| + MediaStreamVideoSource::kMinWidth,
|
| + MediaStreamVideoSource::kMaxHeight,
|
| + MediaStreamVideoSource::kMinHeight,
|
| + MediaStreamVideoSource::kMaxFrameRate,
|
| + MediaStreamVideoSource::kMinFrameRate,
|
| };
|
|
|
| const int MediaStreamVideoSource::kDefaultWidth = 640;
|
| @@ -356,10 +356,13 @@ void MediaStreamVideoSource::AddTrack(
|
| }
|
|
|
| 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() {
|
| @@ -385,6 +388,7 @@ webrtc::VideoSourceInterface* MediaStreamVideoSource::GetAdapter() {
|
| }
|
|
|
| void MediaStreamVideoSource::DoStopSource() {
|
| + DCHECK(CalledOnValidThread());
|
| DVLOG(3) << "DoStopSource()";
|
| StopSourceImpl();
|
| state_ = ENDED;
|
|
|