diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-09 13:02:09 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:53 +0200 |
| commit | 55d21caa69a85f1e9b909ed699282b041a2bcec5 (patch) | |
| tree | bf9b74c9b1fcde8c11c49b865bb94ec8dea8e9d1 /camera/OMXCameraAdapter/OMXCapabilities.cpp | |
| parent | 48d5c7c1d27835ae882ade0bb92a14e7874f5558 (diff) | |
| download | device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.zip device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.gz device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.bz2 | |
camera: Fix compiler warnings, remove some S3D stuff.
Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'camera/OMXCameraAdapter/OMXCapabilities.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapabilities.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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); |