Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use std::unordered_map for mTagToTypeMap"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-01 22:18:18 +00:00
committed by Android (Google) Code Review
parent 920a28f0d2 356e28fdb1
commit 4a35fa3b54
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
camera/common/1.0/default/VendorTagDescriptor.cpp
View File

@@ -116,11 +116,11 @@ const char* VendorTagDescriptor::getTagName(uint32_t tag) const {
}
int VendorTagDescriptor::getTagType(uint32_t tag) const {
ssize_t index = mTagToNameMap.indexOfKey(tag);
if (index < 0) {
auto iter = mTagToTypeMap.find(tag);
if (iter == mTagToTypeMap.end()) {
return VENDOR_TAG_TYPE_ERR;
}
return mTagToTypeMap.valueFor(tag);
return iter->second;
}
const SortedVector<String8>* VendorTagDescriptor::getAllSectionNames() const {
@@ -167,7 +167,7 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const {
String8 name = mTagToNameMap.valueAt(i);
uint32_t sectionId = mTagToSectionMap.valueFor(tag);
String8 sectionName = mSections[sectionId];
int type = mTagToTypeMap.valueFor(tag);
int type = mTagToTypeMap.at(tag);
const char* typeName = (type >= 0 && type < NUM_TYPES) ?
camera_metadata_type_names[type] : "UNKNOWN";
dprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2,
@@ -251,7 +251,7 @@ status_t VendorTagDescriptor::createDescriptorFromOps(const vendor_tag_ops_t* vO
ALOGE("%s: tag type %d from vendor ops does not exist.", __FUNCTION__, tagType);
return BAD_VALUE;
}
desc->mTagToTypeMap.add(tag, tagType);
desc->mTagToTypeMap.insert(std::make_pair(tag, tagType));
}
desc->mSections = sections;

4
camera/common/1.0/default/include/VendorTagDescriptor.h
View File

@@ -24,6 +24,7 @@
#include <system/camera_vendor_tags.h>
#include <stdint.h>
#include <unordered_map>
namespace android {
namespace hardware {
@@ -94,7 +95,8 @@ class VendorTagDescriptor {
KeyedVector<String8, KeyedVector<String8, uint32_t>*> mReverseMapping;
KeyedVector<uint32_t, String8> mTagToNameMap;
KeyedVector<uint32_t, uint32_t> mTagToSectionMap; // Value is offset in mSections
KeyedVector<uint32_t, int32_t> mTagToTypeMap;
std::unordered_map<uint32_t, int32_t> mTagToTypeMap;
SortedVector<String8> mSections;
// must be int32_t to be compatible with Parcel::writeInt32
int32_t mTagCount;