CameraHAL: Moved Camera HAL sources out of namespace android

C++ namespace android:: is reserved for base Google Android types
to avoid current and further conflicts with 3rd party code. Having
TI Camera HAL under namespace android:: violates this rule, adding
potential conflicts.

This patch moves libtiutils and Camera HAL code out of namespace
android:: to custom local namespaces.

Putting camera code under namespace android and 'using namespace
android' is not allowed anymore. All C++ Android types should
have android:: namespace prefix explicitly.

Next namespaces added:
- Ti::         - placeholder for all custom code
- Ti::Utils::  - common utility helper library
- Ti::Camera:: - Camera HAL code

Also added Ti::status_t as typedef for android::status_t.

Change-Id: Ie8cc00d6d6bd4e8a8ddf089421010c370ee40ebe
Signed-off-by: Daniel Levin <dendy@ti.com>

1 files changed, 23 insertions, 21 deletions

diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp
index 0ac0029..2f5bf4c 100644
--- a/camera/BufferSourceAdapter.cpp
+++ b/camera/BufferSourceAdapter.cpp
@@ -21,25 +21,26 @@
 #include <ui/GraphicBufferMapper.h>
 #include <hal_public.h>
 
-namespace android {
+namespace Ti {
+namespace Camera {
 
 static int getANWFormat(const char* parameters_format)
 {
     int format = HAL_PIXEL_FORMAT_TI_NV12;
 
     if (parameters_format != NULL) {
-        if (strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_YUV422I) == 0) {
+        if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV422I) == 0) {
             CAMHAL_LOGDA("CbYCrY format selected");
             // TODO(XXX): not defined yet
             format = -1;
-        } else if (strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_YUV420SP) == 0) {
+        } else if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420SP) == 0) {
             CAMHAL_LOGDA("YUV420SP format selected");
             format = HAL_PIXEL_FORMAT_TI_NV12;
-        } else if (strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_RGB565) == 0) {
+        } else if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_RGB565) == 0) {
             CAMHAL_LOGDA("RGB565 format selected");
             // TODO(XXX): not defined yet
             format = -1;
-        } else if (strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0) {
+        } else if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0) {
             format = HAL_PIXEL_FORMAT_TI_Y16;
         } else {
             CAMHAL_LOGDA("Invalid format, NV12 format selected as default");
@@ -74,13 +75,13 @@ static const char* getFormatFromANW(int format)
     switch (format) {
         case HAL_PIXEL_FORMAT_TI_NV12:
             // Assuming NV12 1D is RAW or Image frame
-            return CameraParameters::PIXEL_FORMAT_YUV420SP;
+            return android::CameraParameters::PIXEL_FORMAT_YUV420SP;
         case HAL_PIXEL_FORMAT_TI_Y16:
-            return CameraParameters::PIXEL_FORMAT_BAYER_RGGB;
+            return android::CameraParameters::PIXEL_FORMAT_BAYER_RGGB;
         default:
             break;
     }
-    return CameraParameters::PIXEL_FORMAT_YUV420SP;
+    return android::CameraParameters::PIXEL_FORMAT_YUV420SP;
 }
 
 static CameraFrame::FrameType formatToOutputFrameType(const char* format) {
@@ -299,7 +300,7 @@ CameraBuffer* BufferSourceAdapter::allocateBufferList(int width, int height, con
     int i = -1;
     const int lnumBufs = numBufs;
     int undequeued = 0;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
 
     mBuffers = new CameraBuffer [lnumBufs];
     memset (mBuffers, 0, sizeof(CameraBuffer) * lnumBufs);
@@ -389,7 +390,7 @@ CameraBuffer* BufferSourceAdapter::allocateBufferList(int width, int height, con
 
     for( i = 0;  i < mBufferCount-undequeued; i++ ) {
         void *y_uv[2];
-        Rect bounds(width, height);
+        android::Rect bounds(width, height);
 
         buffer_handle_t *handle = (buffer_handle_t *) mBuffers[i].opaque;
         mBufferSource->lock_buffer(mBufferSource, handle);
@@ -401,7 +402,7 @@ CameraBuffer* BufferSourceAdapter::allocateBufferList(int width, int height, con
     for(i = (mBufferCount-undequeued); i >= 0 && i < mBufferCount; i++) {
         buffer_handle_t *handle = (buffer_handle_t *) mBuffers[i].opaque;
         void *y_uv[2];
-        Rect bounds(width, height);
+        android::Rect bounds(width, height);
 
         mapper.lock(*handle, CAMHAL_GRALLOC_USAGE, bounds, y_uv);
         mBuffers[i].mapped = y_uv[0];
@@ -456,7 +457,7 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) {
     status_t err;
     const int lnumBufs = 1;
     int formatSource;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
     buffer_handle_t *handle;
 
     // TODO(XXX): Only supporting one input buffer at a time right now
@@ -489,7 +490,7 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) {
     // lock buffer
     {
         void *y_uv[2];
-        Rect bounds(mBuffers[0].width, mBuffers[0].height);
+        android::Rect bounds(mBuffers[0].width, mBuffers[0].height);
         mapper.lock(*handle, CAMHAL_GRALLOC_USAGE, bounds, y_uv);
         mBuffers[0].mapped = y_uv[0];
     }
@@ -586,7 +587,7 @@ int BufferSourceAdapter::getFd()
 status_t BufferSourceAdapter::returnBuffersToWindow()
 {
     status_t ret = NO_ERROR;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
 
     //Give the buffers back to display here -  sort of free it
     if (mBufferSource) {
@@ -632,7 +633,7 @@ int BufferSourceAdapter::freeBufferList(CameraBuffer * buflist)
 
     status_t ret = NO_ERROR;
 
-    Mutex::Autolock lock(mLock);
+    android::AutoMutex lock(mLock);
 
     if (mBufferSourceDirection == BUFFER_SOURCE_TAP_OUT) returnBuffersToWindow();
 
@@ -669,14 +670,14 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame)
     status_t ret = NO_ERROR;
     buffer_handle_t *handle = NULL;
     int i;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
 
     if (!mBuffers || !frame->mBuffer) {
         CAMHAL_LOGEA("Adapter sent BufferSourceAdapter a NULL frame?");
         return;
     }
 
-    Mutex::Autolock lock(mLock);
+    android::AutoMutex lock(mLock);
 
     for ( i = 0; i < mBufferCount; i++ ) {
         if (frame->mBuffer == &mBuffers[i]) {
@@ -695,7 +696,7 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame)
         return;
     }
 
-    frame->mMetaData.setTime(CameraMetadata::KEY_TIMESTAMP, frame->mTimestamp);
+    frame->mMetaData.setTime(android::CameraMetadata::KEY_TIMESTAMP, frame->mTimestamp);
     ret = mBufferSource->set_metadata(mBufferSource, frame->mMetaData.flatten().string());
     if (ret != 0) {
         CAMHAL_LOGE("Surface::set_metadata returned error %d", ret);
@@ -723,9 +724,9 @@ bool BufferSourceAdapter::handleFrameReturn()
     int i = 0;
     int stride;  // dummy variable to get stride
     CameraFrame::FrameType type;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
     void *y_uv[2];
-    Rect bounds(mFrameWidth, mFrameHeight);
+    android::Rect bounds(mFrameWidth, mFrameHeight);
 
     if ( NULL == mBufferSource ) {
         return false;
@@ -787,6 +788,7 @@ void BufferSourceAdapter::frameCallback(CameraFrame* caFrame)
 
 /*--------------------BufferSourceAdapter Class ENDS here-----------------------------*/
 
-};
+} // namespace Camera
+} // namespace Ti
 
 #endif