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

Unified Diff: media/capture/video/linux/camera_facing_chromeos.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_facing_chromeos.cc
diff --git a/media/capture/video/linux/camera_facing_chromeos.cc b/media/capture/video/linux/camera_facing_chromeos.cc
deleted file mode 100644
index ad54ed4185e757836431ca31c057b91fb4c3df1b..0000000000000000000000000000000000000000
--- a/media/capture/video/linux/camera_facing_chromeos.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-// 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.
-
-#include "camera_facing_chromeos.h"
-
-#include <base/files/file_util.h>
-#include <base/logging.h>
-#include <base/strings/stringprintf.h>
-#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_piece.h>
-#include <base/strings/string_split.h>
-#include <base/strings/string_util.h>
-
-namespace media {
-
-namespace {
-
-// The value for each field in the enum matches the value in
-// /etc/camera/camera_characteristics.conf.
-enum LensFacing { FRONT = 0, BACK = 1 };
-
-bool GetCameraId(const base::StringPiece& sub_key, int* camera_id) {
- const base::StringPiece camera_id_prefix = "camera";
- if (!sub_key.starts_with(camera_id_prefix))
- return false;
- return base::StringToInt(sub_key.substr(camera_id_prefix.size()), camera_id);
-}
-}
-
-// /etc/camera/camera_characteristics.conf contains camera information which
-// driver cannot provide.
-static const char kCameraCharacteristicsConfigFile[] =
- "/etc/camera/camera_characteristics.conf";
-static const char kLensFacing[] = "lens_facing";
-static const char kUsbVidPid[] = "usb_vid_pid";
-static const char kUsbPath[] = "usb_path";
-
-CameraFacingChromeOS::CameraFacingChromeOS() {
- InitializeDeviceInfo(std::string(kCameraCharacteristicsConfigFile));
-}
-
-CameraFacingChromeOS::CameraFacingChromeOS(
- const std::string& config_file_path) {
- InitializeDeviceInfo(config_file_path);
-}
-
-CameraFacingChromeOS::~CameraFacingChromeOS() {}
-
-VideoFacingMode CameraFacingChromeOS::GetCameraFacing(
- const std::string& device_id,
- const std::string& model_id) const {
- std::string usb_id = GetUsbId(device_id);
- const auto& usb_id_to_camera_id_const = usb_id_to_camera_id_;
- const auto& model_id_to_camera_id_const = model_id_to_camera_id_;
- const auto& camera_id_to_facing_const = camera_id_to_facing_;
- auto usb_id_iter = usb_id_to_camera_id_const.find(usb_id);
- int camera_id;
- if (usb_id_iter == usb_id_to_camera_id_const.end()) {
- // Can't find Usb ID. Fall back to use model_id.
- auto model_id_iter = model_id_to_camera_id_const.find(model_id);
- if (model_id_iter == model_id_to_camera_id_const.end()) {
- DLOG(ERROR) << "Can't find model ID in config file: " << model_id;
- return kLensFacingDefault;
- }
- camera_id = model_id_iter->second;
- } else {
- camera_id = usb_id_iter->second;
- }
-
- auto camera_id_iter = camera_id_to_facing_const.find(camera_id);
- if (camera_id_iter == camera_id_to_facing_const.end()) {
- DLOG(ERROR) << "Can't find lens_facing of camera ID " << camera_id
- << " in config file";
- return kLensFacingDefault;
- }
- return camera_id_iter->second;
-}
-
-std::string CameraFacingChromeOS::GetUsbId(const std::string& device_id) const {
- // |device_id| is of the form "/dev/video2". We want to retrieve "video2"
- // into |file_name|.
- const std::string device_dir = "/dev/";
- if (!base::StartsWith(device_id, device_dir, base::CompareCase::SENSITIVE)) {
- DLOG(ERROR) << "device_id is invalid: " << device_id;
- return std::string();
- }
- const std::string file_name = device_id.substr(device_dir.length());
-
- // Usb ID can be obtained by "readlink /sys/class/video4linux/video2/device".
- const std::string symlink =
- base::StringPrintf("/sys/class/video4linux/%s/device", file_name.c_str());
- base::FilePath symlinkTarget;
- if (!base::ReadSymbolicLink(base::FilePath(symlink), &symlinkTarget)) {
- DPLOG(ERROR) << "Failed to readlink: " << symlink;
- return std::string();
- }
-
- // |symlinkTarget| is of the format "../../../A-B:C.D". Remove the path
- // prefix.
- base::StringPiece usb_part = symlinkTarget.BaseName().value();
-
- // |usb_part| is of the format "A-B:C.D" or "A-B.C:D". We want everything
- // before ":".
- std::vector<base::StringPiece> usb_id_pieces = base::SplitStringPiece(
- usb_part, ":", base::WhitespaceHandling::TRIM_WHITESPACE,
- base::SplitResult::SPLIT_WANT_ALL);
-
- if (usb_id_pieces.empty()) {
- DLOG(ERROR) << "Error after split: " << usb_part;
- return std::string();
- }
- return usb_id_pieces[0].as_string();
-}
-
-void CameraFacingChromeOS::InitializeDeviceInfo(
- const std::string& config_file_path) {
- const base::FilePath path(config_file_path);
- std::string content;
- if (!base::ReadFileToString(path, &content)) {
- DPLOG(ERROR) << "ReadFileToString fails";
- return;
- }
- const std::vector<base::StringPiece> lines = base::SplitStringPiece(
- content, "\n", base::WhitespaceHandling::TRIM_WHITESPACE,
- base::SplitResult::SPLIT_WANT_NONEMPTY);
-
- for (const base::StringPiece& line : lines) {
- if (line.starts_with("#")) // Ignore the comments that starts with "#".
- continue;
- const std::vector<base::StringPiece> key_value = base::SplitStringPiece(
- line, "=", base::WhitespaceHandling::TRIM_WHITESPACE,
- base::SplitResult::SPLIT_WANT_ALL);
- if (key_value.size() != 2) {
- DLOG(ERROR) << "Invalid line in config file: " << line;
- continue;
- }
- const auto& key = key_value[0];
- const auto& value = key_value[1];
- const std::vector<base::StringPiece> sub_keys = base::SplitStringPiece(
- key, ".", base::WhitespaceHandling::TRIM_WHITESPACE,
- base::SplitResult::SPLIT_WANT_ALL);
-
- if (sub_keys.size() < 1) {
- DLOG(ERROR) << "No valid sub key exists. Line format is invalid: "
- << line;
- continue;
- }
- int camera_id = 0;
- if (!GetCameraId(sub_keys[0], &camera_id)) {
- DLOG(ERROR) << "Invalid sub key for camera id: " << sub_keys[0];
- continue;
- }
-
- if (sub_keys.size() == 2 && sub_keys[1] == kLensFacing) {
- int lens_facing = -1;
- if (!base::StringToInt(value, &lens_facing)) {
- DLOG(ERROR) << "Invalid value for lens_facing: " << value;
- continue;
- }
- switch (lens_facing) {
- case LensFacing::FRONT:
- camera_id_to_facing_[camera_id] =
- VideoFacingMode::MEDIA_VIDEO_FACING_USER;
- break;
- case LensFacing::BACK:
- camera_id_to_facing_[camera_id] =
- VideoFacingMode::MEDIA_VIDEO_FACING_ENVIRONMENT;
- break;
- default:
- DLOG(ERROR) << "Invalid value for lens_facing: " << lens_facing;
- continue;
- }
- } else if (sub_keys.size() == 3 && sub_keys[2] == kUsbVidPid) {
- if (value.empty()) {
- DLOG(ERROR) << "model_id is empty";
- continue;
- }
- std::string model_id = value.as_string();
- std::transform(model_id.begin(), model_id.end(), model_id.begin(),
- ::tolower);
- model_id_to_camera_id_[model_id] = camera_id;
- } else if (sub_keys.size() == 3 && sub_keys[2] == kUsbPath) {
- if (value.empty()) {
- DLOG(ERROR) << "usb_path is empty";
- continue;
- }
- usb_id_to_camera_id_[value.as_string()] = camera_id;
- }
- // Ignore unknown or unutilized attributes.
- }
-}
-
-} // namespace media
« no previous file with comments | « media/capture/video/linux/camera_facing_chromeos.h ('k') | media/capture/video/linux/camera_facing_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698