CameraHal: Changes to pixel format parameters

1. Use framework defined constant for RAW format
2. Default to NV12 when preview format is not set
to something supported

Change-Id: I35c42ef2b146926640fbebac1dfee18806c3c02f
Signed-off-by: Tyler Luu <tluu@ti.com>

7 files changed, 19 insertions, 18 deletions

diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp
index 747168e..7570b98 100644
--- a/camera/ANativeWindowDisplayAdapter.cpp
+++ b/camera/ANativeWindowDisplayAdapter.cpp
@@ -53,13 +53,13 @@ OMX_COLOR_FORMATTYPE toOMXPixFormat(const char* parameters_format)
             }
         else
             {
-            CAMHAL_LOGDA("Invalid format, CbYCrY format selected as default");
-            pixFormat = OMX_COLOR_FormatCbYCrY;
+            CAMHAL_LOGDA("Invalid format, NV12 format selected as default");
+            pixFormat = OMX_COLOR_FormatYUV420SemiPlanar;
         }
     }
     else {
-        CAMHAL_LOGEA("Preview format is NULL, defaulting to CbYCrY");
-        pixFormat = OMX_COLOR_FormatCbYCrY;
+        CAMHAL_LOGEA("Preview format is NULL, defaulting to NV12");
+        pixFormat = OMX_COLOR_FormatYUV420SemiPlanar;
     }
 
     return pixFormat;
@@ -90,14 +90,14 @@ const char* getPixFormatConstant(const char* parameters_format)
         }
         else
         {
-            CAMHAL_LOGEA("Invalid format, CbYCrY format selected as default");
-            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV422I;
+            CAMHAL_LOGEA("Invalid format, NV12 format selected as default");
+            pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP;
         }
     }
     else
     {
-        CAMHAL_LOGEA("Preview format is NULL, defaulting to CbYCrY");
-        pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV422I;
+        CAMHAL_LOGEA("Preview format is NULL, defaulting to NV12");
+        pixFormat = (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP;
     }
 
     return pixFormat;
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 28872ce..b6747a8 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -2626,7 +2626,10 @@ status_t CameraHal::takePicture( )
         if (mRawCapture) {
             if ( NO_ERROR == ret ) {
                 CAMHAL_LOGDB("Raw capture buffers setup - %s", mParameters.getPictureFormat());
-                ret = allocRawBufs(mParameters.getInt(TICameraParameters::RAW_WIDTH), mParameters.getInt(TICameraParameters::RAW_HEIGHT), TICameraParameters::PIXEL_FORMAT_RAW, rawBufferCount);
+                ret = allocRawBufs(mParameters.getInt(TICameraParameters::RAW_WIDTH),
+                                   mParameters.getInt(TICameraParameters::RAW_HEIGHT),
+                                   CameraParameters::PIXEL_FORMAT_BAYER_RGGB,
+                                   rawBufferCount);
 
                 if ( NO_ERROR != ret ) {
                     CAMHAL_LOGEB("allocRawBufs (for RAW capture) returned error 0x%x", ret);
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index 4f6b35d..f545f4c 100644
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -515,14 +515,14 @@ status_t OMXCameraAdapter::setParameters(const CameraParameters &params)
             }
         else
             {
-            CAMHAL_LOGDA("Invalid format, CbYCrY format selected as default");
-            pixFormat = OMX_COLOR_FormatCbYCrY;
+            CAMHAL_LOGDA("Invalid format, NV12 format selected as default");
+            pixFormat = OMX_COLOR_FormatYUV420SemiPlanar;
             }
         }
     else
         {
-        CAMHAL_LOGEA("Preview format is NULL, defaulting to CbYCrY");
-        pixFormat = OMX_COLOR_FormatCbYCrY;
+        CAMHAL_LOGEA("Preview format is NULL, defaulting to NV12");
+        pixFormat = OMX_COLOR_FormatYUV420SemiPlanar;
         }
 
     OMXCameraPortParameters *cap;
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index bd9fcf1..e3380b4 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -183,7 +183,7 @@ const CapPixelformat OMXCameraAdapter::mPixelformats [] = {
     { OMX_COLOR_Format16bitRGB565, CameraParameters::PIXEL_FORMAT_RGB565 },
     { OMX_COLOR_FormatYUV420SemiPlanar, CameraParameters::PIXEL_FORMAT_YUV420P },
     { OMX_COLOR_FormatUnused, TICameraParameters::PIXEL_FORMAT_UNUSED },
-    { OMX_COLOR_FormatRawBayer10bit, TICameraParameters::PIXEL_FORMAT_RAW },
+    { OMX_COLOR_FormatRawBayer10bit, CameraParameters::PIXEL_FORMAT_BAYER_RGGB },
 };
 
 const userToOMX_LUT OMXCameraAdapter::mFrameLayout [] = {
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp
index 96dc04c..ef9f3c0 100644
--- a/camera/OMXCameraAdapter/OMXCapture.cpp
+++ b/camera/OMXCameraAdapter/OMXCapture.cpp
@@ -105,10 +105,10 @@ status_t OMXCameraAdapter::setParametersCapture(const CameraParameters &params,
             pixFormat = OMX_COLOR_FormatUnused;
             codingMode = CodingMPO;
             mPictureFormatFromClient = TICameraParameters::PIXEL_FORMAT_MPO;
-        } else if (strcmp(valstr, (const char *) TICameraParameters::PIXEL_FORMAT_RAW) == 0) {
+        } else if (strcmp(valstr, (const char *) CameraParameters::PIXEL_FORMAT_BAYER_RGGB) == 0) {
             CAMHAL_LOGDA("RAW Picture format selected");
             pixFormat = OMX_COLOR_FormatRawBayer10bit;
-            mPictureFormatFromClient = TICameraParameters::PIXEL_FORMAT_RAW;
+            mPictureFormatFromClient = CameraParameters::PIXEL_FORMAT_BAYER_RGGB;
         } else {
             CAMHAL_LOGEA("Invalid format, JPEG format selected as default");
             pixFormat = OMX_COLOR_FormatUnused;
diff --git a/camera/TICameraParameters.cpp b/camera/TICameraParameters.cpp
index 8d509f7..02ceba3 100644
--- a/camera/TICameraParameters.cpp
+++ b/camera/TICameraParameters.cpp
@@ -120,7 +120,6 @@ const char TICameraParameters::IPP_NONE[] = "off";
 
 // TI extensions to standard android pixel formats
 const char TICameraParameters::PIXEL_FORMAT_UNUSED[] = "unused";
-const char TICameraParameters::PIXEL_FORMAT_RAW[] = "raw";
 const char TICameraParameters::PIXEL_FORMAT_JPS[] = "jps";
 const char TICameraParameters::PIXEL_FORMAT_MPO[] = "mpo";
 
diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h
index 53c0471..43c84a7 100644
--- a/camera/inc/TICameraParameters.h
+++ b/camera/inc/TICameraParameters.h
@@ -131,7 +131,6 @@ static const char TEMP_BRACKETING[];
 
 // TI extensions to standard android pixel formats
 static const char PIXEL_FORMAT_UNUSED[];
-static const char PIXEL_FORMAT_RAW[];
 static const char PIXEL_FORMAT_JPS[];
 static const char PIXEL_FORMAT_MPO[];