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

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

Issue 2508803002: Rotate frames correctly for back camera (Closed)
Patch Set: Use usb_path to get lens_facing 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/camera_characteristics.h
diff --git a/media/capture/video/linux/camera_characteristics.h b/media/capture/video/linux/camera_characteristics.h
new file mode 100644
index 0000000000000000000000000000000000000000..9b017f6ea2916da8e8ba8bc51e8ca67d3f21585f
--- /dev/null
+++ b/media/capture/video/linux/camera_characteristics.h
@@ -0,0 +1,94 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_CAPTURE_VIDEO_LINUX_CAMERA_CHARACTERISTICS_H_
+#define MEDIA_CAPTURE_VIDEO_LINUX_CAMERA_CHARACTERISTICS_H_
+
+#include <stddef.h>
+
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <base/strings/string_piece.h>
+
+namespace media {
+
+// DeviceInfo can be found in /etc/camera/camera_characteristics.conf on device.
+struct CameraDeviceInfo {
+ static const int LENS_FACING_FRONT = 0;
+ static const int LENS_FACING_BACK = 1;
+ // USB vender id and product id in "pid:vid" format.
+ std::string vid_pid;
+ // Direction the camera faces relative to device screen.
+ uint32_t lens_facing;
+};
+
+typedef std::vector<CameraDeviceInfo> CameraDeviceInfos;
+
+// CameraCharacteristics reads the file /etc/camera/camera_characteristics.conf
+// and populates |camera_id_to_facing_|, |usb_id_to_camera_id_| and
+// |model_id_to_camera_id_|.
+//
+// Each line in the config file can be:
+// 1. Empty line
+// 2. Line starts with '#': comments
+// 3. Line follows the format:
+// camera[camera_id].[root_level_attribute]=[value] OR
+// camera[camera_id].module[module_id].[module_level_attribute]=[value]
+//
+// There are several assumptions of the config file:
+// 1. One camera ID has exactly one lens_facing attribute, at root level.
+// 2. usb_path is specified at module level. usb_path may not present at all,
+// but if it presents, the same usb_path does not appear accross different
+// camera IDs.
+// 3. usb_vid_pid is specified at module level. If usb_path does not present,
+// each module needs to have one unique usb_vid_pid.
+//
+// Example of the config file:
+// camera0.lens_facing=0
+// camera0.sensor_orientation=0
+// camera0.module0.usb_vid_pid=0123:4567
+// camera0.module0.horizontal_view_angle=68.4
+// camera0.module0.lens_info_available_focal_lengths=1.64
+// camera0.module0.lens_info_minimum_focus_distance=0.22
+// camera0.module0.lens_info_optimal_focus_distance=0.5
+// camera0.module0.vertical_view_angle=41.6
+// camera0.module1.usb_vid_pid=89ab:cdef
+// camera0.module1.lens_info_available_focal_lengths=1.69,2
+// camera1.lens_facing=1
+// camera1.sensor_orientation=180
+class CameraCharacteristics {
+ public:
+ CameraCharacteristics();
+ ~CameraCharacteristics();
+
+ // Get camera facing by specifying USB vid and pid and device path. |model_id|
+ // should be formatted as "vid:pid". |device_id| is something like
+ // "/dev/video2". It first tries to match usb path, obtained from |device_id|.
+ // If fails, |model_id| is then used.
+ // Returns CameraDeviceInfo::LENS_FACING_FRONT or
+ // CameraDeviceInfo::LENS_FACING_BACK.
+ // Default is CameraDeviceInfo::LENS_FACING_FRONT.
+ int GetCameraFacing(const std::string& model_id,
kcwu 2016/11/24 10:16:08 If device_id is matched first, please put it as th
shenghao 2016/11/24 14:13:25 Done.
+ const std::string& device_id);
+
+ private:
+ std::string content_;
+ std::unordered_map<int, int> camera_id_to_facing_;
+ std::map<base::StringPiece, int> usb_id_to_camera_id_;
kcwu 2016/11/24 10:16:08 use std::string instead. Then we don't need to kee
shenghao 2016/11/24 14:13:25 Done.
+ std::unordered_map<std::string, int> model_id_to_camera_id_;
+
+ std::string GetUsbId(const std::string& device_id);
kcwu 2016/11/24 10:16:08 Methods should put before member variables.
shenghao 2016/11/24 14:13:25 Done.
+ bool GetCameraId(const base::StringPiece& sub_key, int* camera_id);
+
+ // Read file content and populate |camera_id_to_facing_|,
+ // |usb_id_to_camera_id_| and |model_id_to_camera_id_|.
+ void InitializeDeviceInfo();
+};
+
+} // namespace arc
+
+#endif // MEDIA_CAPTURE_VIDEO_LINUX_CAMERA_CHARACTERISTICS_H_

Powered by Google App Engine
This is Rietveld 408576698