Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: media/capture/video/fake_video_capture_device.cc

Issue 2212343003: Reland: ImageCapture: Queue up requests while device not ready (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable Android tests with bug and explanation Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/capture/video/android/video_capture_device_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "media/capture/video/fake_video_capture_device.h" 5 #include "media/capture/video/fake_video_capture_device.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 photo_capabilities->iso->max = 100; 187 photo_capabilities->iso->max = 100;
188 photo_capabilities->iso->min = 100; 188 photo_capabilities->iso->min = 100;
189 photo_capabilities->height = mojom::Range::New(); 189 photo_capabilities->height = mojom::Range::New();
190 photo_capabilities->height->current = capture_format_.frame_size.height(); 190 photo_capabilities->height->current = capture_format_.frame_size.height();
191 photo_capabilities->height->max = 1080; 191 photo_capabilities->height->max = 1080;
192 photo_capabilities->height->min = 240; 192 photo_capabilities->height->min = 240;
193 photo_capabilities->width = mojom::Range::New(); 193 photo_capabilities->width = mojom::Range::New();
194 photo_capabilities->width->current = capture_format_.frame_size.width(); 194 photo_capabilities->width->current = capture_format_.frame_size.width();
195 photo_capabilities->width->max = 1920; 195 photo_capabilities->width->max = 1920;
196 photo_capabilities->width->min = 320; 196 photo_capabilities->width->min = 320;
197 photo_capabilities->focus_mode = mojom::FocusMode::UNAVAILABLE;
198 photo_capabilities->zoom = mojom::Range::New(); 197 photo_capabilities->zoom = mojom::Range::New();
199 photo_capabilities->zoom->current = current_zoom_; 198 photo_capabilities->zoom->current = current_zoom_;
200 photo_capabilities->zoom->max = kMaxZoom; 199 photo_capabilities->zoom->max = kMaxZoom;
201 photo_capabilities->zoom->min = kMinZoom; 200 photo_capabilities->zoom->min = kMinZoom;
202 photo_capabilities->focus_mode = mojom::FocusMode::UNAVAILABLE; 201 photo_capabilities->focus_mode = mojom::FocusMode::UNAVAILABLE;
203 callback.Run(std::move(photo_capabilities)); 202 callback.Run(std::move(photo_capabilities));
204 } 203 }
205 204
206 void FakeVideoCaptureDevice::SetPhotoOptions(mojom::PhotoSettingsPtr settings, 205 void FakeVideoCaptureDevice::SetPhotoOptions(mojom::PhotoSettingsPtr settings,
207 SetPhotoOptionsCallback callback) { 206 SetPhotoOptionsCallback callback) {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // Don't accumulate any debt if we are lagging behind - just post the next 310 // Don't accumulate any debt if we are lagging behind - just post the next
312 // frame immediately and continue as normal. 311 // frame immediately and continue as normal.
313 const base::TimeTicks next_execution_time = 312 const base::TimeTicks next_execution_time =
314 std::max(current_time, expected_execution_time + frame_interval); 313 std::max(current_time, expected_execution_time + frame_interval);
315 const base::TimeDelta delay = next_execution_time - current_time; 314 const base::TimeDelta delay = next_execution_time - current_time;
316 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 315 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
317 FROM_HERE, base::Bind(next_capture, next_execution_time), delay); 316 FROM_HERE, base::Bind(next_capture, next_execution_time), delay);
318 } 317 }
319 318
320 } // namespace media 319 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/android/video_capture_device_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698