diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-07 12:03:47 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:52 +0200 |
| commit | c9ee5c0371fb6ca892f80f1725100ad03c8a2a2c (patch) | |
| tree | 8a01966ffd461e6e630ad733c284e1d32776c577 /camera/OMXCameraAdapter/OMXCameraAdapter.cpp | |
| parent | c5f4358c48d6e50b2affb3ad6c2c0f59546f5b04 (diff) | |
| download | device_samsung_tuna-c9ee5c0371fb6ca892f80f1725100ad03c8a2a2c.zip device_samsung_tuna-c9ee5c0371fb6ca892f80f1725100ad03c8a2a2c.tar.gz device_samsung_tuna-c9ee5c0371fb6ca892f80f1725100ad03c8a2a2c.tar.bz2 | |
Fix camera build, rename libtiutils.
My local make of camera.tuna didn't pick up on a few changes I made to the makefile.
Renaming libtiutils as other devices use a libtiutils_custom
as well, but ours isn't a 1:1 match with theirs.
Diffstat (limited to 'camera/OMXCameraAdapter/OMXCameraAdapter.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index ea7c890..ac5ec47 100644 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -411,11 +411,15 @@ OMXCameraAdapter::OMXCameraPortParameters *OMXCameraAdapter::getPortParams(Camer ret = &mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mImagePortIndex]; break; case CameraFrame::RAW_FRAME: +#ifdef CAMERAHAL_USE_RAW_IMAGE_SAVING if (mRawCapture) { ret = &mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mVideoPortIndex]; } else { +#endif ret = &mCameraAdapterParameters.mCameraPortParams[mCameraAdapterParameters.mImagePortIndex]; +#ifdef CAMERAHAL_USE_RAW_IMAGE_SAVING } +#endif break; case CameraFrame::PREVIEW_FRAME_SYNC: case CameraFrame::SNAPSHOT_FRAME: |