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

Unified Diff: media/capture/video/linux/camera_config_chromeos_unittest.cc

Issue 2648743002: Rotate frames according to camera orientation (Closed)
Patch Set: removed {} for one-line blocks Created 3 years, 11 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: media/capture/video/linux/camera_config_chromeos_unittest.cc
diff --git a/media/capture/video/linux/camera_facing_chromeos_unittest.cc b/media/capture/video/linux/camera_config_chromeos_unittest.cc
similarity index 53%
rename from media/capture/video/linux/camera_facing_chromeos_unittest.cc
rename to media/capture/video/linux/camera_config_chromeos_unittest.cc
index 78e50e4be3cb8b4637f544f1c44f60b302f5fc8e..4610803b2b3a08a58760dbbf5784221d765ca7e7 100644
--- a/media/capture/video/linux/camera_facing_chromeos_unittest.cc
+++ b/media/capture/video/linux/camera_config_chromeos_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "media/capture/video/linux/camera_facing_chromeos.h"
+#include "media/capture/video/linux/camera_config_chromeos.h"
#include "testing/gtest/include/gtest/gtest.h"
#include <base/files/file_util.h>
@@ -15,27 +15,31 @@ namespace media {
namespace {
const char kConfigFileContent[] =
- "camera0.lens_facing=1\ncamera0.sensor_orientation=0\ncamera0.module0.usb_"
+ "camera0.lens_facing=1\ncamera0.sensor_orientation=90\ncamera0.module0.usb_"
"vid_pid=04f2:b53a\n";
}
-TEST(CameraFacingChromeOSTest, ParseSuccessfully) {
+TEST(CameraConfigChromeOSTest, ParseSuccessfully) {
const char file_name[] = "fake_camera_characteristics.conf";
base::WriteFile(base::FilePath(file_name), kConfigFileContent,
sizeof(kConfigFileContent));
std::string file_name_str(file_name);
- CameraFacingChromeOS camera_facing(file_name_str);
+ CameraConfigChromeOS camera_config(file_name_str);
EXPECT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_ENVIRONMENT,
- camera_facing.GetCameraFacing(std::string("/dev/video2"),
+ camera_config.GetCameraFacing(std::string("/dev/video2"),
std::string("04f2:b53a")));
+ EXPECT_EQ(90, camera_config.GetOrientation(std::string("/dev/video2"),
+ std::string("04f2:b53a")));
}
-TEST(CameraFacingChromeOSTest, ConfigFileNotExist) {
- CameraFacingChromeOS camera_facing(std::string("file_not_exist"));
+TEST(CameraConfigChromeOSTest, ConfigFileNotExist) {
+ CameraConfigChromeOS camera_config(std::string("file_not_exist"));
EXPECT_EQ(VideoFacingMode::MEDIA_VIDEO_FACING_NONE,
- camera_facing.GetCameraFacing(std::string("/dev/video2"),
+ camera_config.GetCameraFacing(std::string("/dev/video2"),
std::string("04f2:b53a")));
+ EXPECT_EQ(0, camera_config.GetOrientation(std::string("/dev/video2"),
+ std::string("04f2:b53a")));
}
} // namespace media
« no previous file with comments | « media/capture/video/linux/camera_config_chromeos.cc ('k') | media/capture/video/linux/camera_facing_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698