Fix style violation according to go/droidcppstyle
Local variable should be lowerCamelCase.
This change leave the buffer_state fence_state,
active_clients_bit_mask and queue_index in MetadataHeader unchanged
because there are too many instances of them that need to be changed in
both new bufferhub system and the old pdx-backed bufferhubd system.
I will do a separate change for that.
Test: m, mma
Bug: 68273829
Change-Id: Ia91cf7debe01a402f61171f069988e0ac13cec6a
diff --git a/services/bufferhub/BufferNode.cpp b/services/bufferhub/BufferNode.cpp
index 4f877b2..1efb27e 100644
--- a/services/bufferhub/BufferNode.cpp
+++ b/services/bufferhub/BufferNode.cpp
@@ -28,17 +28,17 @@
}
// Allocates a new BufferNode.
-BufferNode::BufferNode(uint32_t width, uint32_t height, uint32_t layer_count, uint32_t format,
- uint64_t usage, size_t user_metadata_size, int id)
+BufferNode::BufferNode(uint32_t width, uint32_t height, uint32_t layerCount, uint32_t format,
+ uint64_t usage, size_t userMetadataSize, int id)
: mId(id) {
- uint32_t out_stride = 0;
+ uint32_t outStride = 0;
// graphicBufferId is not used in GraphicBufferAllocator::allocate
// TODO(b/112338294) After move to the service folder, stop using the
// hardcoded service name "bufferhub".
- int ret = GraphicBufferAllocator::get().allocate(width, height, format, layer_count, usage,
+ int ret = GraphicBufferAllocator::get().allocate(width, height, format, layerCount, usage,
const_cast<const native_handle_t**>(
&mBufferHandle),
- &out_stride,
+ &outStride,
/*graphicBufferId=*/0,
/*requestor=*/"bufferhub");
@@ -49,12 +49,12 @@
mBufferDesc.width = width;
mBufferDesc.height = height;
- mBufferDesc.layers = layer_count;
+ mBufferDesc.layers = layerCount;
mBufferDesc.format = format;
mBufferDesc.usage = usage;
- mBufferDesc.stride = out_stride;
+ mBufferDesc.stride = outStride;
- mMetadata = BufferHubMetadata::create(user_metadata_size);
+ mMetadata = BufferHubMetadata::create(userMetadataSize);
if (!mMetadata.isValid()) {
ALOGE("%s: Failed to allocate metadata.", __FUNCTION__);
return;
@@ -83,23 +83,23 @@
uint32_t BufferNode::addNewActiveClientsBitToMask() {
uint32_t currentActiveClientsBitMask = getActiveClientsBitMask();
- uint32_t client_state_mask = 0U;
+ uint32_t clientStateMask = 0U;
uint32_t updatedActiveClientsBitMask = 0U;
do {
- client_state_mask =
+ clientStateMask =
BufferHubDefs::findNextAvailableClientStateMask(currentActiveClientsBitMask);
- if (client_state_mask == 0U) {
+ if (clientStateMask == 0U) {
ALOGE("%s: reached the maximum number of channels per buffer node: %d.", __FUNCTION__,
BufferHubDefs::kMaxNumberOfClients);
errno = E2BIG;
return 0U;
}
- updatedActiveClientsBitMask = currentActiveClientsBitMask | client_state_mask;
+ updatedActiveClientsBitMask = currentActiveClientsBitMask | clientStateMask;
} while (!(mActiveClientsBitMask->compare_exchange_weak(currentActiveClientsBitMask,
updatedActiveClientsBitMask,
std::memory_order_acq_rel,
std::memory_order_acquire)));
- return client_state_mask;
+ return clientStateMask;
}
void BufferNode::removeClientsBitFromMask(const uint32_t& value) {