| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "services/video_capture/fake_device_descriptor_test.h" | 6 #include "services/video_capture/fake_device_descriptor_test.h" |
| 7 #include "services/video_capture/mock_video_capture_device_client.h" | 7 #include "services/video_capture/mock_video_capture_device_client.h" |
| 8 | 8 |
| 9 using testing::_; | 9 using testing::_; |
| 10 using testing::InvokeWithoutArgs; | 10 using testing::InvokeWithoutArgs; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 base::RunLoop wait_loop; | 64 base::RunLoop wait_loop; |
| 65 mojom::VideoCaptureDeviceProxyPtr device_proxy_2; | 65 mojom::VideoCaptureDeviceProxyPtr device_proxy_2; |
| 66 factory_->CreateDeviceProxy( | 66 factory_->CreateDeviceProxy( |
| 67 fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_2), | 67 fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_2), |
| 68 base::Bind( | 68 base::Bind( |
| 69 [](base::RunLoop* wait_loop, | 69 [](base::RunLoop* wait_loop, |
| 70 mojom::DeviceAccessResultCode result_code) { wait_loop->Quit(); }, | 70 mojom::DeviceAccessResultCode result_code) { wait_loop->Quit(); }, |
| 71 &wait_loop)); | 71 &wait_loop)); |
| 72 wait_loop.Run(); | 72 wait_loop.Run(); |
| 73 | 73 |
| 74 auto arbitrary_requested_format = mojom::VideoCaptureFormat::New(); | 74 media::VideoCaptureFormat arbitrary_requested_format; |
| 75 arbitrary_requested_format->frame_size.SetSize(640, 480); | 75 arbitrary_requested_format.frame_size.SetSize(640, 480); |
| 76 arbitrary_requested_format->frame_rate = 15; | 76 arbitrary_requested_format.frame_rate = 15; |
| 77 arbitrary_requested_format->pixel_format = media::mojom::VideoFormat::I420; | 77 arbitrary_requested_format.pixel_format = media::PIXEL_FORMAT_I420; |
| 78 arbitrary_requested_format->pixel_storage = mojom::VideoPixelStorage::CPU; | 78 arbitrary_requested_format.pixel_storage = media::PIXEL_STORAGE_CPU; |
| 79 | 79 |
| 80 base::RunLoop wait_loop_2; | 80 base::RunLoop wait_loop_2; |
| 81 mojom::VideoCaptureDeviceClientPtr client_proxy; | 81 mojom::VideoCaptureDeviceClientPtr client_proxy; |
| 82 MockVideoCaptureDeviceClient client(mojo::GetProxy(&client_proxy)); | 82 MockVideoCaptureDeviceClient client(mojo::GetProxy(&client_proxy)); |
| 83 EXPECT_CALL(client, OnFrameAvailablePtr(_)) | 83 EXPECT_CALL(client, OnFrameAvailablePtr(_)) |
| 84 .WillRepeatedly( | 84 .WillRepeatedly( |
| 85 InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); })); | 85 InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); })); |
| 86 | 86 |
| 87 device_proxy_2->Start(std::move(arbitrary_requested_format), | 87 device_proxy_2->Start(arbitrary_requested_format, |
| 88 mojom::ResolutionChangePolicy::FIXED_RESOLUTION, | 88 mojom::ResolutionChangePolicy::FIXED_RESOLUTION, |
| 89 mojom::PowerLineFrequency::DEFAULT, | 89 mojom::PowerLineFrequency::DEFAULT, |
| 90 std::move(client_proxy)); | 90 std::move(client_proxy)); |
| 91 wait_loop_2.Run(); | 91 wait_loop_2.Run(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace video_capture | 94 } // namespace video_capture |
| OLD | NEW |