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

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

Issue 2554903002: Revert of Rotate frames correctly for back camera (Closed)
Patch Set: Created 4 years 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/video_capture_device_chromeos.cc
diff --git a/media/capture/video/linux/video_capture_device_chromeos.cc b/media/capture/video/linux/video_capture_device_chromeos.cc
index 9e8dd19806e7bda97804b58cccbcf28792fab672..1e6006c734ab71b66f6353794a6f244571b424ae 100644
--- a/media/capture/video/linux/video_capture_device_chromeos.cc
+++ b/media/capture/video/linux/video_capture_device_chromeos.cc
@@ -7,7 +7,6 @@
#include <stdint.h>
#include "base/bind.h"
-#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
@@ -17,13 +16,6 @@
#include "ui/display/screen.h"
namespace media {
-
-namespace {
-
-base::LazyInstance<CameraFacingChromeOS>::Leaky g_camera_facing_ =
- LAZY_INSTANCE_INITIALIZER;
-
-} // namespace
// This is a delegate class used to transfer Display change events from the UI
// thread to the media thread.
@@ -107,53 +99,10 @@
const VideoCaptureDeviceDescriptor& device_descriptor)
: VideoCaptureDeviceLinux(device_descriptor),
screen_observer_delegate_(
- new ScreenObserverDelegate(this, ui_task_runner)),
- lens_facing_(
- g_camera_facing_.Get().GetCameraFacing(device_descriptor.device_id,
- device_descriptor.model_id)) {}
+ new ScreenObserverDelegate(this, ui_task_runner)) {}
VideoCaptureDeviceChromeOS::~VideoCaptureDeviceChromeOS() {
screen_observer_delegate_->RemoveObserver();
-}
-
-void VideoCaptureDeviceChromeOS::SetRotation(int rotation) {
- // We assume external camera is facing the users. If not, the users can
- // rotate the camera manually by themselves.
- if (lens_facing_ == CameraFacingChromeOS::LensFacing::BACK) {
- // Original frame when |rotation| = 0
- // -----------------------
- // | * |
- // | * * |
- // | * * |
- // | ******* |
- // | * * |
- // | * * |
- // -----------------------
- //
- // |rotation| = 90, this is what back camera sees
- // -----------------------
- // | ******** |
- // | * **** |
- // | * *** |
- // | * *** |
- // | * **** |
- // | ******** |
- // -----------------------
- //
- // |rotation| = 90, this is what front camera sees
- // -----------------------
- // | ******** |
- // | **** * |
- // | *** * |
- // | *** * |
- // | **** * |
- // | ******** |
- // -----------------------
- //
- // Therefore, for back camera, we need to rotate (360 - |rotation|).
- rotation = (360 - rotation) % 360;
- }
- VideoCaptureDeviceLinux::SetRotation(rotation);
}
void VideoCaptureDeviceChromeOS::SetDisplayRotation(
« no previous file with comments | « media/capture/video/linux/video_capture_device_chromeos.h ('k') | media/capture/video/linux/video_capture_device_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698