| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/media_stream_video_source.h" | 5 #include "content/renderer/media/media_stream_video_source.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 secure_tracker_.Add(track, true); | 54 secure_tracker_.Add(track, true); |
| 55 | 55 |
| 56 track_descriptors_.push_back(TrackDescriptor( | 56 track_descriptors_.push_back(TrackDescriptor( |
| 57 track, frame_callback, | 57 track, frame_callback, |
| 58 base::MakeUnique<VideoTrackAdapterSettings>(track_adapter_settings), | 58 base::MakeUnique<VideoTrackAdapterSettings>(track_adapter_settings), |
| 59 callback)); | 59 callback)); |
| 60 | 60 |
| 61 switch (state_) { | 61 switch (state_) { |
| 62 case NEW: { | 62 case NEW: { |
| 63 state_ = STARTING; | 63 state_ = STARTING; |
| 64 blink::WebMediaConstraints ignored_constraints; | |
| 65 StartSourceImpl( | 64 StartSourceImpl( |
| 66 media::VideoCaptureFormat() /* ignored */, ignored_constraints, | |
| 67 base::Bind(&VideoTrackAdapter::DeliverFrameOnIO, track_adapter_)); | 65 base::Bind(&VideoTrackAdapter::DeliverFrameOnIO, track_adapter_)); |
| 68 break; | 66 break; |
| 69 } | 67 } |
| 70 case STARTING: { | 68 case STARTING: { |
| 71 break; | 69 break; |
| 72 } | 70 } |
| 73 case ENDED: | 71 case ENDED: |
| 74 case STARTED: { | 72 case STARTED: { |
| 75 // Currently, reconfiguring the source is not supported. | 73 // Currently, reconfiguring the source is not supported. |
| 76 FinalizeAddTrack(); | 74 FinalizeAddTrack(); |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 MediaStreamVideoSource::TrackDescriptor::TrackDescriptor( | 238 MediaStreamVideoSource::TrackDescriptor::TrackDescriptor( |
| 241 TrackDescriptor&& other) = default; | 239 TrackDescriptor&& other) = default; |
| 242 MediaStreamVideoSource::TrackDescriptor& | 240 MediaStreamVideoSource::TrackDescriptor& |
| 243 MediaStreamVideoSource::TrackDescriptor::operator=( | 241 MediaStreamVideoSource::TrackDescriptor::operator=( |
| 244 MediaStreamVideoSource::TrackDescriptor&& other) = default; | 242 MediaStreamVideoSource::TrackDescriptor&& other) = default; |
| 245 | 243 |
| 246 MediaStreamVideoSource::TrackDescriptor::~TrackDescriptor() { | 244 MediaStreamVideoSource::TrackDescriptor::~TrackDescriptor() { |
| 247 } | 245 } |
| 248 | 246 |
| 249 } // namespace content | 247 } // namespace content |
| OLD | NEW |