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/browser/media/capture/desktop_capture_device_aura.h" | 5 #include "content/browser/media/capture/desktop_capture_device_aura.h" |
6 | 6 |
7 #include "base/synchronization/waitable_event.h" | 7 #include "base/synchronization/waitable_event.h" |
8 #include "content/browser/browser_thread_impl.h" | 8 #include "content/browser/browser_thread_impl.h" |
9 #include "content/public/browser/desktop_media_id.h" | 9 #include "content/public/browser/desktop_media_id.h" |
10 #include "media/video/capture/video_capture_types.h" | 10 #include "media/video/capture/video_capture_types.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 DesktopCaptureDeviceAura::Create( | 108 DesktopCaptureDeviceAura::Create( |
109 content::DesktopMediaID::RegisterAuraWindow(root_window()))); | 109 content::DesktopMediaID::RegisterAuraWindow(root_window()))); |
110 | 110 |
111 scoped_ptr<MockDeviceClient> client(new MockDeviceClient()); | 111 scoped_ptr<MockDeviceClient> client(new MockDeviceClient()); |
112 EXPECT_CALL(*client, OnError(_)).Times(0); | 112 EXPECT_CALL(*client, OnError(_)).Times(0); |
113 | 113 |
114 media::VideoCaptureParams capture_params; | 114 media::VideoCaptureParams capture_params; |
115 capture_params.requested_format.frame_size.SetSize(640, 480); | 115 capture_params.requested_format.frame_size.SetSize(640, 480); |
116 capture_params.requested_format.frame_rate = kFrameRate; | 116 capture_params.requested_format.frame_rate = kFrameRate; |
117 capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420; | 117 capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420; |
118 capture_params.allow_resolution_change = false; | |
119 capture_device->AllocateAndStart( | 118 capture_device->AllocateAndStart( |
120 capture_params, client.PassAs<media::VideoCaptureDevice::Client>()); | 119 capture_params, client.PassAs<media::VideoCaptureDevice::Client>()); |
121 capture_device->StopAndDeAllocate(); | 120 capture_device->StopAndDeAllocate(); |
122 } | 121 } |
123 | 122 |
124 } // namespace | 123 } // namespace |
125 } // namespace content | 124 } // namespace content |
OLD | NEW |