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

Unified Diff: device/capture/video/fake_video_capture_device_unittest.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: device/capture/video/fake_video_capture_device_unittest.cc
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/device/capture/video/fake_video_capture_device_unittest.cc
similarity index 92%
rename from media/capture/video/fake_video_capture_device_unittest.cc
rename to device/capture/video/fake_video_capture_device_unittest.cc
index 6cf58e15a3a11d68780db3c01efd3878176c6740..d80566d52b58e882b71265bd870203828649a5f8 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/device/capture/video/fake_video_capture_device_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/capture/video/fake_video_capture_device.h"
+#include "device/capture/video/fake_video_capture_device.h"
#include <stddef.h>
#include <stdint.h>
@@ -17,10 +17,10 @@
#include "base/test/test_timeouts.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
+#include "device/capture/video/fake_video_capture_device_factory.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/base/media_switches.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/fake_video_capture_device_factory.h"
-#include "media/capture/video/video_capture_device.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,7 +30,7 @@ using ::testing::Combine;
using ::testing::SaveArg;
using ::testing::Values;
-namespace media {
+namespace device {
namespace {
@@ -102,7 +102,7 @@ class MockClient : public VideoCaptureDevice::Client {
std::unique_ptr<Buffer> buffer,
const scoped_refptr<media::VideoFrame>& frame) {
VideoCaptureFormat format(frame->natural_size(), 30.0,
- PIXEL_FORMAT_I420);
+ media::PIXEL_FORMAT_I420);
frame_cb_.Run(format);
}
std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
@@ -136,22 +136,26 @@ class DeviceEnumerationListener
class ImageCaptureClient : public base::RefCounted<ImageCaptureClient> {
public:
// GMock doesn't support move-only arguments, so we use this forward method.
- void DoOnGetPhotoCapabilities(mojom::PhotoCapabilitiesPtr capabilities) {
+ void DoOnGetPhotoCapabilities(
+ media::mojom::PhotoCapabilitiesPtr capabilities) {
capabilities_ = std::move(capabilities);
OnCorrectGetPhotoCapabilities();
}
MOCK_METHOD0(OnCorrectGetPhotoCapabilities, void(void));
- MOCK_METHOD1(OnGetPhotoCapabilitiesFailure,
- void(const base::Callback<void(mojom::PhotoCapabilitiesPtr)>&));
+ MOCK_METHOD1(
+ OnGetPhotoCapabilitiesFailure,
+ void(const base::Callback<void(media::mojom::PhotoCapabilitiesPtr)>&));
- const mojom::PhotoCapabilities* capabilities() { return capabilities_.get(); }
+ const media::mojom::PhotoCapabilities* capabilities() {
+ return capabilities_.get();
+ }
MOCK_METHOD1(OnCorrectSetPhotoOptions, void(bool));
MOCK_METHOD1(OnSetPhotoOptionsFailure,
void(const base::Callback<void(bool)>&));
// GMock doesn't support move-only arguments, so we use this forward method.
- void DoOnPhotoTaken(mojom::BlobPtr blob) {
+ void DoOnPhotoTaken(media::mojom::BlobPtr blob) {
// Only PNG images are supported right now.
EXPECT_STREQ("image/png", blob->mime_type.c_str());
// Not worth decoding the incoming data. Just check that the header is PNG.
@@ -164,13 +168,13 @@ class ImageCaptureClient : public base::RefCounted<ImageCaptureClient> {
}
MOCK_METHOD0(OnCorrectPhotoTaken, void(void));
MOCK_METHOD1(OnTakePhotoFailure,
- void(const base::Callback<void(mojom::BlobPtr)>&));
+ void(const base::Callback<void(media::mojom::BlobPtr)>&));
private:
friend class base::RefCounted<ImageCaptureClient>;
virtual ~ImageCaptureClient() {}
- mojom::PhotoCapabilitiesPtr capabilities_;
+ media::mojom::PhotoCapabilitiesPtr capabilities_;
};
} // namespace
@@ -279,19 +283,19 @@ TEST_F(FakeVideoCaptureDeviceTest, GetDeviceSupportedFormats) {
ASSERT_EQ(supported_formats.size(), 4u);
EXPECT_EQ(supported_formats[0].frame_size.width(), 320);
EXPECT_EQ(supported_formats[0].frame_size.height(), 240);
- EXPECT_EQ(supported_formats[0].pixel_format, PIXEL_FORMAT_I420);
+ EXPECT_EQ(supported_formats[0].pixel_format, media::PIXEL_FORMAT_I420);
EXPECT_GE(supported_formats[0].frame_rate, 20.0);
EXPECT_EQ(supported_formats[1].frame_size.width(), 640);
EXPECT_EQ(supported_formats[1].frame_size.height(), 480);
- EXPECT_EQ(supported_formats[1].pixel_format, PIXEL_FORMAT_I420);
+ EXPECT_EQ(supported_formats[1].pixel_format, media::PIXEL_FORMAT_I420);
EXPECT_GE(supported_formats[1].frame_rate, 20.0);
EXPECT_EQ(supported_formats[2].frame_size.width(), 1280);
EXPECT_EQ(supported_formats[2].frame_size.height(), 720);
- EXPECT_EQ(supported_formats[2].pixel_format, PIXEL_FORMAT_I420);
+ EXPECT_EQ(supported_formats[2].pixel_format, media::PIXEL_FORMAT_I420);
EXPECT_GE(supported_formats[2].frame_rate, 20.0);
EXPECT_EQ(supported_formats[3].frame_size.width(), 1920);
EXPECT_EQ(supported_formats[3].frame_size.height(), 1080);
- EXPECT_EQ(supported_formats[3].pixel_format, PIXEL_FORMAT_I420);
+ EXPECT_EQ(supported_formats[3].pixel_format, media::PIXEL_FORMAT_I420);
EXPECT_GE(supported_formats[3].frame_rate, 20.0);
}
}
@@ -335,7 +339,7 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) {
EXPECT_EQ(400u, capabilities->zoom->max);
EXPECT_GE(capabilities->zoom->current, capabilities->zoom->min);
EXPECT_GE(capabilities->zoom->max, capabilities->zoom->current);
- EXPECT_EQ(mojom::FocusMode::UNAVAILABLE, capabilities->focus_mode);
+ EXPECT_EQ(media::mojom::FocusMode::UNAVAILABLE, capabilities->focus_mode);
// Set options: zoom to the maximum value.
const unsigned int max_zoom_value = capabilities->zoom->max;
@@ -345,7 +349,7 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) {
base::Bind(&ImageCaptureClient::OnSetPhotoOptionsFailure,
image_capture_client_));
- mojom::PhotoSettingsPtr settings = mojom::PhotoSettings::New();
+ media::mojom::PhotoSettingsPtr settings = media::mojom::PhotoSettings::New();
settings->zoom = max_zoom_value;
settings->has_zoom = true;
@@ -427,4 +431,4 @@ INSTANTIATE_TEST_CASE_P(,
CommandLineTestData{"fps=29.97", 29.97f},
CommandLineTestData{"fps=60", 60},
CommandLineTestData{"fps=1000", 60}));
-}; // namespace media
+}; // namespace device
« no previous file with comments | « device/capture/video/fake_video_capture_device_factory.cc ('k') | device/capture/video/file_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698