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/webrtc/media_stream_remote_video_source.h" | 5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 remote_track_->RegisterObserver(this); | 131 remote_track_->RegisterObserver(this); |
132 } | 132 } |
133 | 133 |
134 MediaStreamRemoteVideoSource::~MediaStreamRemoteVideoSource() { | 134 MediaStreamRemoteVideoSource::~MediaStreamRemoteVideoSource() { |
135 remote_track_->UnregisterObserver(this); | 135 remote_track_->UnregisterObserver(this); |
136 } | 136 } |
137 | 137 |
138 void MediaStreamRemoteVideoSource::GetCurrentSupportedFormats( | 138 void MediaStreamRemoteVideoSource::GetCurrentSupportedFormats( |
139 int max_requested_width, | 139 int max_requested_width, |
140 int max_requested_height, | 140 int max_requested_height, |
| 141 double max_requested_frame_rate, |
141 const VideoCaptureDeviceFormatsCB& callback) { | 142 const VideoCaptureDeviceFormatsCB& callback) { |
142 DCHECK(thread_checker_.CalledOnValidThread()); | 143 DCHECK(thread_checker_.CalledOnValidThread()); |
143 media::VideoCaptureFormats formats; | 144 media::VideoCaptureFormats formats; |
144 // Since the remote end is free to change the resolution at any point in time | 145 // Since the remote end is free to change the resolution at any point in time |
145 // the supported formats are unknown. | 146 // the supported formats are unknown. |
146 callback.Run(formats); | 147 callback.Run(formats); |
147 } | 148 } |
148 | 149 |
149 void MediaStreamRemoteVideoSource::StartSourceImpl( | 150 void MediaStreamRemoteVideoSource::StartSourceImpl( |
150 const media::VideoCaptureParams& params, | 151 const media::VideoCaptureParams& params, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded); | 185 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded); |
185 break; | 186 break; |
186 default: | 187 default: |
187 NOTREACHED(); | 188 NOTREACHED(); |
188 break; | 189 break; |
189 } | 190 } |
190 } | 191 } |
191 } | 192 } |
192 | 193 |
193 } // namespace content | 194 } // namespace content |
OLD | NEW |