C2VdaBqBlockPool: Add android namespace
Originally we forgot to put the C2VdaBqBlockPool class inside android
namespace. This CL moves the class into the android namespace without
changing the logic.
Bug: 160110407
Test: m -j32
Change-Id: If4ff02f70fbc0f7d17abe5d8f565ace8ea2def07
diff --git a/plugin_store/C2VdaBqBlockPool.cpp b/plugin_store/C2VdaBqBlockPool.cpp
index 94dce41..f113ba2 100644
--- a/plugin_store/C2VdaBqBlockPool.cpp
+++ b/plugin_store/C2VdaBqBlockPool.cpp
@@ -21,6 +21,21 @@
#include <v4l2_codec2/plugin_store/V4L2AllocatorId.h>
+namespace android {
+namespace {
+
+// The wait time for acquire fence in milliseconds.
+constexpr int kFenceWaitTimeMs = 10;
+// The timeout delay range for dequeuing spare buffer delay time in microseconds.
+constexpr int kDequeueSpareMinDelayUs = 500;
+constexpr int kDequeueSpareMaxDelayUs = 16 * 1000;
+// The timeout limit of acquiring lock of timed_mutex in milliseconds.
+constexpr std::chrono::milliseconds kTimedMutexTimeoutMs = std::chrono::milliseconds(500);
+// The max retry times for fetchSpareBufferSlot timeout.
+constexpr int32_t kFetchSpareBufferMaxRetries = 10;
+
+} // namespace
+
using ::android::C2AndroidMemoryUsage;
using ::android::Fence;
using ::android::GraphicBuffer;
@@ -37,20 +52,6 @@
using ::android::hardware::graphics::bufferqueue::V2_0::utils::h2b;
using ::android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper;
-namespace {
-
-// The wait time for acquire fence in milliseconds.
-constexpr int kFenceWaitTimeMs = 10;
-// The timeout delay range for dequeuing spare buffer delay time in microseconds.
-constexpr int kDequeueSpareMinDelayUs = 500;
-constexpr int kDequeueSpareMaxDelayUs = 16 * 1000;
-// The timeout limit of acquiring lock of timed_mutex in milliseconds.
-constexpr std::chrono::milliseconds kTimedMutexTimeoutMs = std::chrono::milliseconds(500);
-// The max retry times for fetchSpareBufferSlot timeout.
-constexpr int32_t kFetchSpareBufferMaxRetries = 10;
-
-} // namespace
-
static c2_status_t asC2Error(int32_t err) {
switch (err) {
case android::NO_ERROR:
@@ -1089,3 +1090,5 @@
}
mPool->detachBuffer(mProducerId, mSlotId);
}
+
+} // namespace android
diff --git a/plugin_store/include/v4l2_codec2/plugin_store/C2VdaBqBlockPool.h b/plugin_store/include/v4l2_codec2/plugin_store/C2VdaBqBlockPool.h
index 161e176..ac44da0 100644
--- a/plugin_store/include/v4l2_codec2/plugin_store/C2VdaBqBlockPool.h
+++ b/plugin_store/include/v4l2_codec2/plugin_store/C2VdaBqBlockPool.h
@@ -12,6 +12,8 @@
#include <C2Buffer.h>
#include <C2PlatformSupport.h>
+namespace android {
+
/**
* Marks the BlockPoolData in |sharedBlock| as shared. The destructor of BlockPoolData would not
* call detachBuffer to BufferQueue if it is shared.
@@ -135,4 +137,5 @@
std::shared_ptr<Impl> mImpl;
};
+} // namespace android
#endif // ANDROID_V4L2_CODEC2_PLUGIN_STORE_C2_VDA_BQ_BLOCK_POOL_H
