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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback_helpers.h" | 6 #include "base/callback_helpers.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "content/child/child_process.h" | 10 #include "content/child/child_process.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 message_loop_.RunUntilIdle(); | 165 message_loop_.RunUntilIdle(); |
166 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, | 166 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, |
167 webkit_source_.readyState()); | 167 webkit_source_.readyState()); |
168 // Verify that MediaStreamSource::SourceStoppedCallback has been triggered. | 168 // Verify that MediaStreamSource::SourceStoppedCallback has been triggered. |
169 EXPECT_TRUE(source_stopped_); | 169 EXPECT_TRUE(source_stopped_); |
170 } | 170 } |
171 | 171 |
172 class FakeMediaStreamVideoSink : public MediaStreamVideoSink { | 172 class FakeMediaStreamVideoSink : public MediaStreamVideoSink { |
173 public: | 173 public: |
174 FakeMediaStreamVideoSink(base::TimeTicks* capture_time, | 174 FakeMediaStreamVideoSink(base::TimeTicks* capture_time, |
| 175 media::VideoFrameMetadata* metadata, |
175 base::Closure got_frame_cb) | 176 base::Closure got_frame_cb) |
176 : capture_time_(capture_time), | 177 : capture_time_(capture_time), |
| 178 metadata_(metadata), |
177 got_frame_cb_(got_frame_cb) { | 179 got_frame_cb_(got_frame_cb) { |
178 } | 180 } |
179 | 181 |
180 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, | 182 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, |
181 const media::VideoCaptureFormat& format, | |
182 const base::TimeTicks& capture_time) { | 183 const base::TimeTicks& capture_time) { |
183 *capture_time_ = capture_time; | 184 *capture_time_ = capture_time; |
| 185 metadata_->Clear(); |
| 186 base::DictionaryValue tmp; |
| 187 frame->metadata()->MergeInternalValuesInto(&tmp); |
| 188 metadata_->MergeInternalValuesFrom(tmp); |
184 base::ResetAndReturn(&got_frame_cb_).Run(); | 189 base::ResetAndReturn(&got_frame_cb_).Run(); |
185 } | 190 } |
186 | 191 |
187 private: | 192 private: |
188 base::TimeTicks* capture_time_; | 193 base::TimeTicks* const capture_time_; |
| 194 media::VideoFrameMetadata* const metadata_; |
189 base::Closure got_frame_cb_; | 195 base::Closure got_frame_cb_; |
190 }; | 196 }; |
191 | 197 |
192 TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTime) { | 198 TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTimeAndMetadataPlumbing) { |
193 StreamDeviceInfo device_info; | 199 StreamDeviceInfo device_info; |
194 device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE; | 200 device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE; |
195 InitWithDeviceInfo(device_info); | 201 InitWithDeviceInfo(device_info); |
196 | 202 |
197 VideoCaptureDeliverFrameCB deliver_frame_cb; | 203 VideoCaptureDeliverFrameCB deliver_frame_cb; |
198 VideoCapturerDelegate::RunningCallback running_cb; | 204 VideoCapturerDelegate::RunningCallback running_cb; |
199 | 205 |
200 EXPECT_CALL(mock_delegate(), StartCapture( | 206 EXPECT_CALL(mock_delegate(), StartCapture( |
201 testing::_, | 207 testing::_, |
202 testing::_, | 208 testing::_, |
203 testing::_, | 209 testing::_, |
204 testing::_)) | 210 testing::_)) |
205 .Times(1) | 211 .Times(1) |
206 .WillOnce(testing::DoAll(testing::SaveArg<1>(&deliver_frame_cb), | 212 .WillOnce(testing::DoAll(testing::SaveArg<1>(&deliver_frame_cb), |
207 testing::SaveArg<3>(&running_cb))); | 213 testing::SaveArg<3>(&running_cb))); |
208 EXPECT_CALL(mock_delegate(), StopCapture()); | 214 EXPECT_CALL(mock_delegate(), StopCapture()); |
209 blink::WebMediaStreamTrack track = StartSource(); | 215 blink::WebMediaStreamTrack track = StartSource(); |
210 running_cb.Run(true); | 216 running_cb.Run(true); |
211 | 217 |
212 base::RunLoop run_loop; | 218 base::RunLoop run_loop; |
213 base::TimeTicks reference_capture_time = | 219 base::TimeTicks reference_capture_time = |
214 base::TimeTicks::FromInternalValue(60013); | 220 base::TimeTicks::FromInternalValue(60013); |
215 base::TimeTicks capture_time; | 221 base::TimeTicks capture_time; |
| 222 media::VideoFrameMetadata metadata; |
216 FakeMediaStreamVideoSink fake_sink( | 223 FakeMediaStreamVideoSink fake_sink( |
217 &capture_time, | 224 &capture_time, |
| 225 &metadata, |
218 media::BindToCurrentLoop(run_loop.QuitClosure())); | 226 media::BindToCurrentLoop(run_loop.QuitClosure())); |
219 FakeMediaStreamVideoSink::AddToVideoTrack( | 227 FakeMediaStreamVideoSink::AddToVideoTrack( |
220 &fake_sink, | 228 &fake_sink, |
221 base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame, | 229 base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame, |
222 base::Unretained(&fake_sink)), | 230 base::Unretained(&fake_sink)), |
223 track); | 231 track); |
| 232 const scoped_refptr<media::VideoFrame> frame = |
| 233 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)); |
| 234 frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE, 30.0); |
224 child_process_->io_message_loop()->PostTask( | 235 child_process_->io_message_loop()->PostTask( |
225 FROM_HERE, | 236 FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time)); |
226 base::Bind(deliver_frame_cb, | |
227 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)), | |
228 media::VideoCaptureFormat(), | |
229 reference_capture_time)); | |
230 run_loop.Run(); | 237 run_loop.Run(); |
231 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track); | 238 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track); |
232 EXPECT_EQ(reference_capture_time, capture_time); | 239 EXPECT_EQ(reference_capture_time, capture_time); |
| 240 double metadata_value; |
| 241 EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE, |
| 242 &metadata_value)); |
| 243 EXPECT_EQ(30.0, metadata_value); |
233 } | 244 } |
234 | 245 |
235 } // namespace content | 246 } // namespace content |
OLD | NEW |