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

Unified Diff: media/capture/video/linux/video_capture_device_linux.h

Issue 2508803002: Rotate frames correctly for back camera (Closed)
Patch Set: Move parsing back to constructor Created 4 years, 1 month 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_linux.h
diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h
index e8adbde8df41715bdd075c0c921c3f6446eb4383..b438f738b04a7b0695f04a1c4156e702e54baf90 100644
--- a/media/capture/video/linux/video_capture_device_linux.h
+++ b/media/capture/video/linux/video_capture_device_linux.h
@@ -16,8 +16,10 @@
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
+#include "base/lazy_instance.h"
kcwu 2016/11/28 10:11:37 unused
shenghao 2016/11/29 10:22:27 Done.
#include "base/macros.h"
#include "base/threading/thread.h"
+#include "media/capture/video/linux/camera_characteristics.h"
#include "media/capture/video/video_capture_device.h"
#include "media/capture/video_capture_types.h"
@@ -45,20 +47,20 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
SetPhotoOptionsCallback callback) override;
protected:
- void SetRotation(int rotation);
+ virtual void SetRotation(int rotation);
+
+ const VideoCaptureDeviceDescriptor device_descriptor_;
private:
static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency);
+ base::Thread v4l2_thread_; // Thread used for reading data from the device.
kcwu 2016/11/28 10:11:37 move to line 64 (keep it on original line)
shenghao 2016/11/29 10:22:27 Done.
+
// Internal delegate doing the actual capture setting, buffer allocation and
// circulation with the V4L2 API. Created and deleted in the thread where
// VideoCaptureDeviceLinux lives but otherwise operating on |v4l2_thread_|.
scoped_refptr<V4L2CaptureDelegate> capture_impl_;
- base::Thread v4l2_thread_; // Thread used for reading data from the device.
-
- const VideoCaptureDeviceDescriptor device_descriptor_;
-
DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
};

Powered by Google App Engine
This is Rietveld 408576698