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, 55 insertions, 54 deletions

diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp
index 95914a5..7fe574a 100644
--- a/camera/ANativeWindowDisplayAdapter.cpp
+++ b/camera/ANativeWindowDisplayAdapter.cpp
@@ -20,7 +20,8 @@
 #include <ui/GraphicBufferMapper.h>
 #include <hal_public.h>
 
-namespace android {
+namespace Ti {
+namespace Camera {
 
 ///Constant declarations
 ///@todo Check the time units
@@ -36,17 +37,17 @@ OMX_COLOR_FORMATTYPE toOMXPixFormat(const char* parameters_format)
 
     if ( parameters_format != NULL )
     {
-        if (strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
+        if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
             {
             CAMHAL_LOGDA("CbYCrY format selected");
             pixFormat = OMX_COLOR_FormatCbYCrY;
             }
-        else if(strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP) == 0)
+        else if(strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420SP) == 0)
             {
             CAMHAL_LOGDA("YUV420SP format selected");
             pixFormat = OMX_COLOR_FormatYUV420SemiPlanar;
             }
-        else if(strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_RGB565) == 0)
+        else if(strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_RGB565) == 0)
             {
             CAMHAL_LOGDA("RGB565 format selected");
             pixFormat = OMX_COLOR_Format16bitRGB565;
@@ -71,38 +72,38 @@ const char* DisplayAdapter::getPixFormatConstant(const char* parameters_format)
 
     if ( parameters_format != NULL )
     {
-        if (strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
+        if (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
         {
             CAMHAL_LOGVA("CbYCrY format selected");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV422I;
+            pixFormat = android::CameraParameters::PIXEL_FORMAT_YUV422I;
         }
-        else if(strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP) == 0 ||
-                strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_YUV420P) == 0)
+        else if(strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420SP) == 0 ||
+                strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420P) == 0)
         {
             // TODO(XXX): We are treating YV12 the same as YUV420SP
             CAMHAL_LOGVA("YUV420SP format selected");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP;
+            pixFormat = android::CameraParameters::PIXEL_FORMAT_YUV420SP;
         }
-        else if(strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_RGB565) == 0)
+        else if(strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_RGB565) == 0)
         {
             CAMHAL_LOGVA("RGB565 format selected");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_RGB565;
+            pixFormat = android::CameraParameters::PIXEL_FORMAT_RGB565;
         }
-        else if(strcmp(parameters_format, (const char *) CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0)
+        else if(strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0)
         {
             CAMHAL_LOGVA("BAYER format selected");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_BAYER_RGGB;
+            pixFormat = android::CameraParameters::PIXEL_FORMAT_BAYER_RGGB;
         }
         else
         {
             CAMHAL_LOGEA("Invalid format, NV12 format selected as default");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP;
+            pixFormat = android::CameraParameters::PIXEL_FORMAT_YUV420SP;
         }
     }
     else
     {
         CAMHAL_LOGEA("Preview format is NULL, defaulting to NV12");
-        pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP;
+        pixFormat = android::CameraParameters::PIXEL_FORMAT_YUV420SP;
     }
 
     return pixFormat;
@@ -114,19 +115,19 @@ size_t DisplayAdapter::getBufSize(const char* parameters_format, int width, int
 
     if ( parameters_format != NULL ) {
         if (strcmp(parameters_format,
-                  (const char *) CameraParameters::PIXEL_FORMAT_YUV422I) == 0) {
+                  android::CameraParameters::PIXEL_FORMAT_YUV422I) == 0) {
             buf_size = width * height * 2;
         }
-        else if((strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_YUV420SP) == 0) ||
-                (strcmp(parameters_format, CameraParameters::PIXEL_FORMAT_YUV420P) == 0)) {
+        else if((strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420SP) == 0) ||
+                (strcmp(parameters_format, android::CameraParameters::PIXEL_FORMAT_YUV420P) == 0)) {
             buf_size = width * height * 3 / 2;
         }
         else if(strcmp(parameters_format,
-                      (const char *) CameraParameters::PIXEL_FORMAT_RGB565) == 0) {
+                      android::CameraParameters::PIXEL_FORMAT_RGB565) == 0) {
             buf_size = width * height * 2;
         }
         else if (strcmp(parameters_format,
-                  (const char *) CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0) {
+                  android::CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0) {
             buf_size = width * height * 2;
         } else {
             CAMHAL_LOGEA("Invalid format");
@@ -191,8 +192,8 @@ ANativeWindowDisplayAdapter::ANativeWindowDisplayAdapter():mDisplayThread(NULL),
 
 ANativeWindowDisplayAdapter::~ANativeWindowDisplayAdapter()
 {
-    Semaphore sem;
-    TIUTILS::Message msg;
+    Utils::Semaphore sem;
+    Utils::Message msg;
 
     LOG_FUNCTION_NAME;
 
@@ -248,7 +249,7 @@ status_t ANativeWindowDisplayAdapter::initialize()
     }
 
     ///Start the display thread
-    status_t ret = mDisplayThread->run("DisplayThread", PRIORITY_URGENT_DISPLAY);
+    status_t ret = mDisplayThread->run("DisplayThread", android::PRIORITY_URGENT_DISPLAY);
     if ( ret != NO_ERROR )
         {
         CAMHAL_LOGEA("Couldn't run display thread");
@@ -344,7 +345,7 @@ status_t ANativeWindowDisplayAdapter::setSnapshotTimeRef(struct timeval *refTime
 
     if ( NULL != refTime )
         {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         memcpy(&mStartCapture, refTime, sizeof(struct timeval));
     }
 
@@ -358,8 +359,8 @@ status_t ANativeWindowDisplayAdapter::setSnapshotTimeRef(struct timeval *refTime
 
 int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct timeval *refTime)
 {
-    Semaphore sem;
-    TIUTILS::Message msg;
+    Utils::Semaphore sem;
+    Utils::Message msg;
 
     LOG_FUNCTION_NAME;
 
@@ -375,7 +376,7 @@ int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct tim
 
     if ( NULL != refTime )
         {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         memcpy(&mStandbyToShot, refTime, sizeof(struct timeval));
         mMeasureStandby = true;
     }
@@ -413,7 +414,7 @@ int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct tim
 int ANativeWindowDisplayAdapter::disableDisplay(bool cancel_buffer)
 {
     status_t ret = NO_ERROR;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
 
     LOG_FUNCTION_NAME;
 
@@ -433,9 +434,9 @@ int ANativeWindowDisplayAdapter::disableDisplay(bool cancel_buffer)
         {
         //Send STOP_DISPLAY COMMAND to display thread. Display thread will stop and dequeue all messages
         // and then wait for message
-        Semaphore sem;
+        Utils::Semaphore sem;
         sem.Create();
-        TIUTILS::Message msg;
+        Utils::Message msg;
         msg.command = DisplayThread::DISPLAY_STOP;
 
         // Send the semaphore to signal once the command is completed
@@ -450,7 +451,7 @@ int ANativeWindowDisplayAdapter::disableDisplay(bool cancel_buffer)
 
     }
 
-    Mutex::Autolock lock(mLock);
+    android::AutoMutex lock(mLock);
     {
         ///Reset the display enabled flag
         mDisplayEnabled = false;
@@ -494,7 +495,7 @@ status_t ANativeWindowDisplayAdapter::pauseDisplay(bool pause)
     LOG_FUNCTION_NAME;
 
     {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         mPaused = pause;
     }
 
@@ -528,8 +529,8 @@ CameraBuffer* ANativeWindowDisplayAdapter::allocateBufferList(int width, int hei
     int i = -1;
     const int lnumBufs = numBufs;
     int undequeued = 0;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
-    Rect bounds;
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
+    android::Rect bounds;
 
     mBuffers = new CameraBuffer [lnumBufs];
     memset (mBuffers, 0, sizeof(CameraBuffer) * lnumBufs);
@@ -840,7 +841,7 @@ status_t ANativeWindowDisplayAdapter::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 (mANativeWindow)
          for(unsigned int i = 0; i < mFramesWithCameraAdapterMap.size(); i++) {
@@ -884,7 +885,7 @@ int ANativeWindowDisplayAdapter::freeBufferList(CameraBuffer * buflist)
 
     status_t ret = NO_ERROR;
 
-    Mutex::Autolock lock(mLock);
+    android::AutoMutex lock(mLock);
 
     if(mBuffers != buflist)
     {
@@ -942,7 +943,7 @@ void ANativeWindowDisplayAdapter::displayThread()
 
     while(shouldLive)
         {
-        ret = TIUTILS::MessageQueue::waitForMsg(&mDisplayThread->msgQ()
+        ret = Utils::MessageQueue::waitForMsg(&mDisplayThread->msgQ()
                                                                 ,  &mDisplayQ
                                                                 , NULL
                                                                 , ANativeWindowDisplayAdapter::DISPLAY_TIMEOUT);
@@ -964,7 +965,7 @@ void ANativeWindowDisplayAdapter::displayThread()
                 }
             else
                 {
-                TIUTILS::Message msg;
+                Utils::Message msg;
                 ///Get the dummy msg from the displayQ
                 if(mDisplayQ.get(&msg)!=NO_ERROR)
                     {
@@ -995,7 +996,7 @@ void ANativeWindowDisplayAdapter::displayThread()
 
 bool ANativeWindowDisplayAdapter::processHalMsg()
 {
-    TIUTILS::Message msg;
+    Utils::Message msg;
 
     LOG_FUNCTION_NAME;
 
@@ -1024,7 +1025,7 @@ bool ANativeWindowDisplayAdapter::processHalMsg()
 
             // flush frame message queue
             while ( !mDisplayQ.isEmpty() ) {
-                TIUTILS::Message message;
+                Utils::Message message;
                 mDisplayQ.get(&message);
             }
 
@@ -1054,7 +1055,7 @@ bool ANativeWindowDisplayAdapter::processHalMsg()
         {
 
         CAMHAL_LOGDA("+Signalling display semaphore");
-        Semaphore &sem = *((Semaphore*)msg.arg1);
+        Utils::Semaphore &sem = *((Utils::Semaphore*)msg.arg1);
 
         sem.Signal();
 
@@ -1072,7 +1073,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
     status_t ret = NO_ERROR;
     uint32_t actualFramesWithDisplay = 0;
     android_native_buffer_t *buffer = NULL;
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
     int i;
 
     ///@todo Do cropping based on the stabilized frame coordinates
@@ -1104,7 +1105,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
                 (!mPaused ||  CameraFrame::CameraFrame::SNAPSHOT_FRAME == dispFrame.mType) &&
                 !mSuspend)
     {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         uint32_t xOff = (dispFrame.mOffset% PAGE_SIZE);
         uint32_t yOff = (dispFrame.mOffset / PAGE_SIZE);
 
@@ -1114,15 +1115,15 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
             CAMHAL_LOGDB("Offset %d xOff = %d, yOff = %d", dispFrame.mOffset, xOff, yOff);
             uint8_t bytesPerPixel;
             ///Calculate bytes per pixel based on the pixel format
-            if(strcmp(mPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
+            if(strcmp(mPixelFormat, android::CameraParameters::PIXEL_FORMAT_YUV422I) == 0)
                 {
                 bytesPerPixel = 2;
                 }
-            else if(strcmp(mPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_RGB565) == 0)
+            else if(strcmp(mPixelFormat, android::CameraParameters::PIXEL_FORMAT_RGB565) == 0)
                 {
                 bytesPerPixel = 2;
                 }
-            else if(strcmp(mPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP) == 0)
+            else if(strcmp(mPixelFormat, android::CameraParameters::PIXEL_FORMAT_YUV420SP) == 0)
                 {
                 bytesPerPixel = 1;
                 }
@@ -1158,7 +1159,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
 
         // HWComposer has not minimum buffer requirement. We should be able to dequeue
         // the buffer immediately
-        TIUTILS::Message msg;
+        Utils::Message msg;
         mDisplayQ.put(&msg);
 
 
@@ -1184,7 +1185,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
     }
     else
     {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         buffer_handle_t *handle = (buffer_handle_t *) mBuffers[i].opaque;
 
         // unlock buffer before giving it up
@@ -1198,7 +1199,7 @@ status_t ANativeWindowDisplayAdapter::PostFrame(ANativeWindowDisplayAdapter::Dis
 
         mFramesWithCameraAdapterMap.removeItem((buffer_handle_t *) dispFrame.mBuffer->opaque);
 
-        TIUTILS::Message msg;
+        Utils::Message msg;
         mDisplayQ.put(&msg);
         ret = NO_ERROR;
     }
@@ -1214,8 +1215,8 @@ bool ANativeWindowDisplayAdapter::handleFrameReturn()
     int i = 0;
     unsigned int k;
     int stride;  // dummy variable to get stride
-    GraphicBufferMapper &mapper = GraphicBufferMapper::get();
-    Rect bounds;
+    android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get();
+    android::Rect bounds;
     void *y_uv[2];
 
     // TODO(XXX): Do we need to keep stride information in camera hal?
@@ -1276,7 +1277,7 @@ bool ANativeWindowDisplayAdapter::handleFrameReturn()
     }
 
     {
-        Mutex::Autolock lock(mLock);
+        android::AutoMutex lock(mLock);
         mFramesWithCameraAdapterMap.add((buffer_handle_t *) mBuffers[i].opaque, i);
     }
 
@@ -1337,5 +1338,5 @@ void ANativeWindowDisplayAdapter::frameCallback(CameraFrame* caFrame)
 
 /*--------------------ANativeWindowDisplayAdapter Class ENDS here-----------------------------*/
 
-};
-
+} // namespace Camera
+} // namespace Ti