diff options
| author | Andriy Chepurnyy <x0155536@ti.com> | 2013-03-07 17:10:11 +0200 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:39:58 -0800 |
| commit | 542ff51f3534c7df6a6b80ca11b2d22cbcbaf073 (patch) | |
| tree | 0f0a49ed68fd8249bef7d03510d7a909dd164168 /camera | |
| parent | d5e70a5e5d6a724ac648a93940a34b24ade96662 (diff) | |
| download | hardware_ti_omap4-542ff51f3534c7df6a6b80ca11b2d22cbcbaf073.zip hardware_ti_omap4-542ff51f3534c7df6a6b80ca11b2d22cbcbaf073.tar.gz hardware_ti_omap4-542ff51f3534c7df6a6b80ca11b2d22cbcbaf073.tar.bz2 | |
CameraHal: Remove obsolete code
Remove obsolete code that trying to mask
current and use unsupported resolution.
Change-Id: Ia6e96b8d6d23bfef6a139b3f85f1c0651f9f23e1
Signed-off-by: Andriy Chepurnyy <x0155536@ti.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraHal.cpp | 30 | ||||
| -rw-r--r-- | camera/inc/CameraHal.h | 1 |
2 files changed, 0 insertions, 31 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index b4fa319..ba8777f 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -549,18 +549,6 @@ int CameraHal::setParameters(const android::CameraParameters& params) if(strcmp(valstr, android::CameraParameters::TRUE) == 0) { CAMHAL_LOGVB("Video Resolution: %d x %d", mVideoWidth, mVideoHeight); -#ifdef OMAP_ENHANCEMENT_VTC - if (!mVTCUseCase) -#endif - { - int maxFPS, minFPS; - - params.getPreviewFpsRange(&minFPS, &maxFPS); - maxFPS /= CameraHal::VFR_SCALE; - if ( ( maxFPS <= SW_SCALING_FPS_LIMIT ) ) { - getPreferredPreviewRes(&w, &h); - } - } mParameters.set(android::CameraParameters::KEY_RECORDING_HINT, valstr); restartPreviewRequired |= setVideoModeParameters(params); } @@ -4723,24 +4711,6 @@ status_t CameraHal::storeMetaDataInBuffers(bool enable) LOG_FUNCTION_NAME_EXIT; } -void CameraHal::getPreferredPreviewRes(int *width, int *height) -{ - LOG_FUNCTION_NAME; - - // We request Ducati for a higher resolution so preview looks better and then downscale the frame before the callback. - // TODO: This should be moved to configuration constants and boolean flag whether to provide such optimization - // Also consider providing this configurability of the desired display resolution from the application - if ( ( *width == 320 ) && ( *height == 240 ) ) { - *width = 640; - *height = 480; - } else if ( ( *width == 176 ) && ( *height == 144 ) ) { - *width = 704; - *height = 576; - } - - LOG_FUNCTION_NAME_EXIT; -} - void CameraHal::setExternalLocking(bool extBuffLocking) { mExternalLocking = extBuffLocking; diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 72f0f37..9b92da3 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -1387,7 +1387,6 @@ private: void forceStopPreview(); - void getPreferredPreviewRes(int *width, int *height); void resetPreviewRes(android::CameraParameters *params); // Internal __takePicture function - used in public takePicture() and reprocess() |