Style fixes.
Was previously running the clang-format command incorrectly;
was not using the .clang-format file, and so was formatting
in some different style.
Change-Id: I09e81b919d1e6d40a56eb4f3f519aaed281a0c86
TEST: unit tests pass
diff --git a/modules/camera/3_4/metadata/ignored_control.h b/modules/camera/3_4/metadata/ignored_control.h
index ef36784..aea8988 100644
--- a/modules/camera/3_4/metadata/ignored_control.h
+++ b/modules/camera/3_4/metadata/ignored_control.h
@@ -31,8 +31,10 @@
template <typename T>
class IgnoredControl : public OptionedControl<T> {
public:
- IgnoredControl(int32_t control_tag, int32_t options_tag,
- std::vector<T> options, T default_option)
+ IgnoredControl(int32_t control_tag,
+ int32_t options_tag,
+ std::vector<T> options,
+ T default_option)
: OptionedControl<T>(control_tag, options_tag, options),
// Note: default option is not enforced as being in |options|,
// but it may be confusing if it isn't.
diff --git a/modules/camera/3_4/metadata/ignored_control_test.cpp b/modules/camera/3_4/metadata/ignored_control_test.cpp
index bab3754..04408d2 100644
--- a/modules/camera/3_4/metadata/ignored_control_test.cpp
+++ b/modules/camera/3_4/metadata/ignored_control_test.cpp
@@ -41,8 +41,8 @@
default_option_(options_[2]) {}
virtual void SetUp() {
- control_.reset(new IgnoredControl<uint8_t>(control_tag_, options_tag_,
- options_, default_option_));
+ control_.reset(new IgnoredControl<uint8_t>(
+ control_tag_, options_tag_, options_, default_option_));
}
std::unique_ptr<IgnoredControl<uint8_t>> control_;
diff --git a/modules/camera/3_4/metadata/metadata.cpp b/modules/camera/3_4/metadata/metadata.cpp
index 0d03d5f..61336fe 100644
--- a/modules/camera/3_4/metadata/metadata.cpp
+++ b/modules/camera/3_4/metadata/metadata.cpp
@@ -22,9 +22,13 @@
namespace v4l2_camera_hal {
-Metadata::Metadata() { HAL_LOG_ENTER(); }
+Metadata::Metadata() {
+ HAL_LOG_ENTER();
+}
-Metadata::~Metadata() { HAL_LOG_ENTER(); }
+Metadata::~Metadata() {
+ HAL_LOG_ENTER();
+}
void Metadata::AddComponent(
std::unique_ptr<PartialMetadataInterface> component) {
@@ -71,21 +75,24 @@
// Populate the meta fields.
static_tags.push_back(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS);
res = metadata->update(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,
- control_tags.data(), control_tags.size());
+ control_tags.data(),
+ control_tags.size());
if (res != android::OK) {
HAL_LOGE("Failed to add request keys meta key.");
return -ENODEV;
}
static_tags.push_back(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS);
res = metadata->update(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,
- dynamic_tags.data(), dynamic_tags.size());
+ dynamic_tags.data(),
+ dynamic_tags.size());
if (res != android::OK) {
HAL_LOGE("Failed to add result keys meta key.");
return -ENODEV;
}
static_tags.push_back(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS);
res = metadata->update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,
- static_tags.data(), static_tags.size());
+ static_tags.data(),
+ static_tags.size());
if (res != android::OK) {
HAL_LOGE("Failed to add characteristics keys meta key.");
return -ENODEV;
@@ -98,7 +105,8 @@
HAL_LOG_ENTER();
// Empty means "use previous settings", which are inherently valid.
- if (metadata.isEmpty()) return true;
+ if (metadata.isEmpty())
+ return true;
for (auto& component : components_) {
// Check that all components support the values requested of them.
@@ -116,7 +124,8 @@
HAL_LOG_ENTER();
// Empty means "use previous settings".
- if (metadata.isEmpty()) return 0;
+ if (metadata.isEmpty())
+ return 0;
for (auto& component : components_) {
int res = component->SetRequestValues(metadata);
diff --git a/modules/camera/3_4/metadata/metadata_common.h b/modules/camera/3_4/metadata/metadata_common.h
index 55f8a6f..efea152 100644
--- a/modules/camera/3_4/metadata/metadata_common.h
+++ b/modules/camera/3_4/metadata/metadata_common.h
@@ -53,8 +53,10 @@
// Generic (pointer & size).
template <typename T>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
- const T* data, size_t count) {
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
+ const T* data,
+ size_t count) {
int res = metadata->update(tag, data, count);
if (res) {
HAL_LOGE("Failed to update metadata tag %d", tag);
@@ -65,35 +67,40 @@
// Generic (single item reference).
template <typename T>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
const T& val) {
return UpdateMetadata(metadata, tag, &val, 1);
}
// Specialization for vectors.
template <typename T>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
const std::vector<T>& val) {
return UpdateMetadata(metadata, tag, val.data(), val.size());
}
// Specialization for arrays.
template <typename T, size_t N>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
const std::array<T, N>& val) {
return UpdateMetadata(metadata, tag, val.data(), N);
}
// Specialization for ArrayVectors.
template <typename T, size_t N>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
const ArrayVector<T, N>& val) {
return UpdateMetadata(metadata, tag, val.data(), val.total_num_elements());
}
// Specialization for vectors of arrays.
template <typename T, size_t N>
-static int UpdateMetadata(android::CameraMetadata* metadata, int32_t tag,
+static int UpdateMetadata(android::CameraMetadata* metadata,
+ int32_t tag,
const std::vector<std::array<T, N>>& val) {
// Convert to array vector so we know all the elements are contiguous.
ArrayVector<T, N> array_vector;
@@ -154,7 +161,8 @@
// Singleton.
template <typename T>
-static int SingleTagValue(const android::CameraMetadata& metadata, int32_t tag,
+static int SingleTagValue(const android::CameraMetadata& metadata,
+ int32_t tag,
T* val) {
camera_metadata_ro_entry_t entry = metadata.find(tag);
if (entry.count == 0) {
@@ -164,7 +172,8 @@
HAL_LOGE(
"Error: expected metadata tag %d to contain exactly 1 value "
"(had %d).",
- tag, entry.count);
+ tag,
+ entry.count);
return -EINVAL;
}
const T* data = nullptr;
@@ -179,7 +188,8 @@
// Specialization for std::array.
template <typename T, size_t N>
-static int SingleTagValue(const android::CameraMetadata& metadata, int32_t tag,
+static int SingleTagValue(const android::CameraMetadata& metadata,
+ int32_t tag,
std::array<T, N>* val) {
camera_metadata_ro_entry_t entry = metadata.find(tag);
if (entry.count == 0) {
@@ -189,7 +199,9 @@
HAL_LOGE(
"Error: expected metadata tag %d to contain a single array of "
"exactly %d values (had %d).",
- tag, N, entry.count);
+ tag,
+ N,
+ entry.count);
return -EINVAL;
}
const T* data = nullptr;
diff --git a/modules/camera/3_4/metadata/optioned_control.h b/modules/camera/3_4/metadata/optioned_control.h
index 10052cc..e205a59 100644
--- a/modules/camera/3_4/metadata/optioned_control.h
+++ b/modules/camera/3_4/metadata/optioned_control.h
@@ -33,7 +33,8 @@
template <typename T>
class OptionedControl : public Control<T> {
public:
- OptionedControl(int32_t control_tag, int32_t options_tag,
+ OptionedControl(int32_t control_tag,
+ int32_t options_tag,
std::vector<T> options);
virtual int PopulateStaticFields(
@@ -57,7 +58,8 @@
// -----------------------------------------------------------------------------
template <typename T>
-OptionedControl<T>::OptionedControl(int32_t control_tag, int32_t options_tag,
+OptionedControl<T>::OptionedControl(int32_t control_tag,
+ int32_t options_tag,
std::vector<T> options)
: Control<T>(control_tag, {options_tag}), options_(std::move(options)) {
HAL_LOG_ENTER();
diff --git a/modules/camera/3_4/metadata/optioned_control_test.cpp b/modules/camera/3_4/metadata/optioned_control_test.cpp
index 1cfccbf..bd9b705 100644
--- a/modules/camera/3_4/metadata/optioned_control_test.cpp
+++ b/modules/camera/3_4/metadata/optioned_control_test.cpp
@@ -36,7 +36,8 @@
template <typename T>
class MockOptionedControl : public OptionedControl<T> {
public:
- MockOptionedControl(int32_t control_tag, int32_t options_tag,
+ MockOptionedControl(int32_t control_tag,
+ int32_t options_tag,
std::vector<T> options)
: OptionedControl<T>(control_tag, options_tag, options){};
MOCK_CONST_METHOD1_T(GetValue, int(T* value));
diff --git a/modules/camera/3_4/metadata/test_common.h b/modules/camera/3_4/metadata/test_common.h
index 6cbd611..489990f 100644
--- a/modules/camera/3_4/metadata/test_common.h
+++ b/modules/camera/3_4/metadata/test_common.h
@@ -32,7 +32,9 @@
// Generic.
template <typename T>
static void ExpectMetadataEq(const android::CameraMetadata& metadata,
- int32_t tag, const T* expected, size_t size) {
+ int32_t tag,
+ const T* expected,
+ size_t size) {
camera_metadata_ro_entry_t entry = metadata.find(tag);
ASSERT_EQ(entry.count, size);
const T* data = nullptr;
@@ -46,30 +48,34 @@
// Single item.
template <typename T>
static void ExpectMetadataEq(const android::CameraMetadata& metadata,
- int32_t tag, T expected) {
+ int32_t tag,
+ T expected) {
ExpectMetadataEq(metadata, tag, &expected, 1);
}
// Vector of items.
template <typename T>
static void ExpectMetadataEq(const android::CameraMetadata& metadata,
- int32_t tag, const std::vector<T>& expected) {
+ int32_t tag,
+ const std::vector<T>& expected) {
ExpectMetadataEq(metadata, tag, expected.data(), expected.size());
}
// Array of items.
template <typename T, size_t N>
static void ExpectMetadataEq(const android::CameraMetadata& metadata,
- int32_t tag, const std::array<T, N>& expected) {
+ int32_t tag,
+ const std::array<T, N>& expected) {
ExpectMetadataEq(metadata, tag, expected.data(), N);
}
// ArrayVector.
template <typename T, size_t N>
static void ExpectMetadataEq(const android::CameraMetadata& metadata,
- int32_t tag, const ArrayVector<T, N>& expected) {
- ExpectMetadataEq(metadata, tag, expected.data(),
- expected.total_num_elements());
+ int32_t tag,
+ const ArrayVector<T, N>& expected) {
+ ExpectMetadataEq(
+ metadata, tag, expected.data(), expected.total_num_elements());
}
// Vector of arrays.
diff --git a/modules/camera/3_4/metadata/v4l2_enum_control.cpp b/modules/camera/3_4/metadata/v4l2_enum_control.cpp
index 58e1b6b..9968b0b 100644
--- a/modules/camera/3_4/metadata/v4l2_enum_control.cpp
+++ b/modules/camera/3_4/metadata/v4l2_enum_control.cpp
@@ -21,8 +21,11 @@
namespace v4l2_camera_hal {
V4L2EnumControl* V4L2EnumControl::NewV4L2EnumControl(
- std::shared_ptr<V4L2Wrapper> device, int v4l2_control, int32_t control_tag,
- int32_t options_tag, const std::map<int32_t, uint8_t>& v4l2_to_metadata) {
+ std::shared_ptr<V4L2Wrapper> device,
+ int v4l2_control,
+ int32_t control_tag,
+ int32_t options_tag,
+ const std::map<int32_t, uint8_t>& v4l2_to_metadata) {
HAL_LOG_ENTER();
// Query the device.
@@ -37,7 +40,8 @@
HAL_LOGE(
"Enum controls can only be constructed from V4L2 menu and boolean "
"controls (%d is of type %d)",
- v4l2_control, control_query.type);
+ v4l2_control,
+ control_query.type);
return nullptr;
}
@@ -46,7 +50,8 @@
int32_t control_max = static_cast<int32_t>(control_query.maximum);
// Query maximum is inclusive.
for (int32_t i = static_cast<int32_t>(control_query.minimum);
- i <= control_max; i += control_query.step) {
+ i <= control_max;
+ i += control_query.step) {
auto map_entry = v4l2_to_metadata.find(i);
if (map_entry == v4l2_to_metadata.end()) {
HAL_LOGW("Control %d has unknown option %d.", v4l2_control, i);
@@ -60,13 +65,20 @@
}
// Construct the device.
- return new V4L2EnumControl(device, v4l2_control, control_tag, options_tag,
- std::move(v4l2_to_metadata), std::move(options));
+ return new V4L2EnumControl(device,
+ v4l2_control,
+ control_tag,
+ options_tag,
+ std::move(v4l2_to_metadata),
+ std::move(options));
}
V4L2EnumControl::V4L2EnumControl(
- std::shared_ptr<V4L2Wrapper> device, int v4l2_control, int32_t control_tag,
- int32_t options_tag, const std::map<int32_t, uint8_t> v4l2_to_metadata,
+ std::shared_ptr<V4L2Wrapper> device,
+ int v4l2_control,
+ int32_t control_tag,
+ int32_t options_tag,
+ const std::map<int32_t, uint8_t> v4l2_to_metadata,
std::vector<uint8_t> options)
: OptionedControl<uint8_t>(control_tag, options_tag, std::move(options)),
device_(device),
diff --git a/modules/camera/3_4/metadata/v4l2_enum_control.h b/modules/camera/3_4/metadata/v4l2_enum_control.h
index 93fc0e2..f4027b8 100644
--- a/modules/camera/3_4/metadata/v4l2_enum_control.h
+++ b/modules/camera/3_4/metadata/v4l2_enum_control.h
@@ -36,16 +36,20 @@
// Functionally equivalent to "new V4L2EnumControl"
// except that it may return nullptr in case of failure.
static V4L2EnumControl* NewV4L2EnumControl(
- std::shared_ptr<V4L2Wrapper> device, int v4l2_control,
- int32_t control_tag, int32_t options_tag,
+ std::shared_ptr<V4L2Wrapper> device,
+ int v4l2_control,
+ int32_t control_tag,
+ int32_t options_tag,
const std::map<int32_t, uint8_t>& v4l2_to_metadata);
private:
// Constructor private to allow failing on bad input.
// Use NewV4L2EnumControl instead.
// The values in |v4l2_to_metadata| must be a superset of |options|.
- V4L2EnumControl(std::shared_ptr<V4L2Wrapper> device, int v4l2_control,
- int32_t control_tag, int32_t options_tag,
+ V4L2EnumControl(std::shared_ptr<V4L2Wrapper> device,
+ int v4l2_control,
+ int32_t control_tag,
+ int32_t options_tag,
const std::map<int32_t, uint8_t> v4l2_to_metadata,
std::vector<uint8_t> options);
diff --git a/modules/camera/3_4/metadata/v4l2_enum_control_test.cpp b/modules/camera/3_4/metadata/v4l2_enum_control_test.cpp
index 54f78f3..05257c8 100644
--- a/modules/camera/3_4/metadata/v4l2_enum_control_test.cpp
+++ b/modules/camera/3_4/metadata/v4l2_enum_control_test.cpp
@@ -43,8 +43,12 @@
virtual void SetUp() {
device_.reset(new V4L2WrapperMock());
- control_.reset(new V4L2EnumControl(device_, v4l2_control_, control_tag_,
- options_tag_, options_map_, options_));
+ control_.reset(new V4L2EnumControl(device_,
+ v4l2_control_,
+ control_tag_,
+ options_tag_,
+ options_map_,
+ options_));
}
virtual uint8_t V4L2ToMetadata(int32_t value) {
@@ -83,8 +87,8 @@
.WillOnce(DoAll(SetArgPointee<1>(query_result), Return(0)));
std::unique_ptr<V4L2EnumControl> test_control(
- V4L2EnumControl::NewV4L2EnumControl(device_, v4l2_control_, control_tag_,
- options_tag_, options_map_));
+ V4L2EnumControl::NewV4L2EnumControl(
+ device_, v4l2_control_, control_tag_, options_tag_, options_map_));
// Shouldn't be null.
ASSERT_NE(test_control.get(), nullptr);
@@ -119,8 +123,8 @@
EXPECT_CALL(*device_, QueryControl(v4l2_control_, _)).WillOnce(Return(err));
std::unique_ptr<V4L2EnumControl> test_control(
- V4L2EnumControl::NewV4L2EnumControl(device_, v4l2_control_, control_tag_,
- options_tag_, options_map_));
+ V4L2EnumControl::NewV4L2EnumControl(
+ device_, v4l2_control_, control_tag_, options_tag_, options_map_));
// Should return null to indicate error.
ASSERT_EQ(test_control.get(), nullptr);
}
@@ -136,8 +140,8 @@
.WillOnce(DoAll(SetArgPointee<1>(query_result), Return(0)));
std::unique_ptr<V4L2EnumControl> test_control(
- V4L2EnumControl::NewV4L2EnumControl(device_, v4l2_control_, control_tag_,
- options_tag_, options_map_));
+ V4L2EnumControl::NewV4L2EnumControl(
+ device_, v4l2_control_, control_tag_, options_tag_, options_map_));
// Should return null to indicate error.
ASSERT_FALSE(test_control);
}
@@ -167,8 +171,8 @@
TEST_F(V4L2EnumControlTest, SetUnmapped) {
// If the enum control is validly constructed, this should never happen.
// Purposefully misconstruct a device for this test (empty map).
- V4L2EnumControl test_control(device_, v4l2_control_, control_tag_,
- options_tag_, {}, options_);
+ V4L2EnumControl test_control(
+ device_, v4l2_control_, control_tag_, options_tag_, {}, options_);
EXPECT_EQ(test_control.SetValue(options_[0]), -ENODEV);
}