diff options
| author | Akwasi Boateng <akwasi.boateng@ti.com> | 2011-10-19 21:35:58 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-19 23:16:06 -0700 |
| commit | 150f3c891ce774b1546e90fab640ccb9c29ce536 (patch) | |
| tree | de16f5d5b896610abcdf64a38be0fc01f38d2156 /camera/CameraHal.cpp | |
| parent | d16343600a83478ed6223e51aa41f717f28b6351 (diff) | |
| download | hardware_ti_omap4xxx-150f3c891ce774b1546e90fab640ccb9c29ce536.zip hardware_ti_omap4xxx-150f3c891ce774b1546e90fab640ccb9c29ce536.tar.gz hardware_ti_omap4xxx-150f3c891ce774b1546e90fab640ccb9c29ce536.tar.bz2 | |
CameraHAL: allow set preview resolution when preview is enabled
Fixes b/5397081
Allow preview resolution to be changed while previewing
and also ignore stop preview while recording app should
call stop recording.
Change-Id: I85d0388f3fb2cd12593ab225389bda022cbd938b
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'camera/CameraHal.cpp')
| -rw-r--r-- | camera/CameraHal.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index c99af92..3610559 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -339,10 +339,6 @@ int CameraHal::setParameters(const CameraParameters& params) } - //CTS requirement, we should be able to change the preview resolution - //while in paused display state - if ( !previewEnabled() || mDisplayPaused ) - { params.getPreviewSize(&w, &h); if (w == -1 && h == -1) { CAMHAL_LOGEA("Unable to get preview size"); @@ -393,7 +389,6 @@ int CameraHal::setParameters(const CameraParameters& params) } CAMHAL_LOGDB("PreviewResolution by App %d x %d", w, h); - } // Handle RECORDING_HINT to Set/Reset Video Mode Parameters valstr = params.get(CameraParameters::KEY_RECORDING_HINT); @@ -1738,7 +1733,7 @@ void CameraHal::stopPreview() { LOG_FUNCTION_NAME; - if(!previewEnabled() && !mDisplayPaused) + if( (!previewEnabled() && !mDisplayPaused) || mRecordingEnabled) { LOG_FUNCTION_NAME_EXIT; return; |