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

Unified Diff: media/capture/video/linux/video_capture_device_factory_linux.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
« no previous file with comments | « media/capture/video/linux/video_capture_device_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/linux/video_capture_device_factory_linux.cc
diff --git a/media/capture/video/linux/video_capture_device_factory_linux.cc b/media/capture/video/linux/video_capture_device_factory_linux.cc
index 14a1ca12e6b4c5679e1ed4efd5fc3df4b9aae3a2..e1190478410a6c6321c0502a7dbd48e08b079774 100644
--- a/media/capture/video/linux/video_capture_device_factory_linux.cc
+++ b/media/capture/video/linux/video_capture_device_factory_linux.cc
@@ -23,7 +23,7 @@
#if defined(OS_CHROMEOS)
#include "base/lazy_instance.h"
-#include "media/capture/video/linux/camera_facing_chromeos.h"
+#include "media/capture/video/linux/camera_config_chromeos.h"
#include "media/capture/video/linux/video_capture_device_chromeos.h"
#endif
#include "media/capture/video/linux/video_capture_device_linux.h"
@@ -33,7 +33,7 @@ namespace media {
namespace {
#if defined(OS_CHROMEOS)
-base::LazyInstance<media::CameraFacingChromeOS>::Leaky g_camera_facing_helper =
+base::LazyInstance<media::CameraConfigChromeOS>::Leaky g_camera_config =
LAZY_INSTANCE_INITIALIZER;
#endif
}
@@ -220,7 +220,7 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceDescriptors(
reinterpret_cast<char*>(cap.card), unique_id, model_id,
VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE,
VideoCaptureTransportType::OTHER_TRANSPORT,
- g_camera_facing_helper.Get().GetCameraFacing(unique_id, model_id));
+ g_camera_config.Get().GetCameraFacing(unique_id, model_id));
#else
device_descriptors->emplace_back(
reinterpret_cast<char*>(cap.card), unique_id, model_id,
« no previous file with comments | « media/capture/video/linux/video_capture_device_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698