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

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

Issue 2806743003: Image Capture: split {white_balance,exposure,focus}_modes into current_ and supported_ (Closed)
Patch Set: reillyg@ comment and fix in v4l2_capture_delegate.cc Created 3 years, 8 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
OLDNEW
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 "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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 418
419 EXPECT_CALL(*image_capture_client_.get(), OnCorrectGetPhotoCapabilities()) 419 EXPECT_CALL(*image_capture_client_.get(), OnCorrectGetPhotoCapabilities())
420 .Times(1); 420 .Times(1);
421 device->GetPhotoCapabilities(std::move(scoped_get_callback)); 421 device->GetPhotoCapabilities(std::move(scoped_get_callback));
422 run_loop_.reset(new base::RunLoop()); 422 run_loop_.reset(new base::RunLoop());
423 run_loop_->Run(); 423 run_loop_->Run();
424 424
425 const mojom::PhotoCapabilities* capabilities = 425 const mojom::PhotoCapabilities* capabilities =
426 image_capture_client_->capabilities(); 426 image_capture_client_->capabilities();
427 ASSERT_TRUE(capabilities); 427 ASSERT_TRUE(capabilities);
428 EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->white_balance_mode); 428 EXPECT_EQ(mojom::MeteringMode::NONE,
429 EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->exposure_mode); 429 capabilities->current_white_balance_mode);
430 EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->focus_mode); 430 EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->current_exposure_mode);
431 EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->current_focus_mode);
431 432
432 EXPECT_EQ(0, capabilities->exposure_compensation->min); 433 EXPECT_EQ(0, capabilities->exposure_compensation->min);
433 EXPECT_EQ(0, capabilities->exposure_compensation->max); 434 EXPECT_EQ(0, capabilities->exposure_compensation->max);
434 EXPECT_EQ(0, capabilities->exposure_compensation->current); 435 EXPECT_EQ(0, capabilities->exposure_compensation->current);
435 EXPECT_EQ(0, capabilities->exposure_compensation->step); 436 EXPECT_EQ(0, capabilities->exposure_compensation->step);
436 EXPECT_EQ(0, capabilities->color_temperature->min); 437 EXPECT_EQ(0, capabilities->color_temperature->min);
437 EXPECT_EQ(0, capabilities->color_temperature->max); 438 EXPECT_EQ(0, capabilities->color_temperature->max);
438 EXPECT_EQ(0, capabilities->color_temperature->current); 439 EXPECT_EQ(0, capabilities->color_temperature->current);
439 EXPECT_EQ(0, capabilities->color_temperature->step); 440 EXPECT_EQ(0, capabilities->color_temperature->step);
440 EXPECT_EQ(100, capabilities->iso->min); 441 EXPECT_EQ(100, capabilities->iso->min);
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 4u, 646 4u,
646 {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, 647 {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
647 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}}, 648 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
648 CommandLineTestData{"device-count=4,ownership=client", 649 CommandLineTestData{"device-count=4,ownership=client",
649 20, 650 20,
650 4u, 651 4u,
651 {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, 652 {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
652 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}}, 653 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
653 CommandLineTestData{"device-count=0", 20, 0u, {PIXEL_FORMAT_I420}})); 654 CommandLineTestData{"device-count=0", 20, 0u, {PIXEL_FORMAT_I420}}));
654 }; // namespace media 655 }; // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/fake_video_capture_device.cc ('k') | media/capture/video/linux/v4l2_capture_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698