| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_track.h" | 5 #include "content/renderer/media/media_stream_video_track.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 track.SetTrackData(new MediaStreamVideoTrack(source, callback, enabled)); | 221 track.SetTrackData(new MediaStreamVideoTrack(source, callback, enabled)); |
| 222 return track; | 222 return track; |
| 223 } | 223 } |
| 224 | 224 |
| 225 // static | 225 // static |
| 226 blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack( | 226 blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack( |
| 227 MediaStreamVideoSource* source, | 227 MediaStreamVideoSource* source, |
| 228 const VideoTrackAdapterSettings& adapter_settings, | 228 const VideoTrackAdapterSettings& adapter_settings, |
| 229 const base::Optional<bool>& noise_reduction, | 229 const base::Optional<bool>& noise_reduction, |
| 230 bool is_screencast, | 230 bool is_screencast, |
| 231 double min_frame_rate, | 231 const base::Optional<double>& min_frame_rate, |
| 232 const MediaStreamVideoSource::ConstraintsCallback& callback, | 232 const MediaStreamVideoSource::ConstraintsCallback& callback, |
| 233 bool enabled) { | 233 bool enabled) { |
| 234 blink::WebMediaStreamTrack track; | 234 blink::WebMediaStreamTrack track; |
| 235 track.Initialize(source->Owner()); | 235 track.Initialize(source->Owner()); |
| 236 track.SetTrackData(new MediaStreamVideoTrack( | 236 track.SetTrackData(new MediaStreamVideoTrack( |
| 237 source, adapter_settings, noise_reduction, is_screencast, min_frame_rate, | 237 source, adapter_settings, noise_reduction, is_screencast, min_frame_rate, |
| 238 callback, enabled)); | 238 callback, enabled)); |
| 239 return track; | 239 return track; |
| 240 } | 240 } |
| 241 | 241 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 253 MediaStreamVideoSource* source, | 253 MediaStreamVideoSource* source, |
| 254 const MediaStreamVideoSource::ConstraintsCallback& callback, | 254 const MediaStreamVideoSource::ConstraintsCallback& callback, |
| 255 bool enabled) | 255 bool enabled) |
| 256 : MediaStreamTrack(true), | 256 : MediaStreamTrack(true), |
| 257 frame_deliverer_( | 257 frame_deliverer_( |
| 258 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), | 258 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), |
| 259 enabled)), | 259 enabled)), |
| 260 adapter_settings_(base::MakeUnique<VideoTrackAdapterSettings>( | 260 adapter_settings_(base::MakeUnique<VideoTrackAdapterSettings>( |
| 261 VideoTrackAdapterSettings())), | 261 VideoTrackAdapterSettings())), |
| 262 is_screencast_(false), | 262 is_screencast_(false), |
| 263 min_frame_rate_(0.0), | |
| 264 source_(source->GetWeakPtr()) { | 263 source_(source->GetWeakPtr()) { |
| 265 if (IsOldVideoConstraints()) { | 264 if (IsOldVideoConstraints()) { |
| 266 blink::WebMediaConstraints constraints; | 265 blink::WebMediaConstraints constraints; |
| 267 constraints.Initialize(); | 266 constraints.Initialize(); |
| 268 source->AddTrackLegacy( | 267 source->AddTrackLegacy( |
| 269 this, | 268 this, |
| 270 base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, | 269 base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, |
| 271 frame_deliverer_), | 270 frame_deliverer_), |
| 272 constraints, callback); | 271 constraints, callback); |
| 273 } else { | 272 } else { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 297 base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, | 296 base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, |
| 298 frame_deliverer_), | 297 frame_deliverer_), |
| 299 constraints, callback); | 298 constraints, callback); |
| 300 } | 299 } |
| 301 | 300 |
| 302 MediaStreamVideoTrack::MediaStreamVideoTrack( | 301 MediaStreamVideoTrack::MediaStreamVideoTrack( |
| 303 MediaStreamVideoSource* source, | 302 MediaStreamVideoSource* source, |
| 304 const VideoTrackAdapterSettings& adapter_settings, | 303 const VideoTrackAdapterSettings& adapter_settings, |
| 305 const base::Optional<bool>& noise_reduction, | 304 const base::Optional<bool>& noise_reduction, |
| 306 bool is_screen_cast, | 305 bool is_screen_cast, |
| 307 double min_frame_rate, | 306 const base::Optional<double>& min_frame_rate, |
| 308 const MediaStreamVideoSource::ConstraintsCallback& callback, | 307 const MediaStreamVideoSource::ConstraintsCallback& callback, |
| 309 bool enabled) | 308 bool enabled) |
| 310 : MediaStreamTrack(true), | 309 : MediaStreamTrack(true), |
| 311 frame_deliverer_( | 310 frame_deliverer_( |
| 312 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), | 311 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), |
| 313 enabled)), | 312 enabled)), |
| 314 adapter_settings_( | 313 adapter_settings_( |
| 315 base::MakeUnique<VideoTrackAdapterSettings>(adapter_settings)), | 314 base::MakeUnique<VideoTrackAdapterSettings>(adapter_settings)), |
| 316 noise_reduction_(noise_reduction), | 315 noise_reduction_(noise_reduction), |
| 317 is_screencast_(is_screen_cast), | 316 is_screencast_(is_screen_cast), |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 } | 436 } |
| 438 | 437 |
| 439 void MediaStreamVideoTrack::OnReadyStateChanged( | 438 void MediaStreamVideoTrack::OnReadyStateChanged( |
| 440 blink::WebMediaStreamSource::ReadyState state) { | 439 blink::WebMediaStreamSource::ReadyState state) { |
| 441 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 440 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
| 442 for (auto* sink : sinks_) | 441 for (auto* sink : sinks_) |
| 443 sink->OnReadyStateChanged(state); | 442 sink->OnReadyStateChanged(state); |
| 444 } | 443 } |
| 445 | 444 |
| 446 } // namespace content | 445 } // namespace content |
| OLD | NEW |