diff options
Diffstat (limited to 'camera/OMXCameraAdapter/OMXDefaults.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXDefaults.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/camera/OMXCameraAdapter/OMXDefaults.cpp b/camera/OMXCameraAdapter/OMXDefaults.cpp index aff38d1..2928573 100644 --- a/camera/OMXCameraAdapter/OMXDefaults.cpp +++ b/camera/OMXCameraAdapter/OMXDefaults.cpp @@ -24,10 +24,8 @@ #include "CameraHal.h" #include "OMXCameraAdapter.h" -namespace android { - -#undef LOG_TAG -#define LOG_TAG "CameraHAL" +namespace Ti { +namespace Camera { #define __STRINGIFY(s) __STRING(s) @@ -42,42 +40,44 @@ const char OMXCameraAdapter::DEFAULT_EXPOSURE_MODE[] = "auto"; const char OMXCameraAdapter::DEFAULT_FLASH_MODE[] = "off"; const char OMXCameraAdapter::DEFAULT_FOCUS_MODE_PREFERRED[] = "auto"; const char OMXCameraAdapter::DEFAULT_FOCUS_MODE[] = "infinity"; -const char OMXCameraAdapter::DEFAULT_FRAMERATE_RANGE_IMAGE[] = "15000,30000"; -const char OMXCameraAdapter::DEFAULT_FRAMERATE_RANGE_VIDEO[]="24000,30000"; const char OMXCameraAdapter::DEFAULT_IPP[] = "ldc-nsf"; -const char OMXCameraAdapter::DEFAULT_GBCE[] = "disable"; const char OMXCameraAdapter::DEFAULT_ISO_MODE[] = "auto"; const char OMXCameraAdapter::DEFAULT_JPEG_QUALITY[] = "95"; const char OMXCameraAdapter::DEFAULT_THUMBNAIL_QUALITY[] = "60"; const char OMXCameraAdapter::DEFAULT_THUMBNAIL_SIZE[] = "160x120"; const char OMXCameraAdapter::DEFAULT_PICTURE_FORMAT[] = "jpeg"; +const char OMXCameraAdapter::DEFAULT_S3D_PICTURE_LAYOUT[] = "tb-full"; const char OMXCameraAdapter::DEFAULT_PICTURE_SIZE[] = "320x240"; +const char OMXCameraAdapter::DEFAULT_PICTURE_SS_SIZE[] = "640x240"; +const char OMXCameraAdapter::DEFAULT_PICTURE_TB_SIZE[] = "320x480"; const char OMXCameraAdapter::DEFAULT_PREVIEW_FORMAT[] = "yuv420sp"; const char OMXCameraAdapter::DEFAULT_FRAMERATE[] = "30"; +const char OMXCameraAdapter::DEFAULT_S3D_PREVIEW_LAYOUT[] = "tb-subsampled"; const char OMXCameraAdapter::DEFAULT_PREVIEW_SIZE[] = "640x480"; +const char OMXCameraAdapter::DEFAULT_PREVIEW_SS_SIZE[] = "1280x480"; +const char OMXCameraAdapter::DEFAULT_PREVIEW_TB_SIZE[] = "640x960"; const char OMXCameraAdapter::DEFAULT_NUM_PREV_BUFS[] = "6"; const char OMXCameraAdapter::DEFAULT_NUM_PIC_BUFS[] = "1"; -const char OMXCameraAdapter::DEFAULT_MAX_FOCUS_AREAS[] = "1"; const char OMXCameraAdapter::DEFAULT_SATURATION[] = "100"; const char OMXCameraAdapter::DEFAULT_SCENE_MODE[] = "auto"; const char OMXCameraAdapter::DEFAULT_SHARPNESS[] = "100"; -const char OMXCameraAdapter::DEFAULT_VSTAB[] = "false"; -const char OMXCameraAdapter::DEFAULT_VSTAB_SUPPORTED[] = "true"; +const char * OMXCameraAdapter::DEFAULT_VSTAB = android::CameraParameters::FALSE; +const char * OMXCameraAdapter::DEFAULT_VNF = android::CameraParameters::FALSE; const char OMXCameraAdapter::DEFAULT_WB[] = "auto"; const char OMXCameraAdapter::DEFAULT_ZOOM[] = "0"; const char OMXCameraAdapter::DEFAULT_MAX_FD_HW_FACES[] = __STRINGIFY(MAX_NUM_FACES_SUPPORTED); const char OMXCameraAdapter::DEFAULT_MAX_FD_SW_FACES[] = "0"; -const char OMXCameraAdapter::DEFAULT_FOCAL_LENGTH_PRIMARY[] = "3.43"; -const char OMXCameraAdapter::DEFAULT_FOCAL_LENGTH_SECONDARY[] = "1.95"; const char OMXCameraAdapter::DEFAULT_HOR_ANGLE[] = "54.8"; const char OMXCameraAdapter::DEFAULT_VER_ANGLE[] = "42.5"; -const char OMXCameraAdapter::DEFAULT_AE_LOCK[] = "false"; -const char OMXCameraAdapter::DEFAULT_AWB_LOCK[] = "false"; -const char OMXCameraAdapter::DEFAULT_MAX_NUM_METERING_AREAS[] = "0"; -const char OMXCameraAdapter::DEFAULT_LOCK_SUPPORTED[] = "true"; -const char OMXCameraAdapter::DEFAULT_LOCK_UNSUPPORTED[] = "false"; -const char OMXCameraAdapter::DEFAULT_VIDEO_SNAPSHOT_SUPPORTED[] = "true"; +const char * OMXCameraAdapter::DEFAULT_AE_LOCK = android::CameraParameters::FALSE; +const char * OMXCameraAdapter::DEFAULT_AWB_LOCK = android::CameraParameters::FALSE; const char OMXCameraAdapter::DEFAULT_VIDEO_SIZE[] = "1920x1080"; -const char OMXCameraAdapter::DEFAULT_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[] = "1920x1080"; -}; +const char OMXCameraAdapter::DEFAULT_SENSOR_ORIENTATION[] = "0"; +const char OMXCameraAdapter::DEFAULT_AUTOCONVERGENCE_MODE[] = "frame"; +const char OMXCameraAdapter::DEFAULT_MANUAL_CONVERGENCE[] = "0"; +const char * OMXCameraAdapter::DEFAULT_MECHANICAL_MISALIGNMENT_CORRECTION_MODE = android::CameraParameters::TRUE; +const char OMXCameraAdapter::DEFAULT_EXIF_MAKE[] = "default_make"; +const char OMXCameraAdapter::DEFAULT_EXIF_MODEL[] = "default_model"; +} // namespace Camera +} // namespace Ti |