summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camera/AppCallbackNotifier.cpp8
-rw-r--r--camera/BaseCameraAdapter.cpp2
-rw-r--r--camera/CameraHal.cpp12
-rw-r--r--camera/CameraHalUtilClasses.cpp2
-rw-r--r--camera/CameraHal_Module.cpp32
-rw-r--r--camera/CameraParameters.cpp2
-rw-r--r--camera/OMXCameraAdapter/OMXAlgo.cpp2
-rw-r--r--camera/OMXCameraAdapter/OMXCameraAdapter.cpp4
-rw-r--r--camera/OMXCameraAdapter/OMXCapabilities.cpp10
-rw-r--r--camera/OMXCameraAdapter/OMXCapture.cpp8
-rw-r--r--camera/OMXCameraAdapter/OMXExif.cpp6
-rw-r--r--camera/OMXCameraAdapter/OMXZoom.cpp2
-rw-r--r--camera/TICameraParameters.cpp2
-rw-r--r--camera/inc/CameraProperties.h4
-rw-r--r--camera/inc/OMXCameraAdapter/OMXCameraAdapter.h2
-rw-r--r--camera/inc/TICameraParameters.h2
16 files changed, 70 insertions, 30 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index 064310f..90f63a9 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -63,7 +63,7 @@ void AppCallbackNotifier::EncoderDoneCb(void* main_jpeg, void* thumb_jpeg, Camer
Encoder_libjpeg::params *main_param = NULL, *thumb_param = NULL;
size_t jpeg_size;
uint8_t* src = NULL;
- CameraBuffer *camera_buffer;
+ CameraBuffer *camera_buffer = NULL;
android::sp<Encoder_libjpeg> encoder = NULL;
LOG_FUNCTION_NAME;
@@ -1085,13 +1085,13 @@ void AppCallbackNotifier::notifyFrame()
mapper.lock((buffer_handle_t)vBuf, CAMHAL_GRALLOC_USAGE, bounds, y_uv);
y_uv[1] = y_uv[0] + mVideoHeight*4096;
- structConvImage input = {frame->mWidth,
- frame->mHeight,
+ structConvImage input = {(mmInt32)frame->mWidth,
+ (mmInt32)frame->mHeight,
4096,
IC_FORMAT_YCbCr420_lp,
(mmByte *)frame->mYuv[0],
(mmByte *)frame->mYuv[1],
- frame->mOffset};
+ (mmInt32)frame->mOffset};
structConvImage output = {mVideoWidth,
mVideoHeight,
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp
index ad56691..b3a47d1 100644
--- a/camera/BaseCameraAdapter.cpp
+++ b/camera/BaseCameraAdapter.cpp
@@ -395,7 +395,7 @@ void BaseCameraAdapter::returnFrame(CameraBuffer * frameBuf, CameraFrame::FrameT
(CameraFrame::SNAPSHOT_FRAME == frameType)))
{
CAMHAL_LOGE("Buffer already with Ducati!! 0x%x", frameBuf);
- for(int i=0;i<mBuffersWithDucati.size();i++) CAMHAL_LOGSV("0x%x", mBuffersWithDucati.keyAt(i));
+ for(unsigned int i=0;i<mBuffersWithDucati.size();i++) CAMHAL_LOGSV("0x%x", mBuffersWithDucati.keyAt(i));
}
mBuffersWithDucati.add((int)camera_buffer_get_omx_ptr(frameBuf),1);
#endif
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 2a1cf25..1c1cc6f 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -442,6 +442,7 @@ int CameraHal::setParameters(const android::CameraParameters& params)
#endif
}
+#ifndef OMAP_TUNA
if ( (valstr = params.get(TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT)) != NULL )
{
if (strcmp(valstr, mParameters.get(TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT)))
@@ -451,6 +452,7 @@ int CameraHal::setParameters(const android::CameraParameters& params)
restartPreviewRequired = true;
}
}
+#endif
#ifdef OMAP_ENHANCEMENT
int orientation =0;
@@ -572,11 +574,13 @@ int CameraHal::setParameters(const android::CameraParameters& params)
}
#endif
+#ifndef OMAP_TUNA
if ( (valstr = params.get(TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT)) != NULL )
{
CAMHAL_LOGDB("Stereo 3D capture image layout is %s", valstr);
mParameters.set(TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT, valstr);
}
+#endif
params.getPictureSize(&w, &h);
if ( (isResolutionValid(w, h, mCameraProperties->get(CameraProperties::SUPPORTED_PICTURE_SIZES)))
@@ -652,7 +656,7 @@ int CameraHal::setParameters(const android::CameraParameters& params)
mParameters.set(android::CameraParameters::KEY_PREVIEW_FPS_RANGE, valstr);
CAMHAL_LOGDB("FPS Range = %s", valstr);
if ( curMaxFPS == (FRAME_RATE_HIGH_HD * CameraHal::VFR_SCALE) &&
- maxFPS < (FRAME_RATE_HIGH_HD * CameraHal::VFR_SCALE) ) {
+ (unsigned int)maxFPS < (FRAME_RATE_HIGH_HD * CameraHal::VFR_SCALE) ) {
restartPreviewRequired = true;
}
}
@@ -3222,6 +3226,7 @@ char* CameraHal::getParameters()
mCameraAdapter->getParameters(mParameters);
}
+#ifndef OMAP_TUNA
if ( (valstr = mParameters.get(TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT)) != NULL ) {
if (!strcmp(TICameraParameters::S3D_TB_FULL, valstr)) {
mParameters.set(android::CameraParameters::KEY_SUPPORTED_PICTURE_SIZES, mParameters.get(TICameraParameters::KEY_SUPPORTED_PICTURE_TOPBOTTOM_SIZES));
@@ -3243,6 +3248,7 @@ char* CameraHal::getParameters()
mParameters.set(android::CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, mParameters.get(TICameraParameters::KEY_SUPPORTED_PREVIEW_SUBSAMPLED_SIZES));
}
}
+#endif
android::CameraParameters mParams = mParameters;
@@ -4032,8 +4038,10 @@ void CameraHal::insertSupportedParams()
p.set(android::CameraParameters::KEY_ZOOM_SUPPORTED, mCameraProperties->get(CameraProperties::ZOOM_SUPPORTED));
p.set(android::CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED, mCameraProperties->get(CameraProperties::SMOOTH_ZOOM_SUPPORTED));
p.set(TICameraParameters::KEY_SUPPORTED_IPP, mCameraProperties->get(CameraProperties::SUPPORTED_IPP_MODES));
+#ifndef OMAP_TUNA
p.set(TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT_VALUES, mCameraProperties->get(CameraProperties::S3D_PRV_FRAME_LAYOUT_VALUES));
p.set(TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT_VALUES, mCameraProperties->get(CameraProperties::S3D_CAP_FRAME_LAYOUT_VALUES));
+#endif
p.set(TICameraParameters::KEY_AUTOCONVERGENCE_MODE_VALUES, mCameraProperties->get(CameraProperties::AUTOCONVERGENCE_MODE_VALUES));
p.set(TICameraParameters::KEY_SUPPORTED_MANUAL_CONVERGENCE_MIN, mCameraProperties->get(CameraProperties::SUPPORTED_MANUAL_CONVERGENCE_MIN));
p.set(TICameraParameters::KEY_SUPPORTED_MANUAL_CONVERGENCE_MAX, mCameraProperties->get(CameraProperties::SUPPORTED_MANUAL_CONVERGENCE_MAX));
@@ -4129,8 +4137,10 @@ void CameraHal::initDefaultParameters()
p.set(TICameraParameters::KEY_GBCE_SUPPORTED, mCameraProperties->get(CameraProperties::SUPPORTED_GBCE));
p.set(TICameraParameters::KEY_GLBCE, mCameraProperties->get(CameraProperties::GLBCE));
p.set(TICameraParameters::KEY_GLBCE_SUPPORTED, mCameraProperties->get(CameraProperties::SUPPORTED_GLBCE));
+#ifndef OMAP_TUNA
p.set(TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT, mCameraProperties->get(CameraProperties::S3D_PRV_FRAME_LAYOUT));
p.set(TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT, mCameraProperties->get(CameraProperties::S3D_CAP_FRAME_LAYOUT));
+#endif
p.set(TICameraParameters::KEY_AUTOCONVERGENCE_MODE, mCameraProperties->get(CameraProperties::AUTOCONVERGENCE_MODE));
p.set(TICameraParameters::KEY_MANUAL_CONVERGENCE, mCameraProperties->get(CameraProperties::MANUAL_CONVERGENCE));
p.set(android::CameraParameters::KEY_VIDEO_STABILIZATION, mCameraProperties->get(CameraProperties::VSTAB));
diff --git a/camera/CameraHalUtilClasses.cpp b/camera/CameraHalUtilClasses.cpp
index 53c9a55..274f0f8 100644
--- a/camera/CameraHalUtilClasses.cpp
+++ b/camera/CameraHalUtilClasses.cpp
@@ -339,7 +339,7 @@ bool CameraArea::areAreasDifferent(android::Vector< android::sp<CameraArea> > &a
}
// not going to care about sorting order for now
- for (int i = 0; i < area1.size(); i++) {
+ for (unsigned int i = 0; i < area1.size(); i++) {
if (!area1.itemAt(i)->compare(area2.itemAt(i))) {
return true;
}
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index 313c7fc..3e75af9 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -50,7 +50,7 @@ static int camera_get_number_of_cameras(void);
static int camera_get_camera_info(int camera_id, struct camera_info *info);
static struct hw_module_methods_t camera_module_methods = {
- open: camera_device_open
+ .open = camera_device_open
};
} // namespace Camera
@@ -58,19 +58,23 @@ static struct hw_module_methods_t camera_module_methods = {
camera_module_t HAL_MODULE_INFO_SYM = {
- common: {
- tag: HARDWARE_MODULE_TAG,
- version_major: 1,
- version_minor: 0,
- id: CAMERA_HARDWARE_MODULE_ID,
- name: "TI OMAP CameraHal Module",
- author: "TI",
- methods: &Ti::Camera::camera_module_methods,
- dso: NULL, /* remove compilation warnings */
- reserved: {0}, /* remove compilation warnings */
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 1,
+ .version_minor = 0,
+ .id = CAMERA_HARDWARE_MODULE_ID,
+ .name = "TI OMAP CameraHal Module",
+ .author = "TI",
+ .methods = &Ti::Camera::camera_module_methods,
+ .dso = NULL, /* remove compilation warnings */
+ .reserved = {0}, /* remove compilation warnings */
},
- get_number_of_cameras: Ti::Camera::camera_get_number_of_cameras,
- get_camera_info: Ti::Camera::camera_get_camera_info,
+ .get_number_of_cameras = Ti::Camera::camera_get_number_of_cameras,
+ .get_camera_info = Ti::Camera::camera_get_camera_info,
+ .set_callbacks = NULL, /* remove compilation warnings */
+ .get_vendor_tag_ops = NULL, /* remove compilation warnings */
+ .open_legacy = NULL, /* remove compilation warnings */
+ .reserved = {0}, /* remove compilation warnings */
};
@@ -748,7 +752,7 @@ int camera_get_number_of_cameras(void)
if(gCameraProperties.initialize() != NO_ERROR)
{
CAMHAL_LOGEA("Unable to create or initialize CameraProperties");
- return NULL;
+ return 0;
}
num_cameras = gCameraProperties.camerasSupported();
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 82b1da4..31b148d 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -95,10 +95,12 @@ const char CameraProperties::GBCE[] = "prop-gbce-default";
const char CameraProperties::SUPPORTED_GBCE[] = "prop-gbce-supported";
const char CameraProperties::GLBCE[] = "prop-glbce-default";
const char CameraProperties::SUPPORTED_GLBCE[] = "prop-glbce-supported";
+#ifndef OMAP_TUNA
const char CameraProperties::S3D_PRV_FRAME_LAYOUT[] = "prop-s3d-prv-frame-layout";
const char CameraProperties::S3D_PRV_FRAME_LAYOUT_VALUES[] = "prop-s3d-prv-frame-layout-values";
const char CameraProperties::S3D_CAP_FRAME_LAYOUT[] = "prop-s3d-cap-frame-layout";
const char CameraProperties::S3D_CAP_FRAME_LAYOUT_VALUES[] = "prop-s3d-cap-frame-layout-values";
+#endif
const char CameraProperties::AUTOCONVERGENCE_MODE[] = "prop-auto-convergence-mode";
const char CameraProperties::AUTOCONVERGENCE_MODE_VALUES[] = "prop-auto-convergence-mode-values";
const char CameraProperties::MANUAL_CONVERGENCE[] = "prop-manual-convergence";
diff --git a/camera/OMXCameraAdapter/OMXAlgo.cpp b/camera/OMXCameraAdapter/OMXAlgo.cpp
index 84090e9..2188590 100644
--- a/camera/OMXCameraAdapter/OMXAlgo.cpp
+++ b/camera/OMXCameraAdapter/OMXAlgo.cpp
@@ -80,9 +80,11 @@ status_t OMXCameraAdapter::setParametersAlgo(const android::CameraParameters &pa
mCapabilitiesOpMode = MODE_HIGH_QUALITY;
}
+#ifndef OMAP_TUNA
if ( mSensorIndex == 2 ) {
mCapabilitiesOpMode = MODE_STEREO;
}
+#endif
if ( mCapMode != capMode ) {
mCapMode = capMode;
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index c97ce61..61d1aae 100644
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -4471,6 +4471,7 @@ public:
}
status_t err = NO_ERROR;
+#ifndef OMAP_TUNA
if ( sensorId == 2 ) {
CAMHAL_LOGD("Camera mode: STEREO");
properties->setMode(MODE_STEREO);
@@ -4478,6 +4479,7 @@ public:
sensorId,
properties);
} else {
+#endif
CAMHAL_LOGD("Camera MONO");
CAMHAL_LOGD("Camera mode: HQ ");
@@ -4522,12 +4524,12 @@ public:
err = fetchCapabiltiesForMode(OMX_TI_CPCam,
sensorId,
properties);
-#endif
if ( NO_ERROR != err ) {
return err;
}
}
+#endif
return err;
}
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index b339768..ba185e8 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -1817,6 +1817,7 @@ status_t OMXCameraAdapter::insertCaptureModes(CameraProperties::Properties* para
return ret;
}
+#ifndef OMAP_TUNA
status_t OMXCameraAdapter::insertLayout(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps)
{
status_t ret = NO_ERROR;
@@ -1858,6 +1859,7 @@ status_t OMXCameraAdapter::insertLayout(CameraProperties::Properties* params, OM
return ret;
}
+#endif
status_t OMXCameraAdapter::insertVideoSnapshotSupported(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps)
{
@@ -1939,6 +1941,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
LOG_FUNCTION_NAME;
+#ifndef OMAP_TUNA
/* If default is supported - set it, else - set first supported */
if (strstr(params->get(CameraProperties::S3D_PRV_FRAME_LAYOUT_VALUES), DEFAULT_S3D_PREVIEW_LAYOUT)) {
strncpy(temp, DEFAULT_S3D_PREVIEW_LAYOUT, MAX_PROP_VALUE_LENGTH - 1);
@@ -1950,6 +1953,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
}
}
params->set(CameraProperties::S3D_PRV_FRAME_LAYOUT, temp);
+#endif
if (!strcmp(TICameraParameters::S3D_TB_FULL, temp)) {
params->set(CameraProperties::SUPPORTED_PREVIEW_SIZES, params->get(CameraProperties::SUPPORTED_PREVIEW_TOPBOTTOM_SIZES));
@@ -1960,6 +1964,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
params->set(CameraProperties::SUPPORTED_PREVIEW_SIZES, params->get(CameraProperties::SUPPORTED_PREVIEW_SUBSAMPLED_SIZES));
}
+#ifndef OMAP_TUNA
/* If default is supported - set it, else - set first supported */
if (strstr(params->get(CameraProperties::S3D_CAP_FRAME_LAYOUT_VALUES), DEFAULT_S3D_PICTURE_LAYOUT)) {
strncpy(temp, DEFAULT_S3D_PICTURE_LAYOUT, MAX_PROP_VALUE_LENGTH - 1);
@@ -1971,6 +1976,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
}
}
params->set(CameraProperties::S3D_CAP_FRAME_LAYOUT, temp);
+#endif
if (!strcmp(TICameraParameters::S3D_TB_FULL, temp)) {
params->set(CameraProperties::SUPPORTED_PICTURE_SIZES, params->get(CameraProperties::SUPPORTED_PICTURE_TOPBOTTOM_SIZES));
@@ -2007,6 +2013,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
params->set(CameraProperties::JPEG_THUMBNAIL_SIZE, DEFAULT_THUMBNAIL_SIZE);
params->set(CameraProperties::PICTURE_FORMAT, DEFAULT_PICTURE_FORMAT);
+#ifndef OMAP_TUNA
if (!strcmp(params->get(CameraProperties::S3D_CAP_FRAME_LAYOUT),
TICameraParameters::S3D_TB_FULL)) {
params->set(CameraProperties::PICTURE_SIZE, DEFAULT_PICTURE_TB_SIZE);
@@ -2026,6 +2033,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
} else {
params->set(CameraProperties::PREVIEW_SIZE, DEFAULT_PREVIEW_SIZE);
}
+#endif
params->set(CameraProperties::PREVIEW_FORMAT, DEFAULT_PREVIEW_FORMAT);
@@ -2218,9 +2226,11 @@ status_t OMXCameraAdapter::insertCapabilities(CameraProperties::Properties* para
ret = insertCaptureModes(params, caps);
}
+#ifndef OMAP_TUNA
if ( NO_ERROR == ret) {
ret = insertLayout(params, caps);
}
+#endif
if ( NO_ERROR == ret) {
ret = insertVideoSnapshotSupported(params, caps);
diff --git a/camera/OMXCameraAdapter/OMXCapture.cpp b/camera/OMXCameraAdapter/OMXCapture.cpp
index 28a0ab1..b13572f 100644
--- a/camera/OMXCameraAdapter/OMXCapture.cpp
+++ b/camera/OMXCameraAdapter/OMXCapture.cpp
@@ -287,7 +287,7 @@ status_t OMXCameraAdapter::setParametersCapture(const android::CameraParameters
varint = params.getInt(android::CameraParameters::KEY_JPEG_QUALITY);
if ( varint >= MIN_JPEG_QUALITY && varint <= MAX_JPEG_QUALITY ) {
- if (varint != mPictureQuality) {
+ if ((unsigned int)varint != mPictureQuality) {
mPendingCaptureSettings |= SetQuality;
mPictureQuality = varint;
}
@@ -302,7 +302,7 @@ status_t OMXCameraAdapter::setParametersCapture(const android::CameraParameters
varint = params.getInt(android::CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH);
if ( varint >= 0 ) {
- if (varint != mThumbWidth) {
+ if ((unsigned int)varint != mThumbWidth) {
mPendingCaptureSettings |= SetThumb;
mThumbWidth = varint;
}
@@ -317,7 +317,7 @@ status_t OMXCameraAdapter::setParametersCapture(const android::CameraParameters
varint = params.getInt(android::CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT);
if ( varint >= 0 ) {
- if (varint != mThumbHeight) {
+ if ((unsigned int)varint != mThumbHeight) {
mPendingCaptureSettings |= SetThumb;
mThumbHeight = varint;
}
@@ -332,7 +332,7 @@ status_t OMXCameraAdapter::setParametersCapture(const android::CameraParameters
varint = params.getInt(android::CameraParameters::KEY_JPEG_THUMBNAIL_QUALITY);
if ( varint >= MIN_JPEG_QUALITY && varint <= MAX_JPEG_QUALITY ) {
- if (varint != mThumbQuality) {
+ if ((unsigned int)varint != mThumbQuality) {
mPendingCaptureSettings |= SetThumb;
mThumbQuality = varint;
}
diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp
index cbf7c1c..bf475e8 100644
--- a/camera/OMXCameraAdapter/OMXExif.cpp
+++ b/camera/OMXCameraAdapter/OMXExif.cpp
@@ -238,7 +238,7 @@ status_t OMXCameraAdapter::setupEXIF()
struct tm *pTime;
OMXCameraPortParameters * capData = NULL;
MemoryManager memMgr;
- CameraBuffer *memmgr_buf_array;
+ CameraBuffer *memmgr_buf_array = NULL;
int buf_size = 0;
LOG_FUNCTION_NAME;
@@ -567,13 +567,13 @@ status_t OMXCameraAdapter::setupEXIF_libjpeg(ExifElementsTable* exifTable,
if ((NO_ERROR == ret)) {
char temp_value[5];
- snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", capData->mWidth);
+ snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%u", capData->mWidth);
ret = exifTable->insertElement(TAG_IMAGE_WIDTH, temp_value);
}
if ((NO_ERROR == ret)) {
char temp_value[5];
- snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%lu", capData->mHeight);
+ snprintf(temp_value, sizeof(temp_value)/sizeof(char), "%u", capData->mHeight);
ret = exifTable->insertElement(TAG_IMAGE_LENGTH, temp_value);
}
diff --git a/camera/OMXCameraAdapter/OMXZoom.cpp b/camera/OMXCameraAdapter/OMXZoom.cpp
index e39a3b0..11c8f75 100644
--- a/camera/OMXCameraAdapter/OMXZoom.cpp
+++ b/camera/OMXCameraAdapter/OMXZoom.cpp
@@ -98,7 +98,7 @@ status_t OMXCameraAdapter::doZoom(int index)
ret = -EINVAL;
}
- if (mPreviousZoomIndx == index )
+ if (mPreviousZoomIndx == (unsigned int)index )
{
return NO_ERROR;
}
diff --git a/camera/TICameraParameters.cpp b/camera/TICameraParameters.cpp
index ed8105e..04a3536 100644
--- a/camera/TICameraParameters.cpp
+++ b/camera/TICameraParameters.cpp
@@ -88,11 +88,13 @@ const char TICameraParameters::KEY_FRAMERATES_EXT_SUPPORTED[] = "preview-fps-ext
const char TICameraParameters::RAW_WIDTH[] = "raw-width";
const char TICameraParameters::RAW_HEIGHT[] = "raw-height";
+#ifndef OMAP_TUNA
// TI extensions for Stereo Mode
const char TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT[] = "s3d-prv-frame-layout";
const char TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT_VALUES[] = "s3d-prv-frame-layout-values";
const char TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT[] = "s3d-cap-frame-layout";
const char TICameraParameters::KEY_S3D_CAP_FRAME_LAYOUT_VALUES[] = "s3d-cap-frame-layout-values";
+#endif
//TI extentions fo 3D resolutions
const char TICameraParameters::KEY_SUPPORTED_PICTURE_SUBSAMPLED_SIZES[] = "supported-picture-subsampled-size-values";
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 0b8680e..0b61210 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -51,7 +51,9 @@ enum OperatingMode {
MODE_HIGH_QUALITY,
MODE_ZEROSHUTTERLAG,
MODE_VIDEO,
+#ifndef OMAP_TUNA
MODE_STEREO,
+#endif
MODE_CPCAM,
MODE_MAX
};
@@ -153,10 +155,12 @@ public:
static const char PARAMS_DELIMITER [];
+#ifndef OMAP_TUNA
static const char S3D_PRV_FRAME_LAYOUT[];
static const char S3D_PRV_FRAME_LAYOUT_VALUES[];
static const char S3D_CAP_FRAME_LAYOUT[];
static const char S3D_CAP_FRAME_LAYOUT_VALUES[];
+#endif
static const char VSTAB[];
static const char VSTAB_SUPPORTED[];
static const char VNF[];
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 83969d1..ba192db 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -707,7 +707,9 @@ private:
#endif
static status_t insertAutoConvergenceModes(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
static status_t insertManualConvergenceRange(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
+#ifndef OMAP_TUNA
static status_t insertLayout(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
+#endif
static status_t insertVideoSnapshotSupported(CameraProperties::Properties*, OMX_TI_CAPTYPE&);
static status_t insertVNFSupported(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps);
static status_t insertVSTABSupported(CameraProperties::Properties* params, OMX_TI_CAPTYPE &caps);
diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h
index 84fa9fa..75e4812 100644
--- a/camera/inc/TICameraParameters.h
+++ b/camera/inc/TICameraParameters.h
@@ -198,11 +198,13 @@ static const char EFFECT_VIVID[];
static const char EFFECT_COLOR_SWAP[];
static const char EFFECT_BLACKWHITE[];
+#ifndef OMAP_TUNA
//TI extensions for stereo frame layouts
static const char KEY_S3D_PRV_FRAME_LAYOUT[];
static const char KEY_S3D_PRV_FRAME_LAYOUT_VALUES[];
static const char KEY_S3D_CAP_FRAME_LAYOUT[];
static const char KEY_S3D_CAP_FRAME_LAYOUT_VALUES[];
+#endif
//TI extensions for stereo frame layouts
static const char S3D_NONE[];
generated by cgit v1.1 at 2024-12-22 17:28:54 +0000