summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Remove non-(calibrated, api, or verified) 3A settingsTyler Luu2011-10-272-13/+10
| | | | | | | | | | | | | | | | | | | | | Change-Id: I16aaafeb43a0799cf12d97979709524e3b0fc933 Signed-off-by: Tyler Luu <tluu@ti.com> related-to-bug: 5472533
* | | am 9298f71c: am b1922897: Only return error for Invalid stateAkwasi Boateng2011-10-271-6/+32
|\ \ \ | |/ / | | | | | | | | | * commit '9298f71ce8c46d14f7638ba80560107a5bbfa8ca': Only return error for Invalid state
| * | Only return error for Invalid stateAkwasi Boateng2011-10-271-6/+32
| |/ | | | | | | | | | | | | | | | | | | Return error only for when component is in Invalid state and we make any focus calls Change-Id: I2efc3fb7859eca713b0ad738b7122ea8f36561c2 Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5472396
* | am df6023f6: am fd705eb8: CameraHal: Fixes for #testFocusDistanceTyler Luu2011-10-268-25/+93
|\ \ | |/ | | | | | | * commit 'df6023f6fd9a515da9cec0e98ea303306b14c5d8': CameraHal: Fixes for #testFocusDistance
| * CameraHal: Fixes for #testFocusDistanceTyler Luu2011-10-268-25/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Seperate OMXCameraAdapter cancelAutoFocus with unsetting focus lock. Adding new internal parameter to unlock focus from the cancelAutoFocus in CameraHal. We need to cancel auto focus during stop preview in case it is still running. If we do the unlock in OMXCameraAdapter then, focus distance can change after stopPreview. 2. If autoFocus or takePicture comes after startPreview but before the first preview frame comes, then sometimes the focus distance queried after the calls won't be correct since OMX camera might still be transitioning. 3. Update focus distances when focus is running. b/5473673 Change-Id: I5a27d78aef437a1601a68e8c08fa860f04fc0c55 Signed-off-by: Tyler Luu <tluu@ti.com>
* | am 37bf2859: am 20107c0e: CameraHal: Remove non-API 3A settingsTyler Luu2011-10-261-19/+28
|\ \ | |/ | | | | | | * commit '37bf2859181aedae7f0f74462e13279863349e06': CameraHal: Remove non-API 3A settings
| * CameraHal: Remove non-API 3A settingsTyler Luu2011-10-251-19/+28
| | | | | | | | | | | | | | b/5472533 Change-Id: I62ce16499c62e11a321c89872eec19d9d1eac635 Signed-off-by: Tyler Luu <tluu@ti.com>
* | am b2fc33ad: am 3dcde7b7: Fixes for MMS setparameter crashesAkwasi Boateng2011-10-262-3/+13
|\ \ | |/ | | | | | | | | * commit 'b2fc33ad12a004285cdbf8070408862da1dcb9c2': Fixes for MMS setparameter crashes Fix garbled characters at the end of Exif Make/Model
| * Fixes for MMS setparameter crashesAkwasi Boateng2011-10-252-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix native crash for set parameter when zoom is applied in MMS mode and while recording is in progress. 2. Don't allow restart of preview or preview stop when recording is in progress. 3. Fix slow zoom when in MMS mode casued by unnecessary preview restarts. 4. Fix initial jerky preview when you start recording in MMS mode caused by having to restart preview. Change-Id: Ie64799974488caae5887e4c9f9072d74a12dd797 Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5507018
| * Fix garbled characters at the end of Exif Make/ModelTyler Luu2011-10-251-2/+2
| | | | | | | | | | | | | | bug:5481563 Change-Id: Idce652daf7d6164ad84695cc76c358757b5c7b37 Signed-off-by: Tyler Luu <tluu@ti.com>
* | am fac6d88a: Fix garbled characters at the end of Exif Make/ModelTyler Luu2011-10-261-2/+2
|\ \ | | | | | | | | | | | | * commit 'fac6d88a15b2e4ff329da2c66ba54837361ddc10': Fix garbled characters at the end of Exif Make/Model
| * | Fix garbled characters at the end of Exif Make/ModelTyler Luu2011-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | bug:5481563 Change-Id: Idce652daf7d6164ad84695cc76c358757b5c7b37 Signed-off-by: Tyler Luu <tluu@ti.com>
| * | Fix for double OMX_Deinit() callsAkwasi Boateng2011-10-251-27/+28
| | | | | | | | | | | | | | | | | | | | | Change-Id: I43260d50a284a7d651b6309b344404bf45c7a617 Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5451993
* | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-254-36/+36
| |/ |/| | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Ic854588fa661ebcc63395c388bf98af268b709c7
* | Fix for double OMX_Deinit() callsAkwasi Boateng2011-10-241-27/+28
|/ | | | | | | Change-Id: I43260d50a284a7d651b6309b344404bf45c7a617 Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5451993
* CameraHal: Fix for #testJpegThumbnailSizeTyler Luu2011-10-211-0/+4
| | | | | | | | | | | | | Fixes b/5492679 If an image capture is taken before running this test, the test will fail because the image capture settings were not being re-applied to the image port. This patch updates all the capture settings on first time init. Change-Id: Iac8ace02b271b431a55736fbbeee29fadc4393bd Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Return null device when device_open failsTyler Luu2011-10-201-13/+20
| | | | | | | | Partial fix for b/5451993 Change-Id: I47a1a3fec21b0e6a0abb8b956642b05b3a6be107 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Allow WB, Exp, and Flash settings to change in sceneTyler Luu2011-10-201-1/+2
| | | | | | | | | Configure AE and AWB locks correctly in scene modes that require CAF (e.g., party scene). This makes CAF work correctly in such scenes. Change-Id: Ide4e32b73d10be8113af56735f7ee7e2398d240b Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com> Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: WA for #testSceneModeTyler Luu2011-10-205-0/+298
| | | | | | | | | | testSceneMode requires parameters to be updated properly before starting preview. OMX Camera doesn't currently support this so we are just going to keep a hard-coded LUT for the scene modes for now. Change-Id: I40c4492834d43c9328c87fd7aa4ea06fb1f1d90b Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: Disable AF assist in stop previewSundar Raman2011-10-201-0/+17
| | | | | | | | | | | | If AF assist is ON when switching to video mode and flash is not set to OFF before switching, then the torch mode is somehow turned ON and never turns OFF. Since AF assist is not used after stopping preview, set it to OFF Change-Id: I44c9e6359a0488d235929f6bf1cdd4b257565caf Signed-off-by: Sundar Raman <sunds@ti.com>
* CameraHAL: allow set preview resolution when preview is enabledAkwasi Boateng2011-10-191-6/+1
| | | | | | | | | | | 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>
* CameraHAL: Fix for #testJpegExifSundar Raman2011-10-194-3/+19
| | | | | | | | | | | Set the focal length to correct defaults for primary and secondary for the sensors on the phone. Previous camerahal value was wrong. Call setupEXIF even in the case where we return from useBufferCapture when the port is already enabled. Change-Id: I224ec2f19af11de525455015c1822ba6a13c4d17 Signed-off-by: Sundar Raman <sunds@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHal: Select proper CAF mode for scene feedbackTyler Luu2011-10-191-1/+6
| | | | | | | | | | We were not choosing the right CAF mode during scene mode feedback because CAF video has precedence in the focus mode LUT. Adding some logic to select CAF picture if we are not if video mode. Change-Id: I98260dae04708d5d42248cbafa4adb57ce18221f Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: Keep image port enabled if possibleTyler Luu2011-10-194-52/+87
| | | | | | | | | | | | | | | | | | | | Try to keep the image port enabled if possible after capturing an image. We need to disable the image port if any settings are changed or when stopping preview. To disable image port, buffers also have to be freed, and to keep the image port enabled, the same buffer needs to be used. So, we are reenabling functionality to trigger free the image buffer from camera adapter to free the buffer as late as possible and as required by camera adapter. Skip image buffer allocation if it is already enabled. Fixes issue with some jerks seen in preview during video capture while taking snapshot. b/5449158 Change-Id: I830cf8512fe039df10d28e1f5a22e61e30840852 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Recorded video has jerks with video snapshotTyler Luu2011-10-192-15/+12
| | | | | | | | | | | | | | | Avoid video frame drops during video snapshot. We were previously not sending the video frame to AppCallbackNotifier because the first frame after video snapshot was considered a snapshot (postview) frame. This patch sets the video frame mask regardless of preview or snapshot frame during recording b/5449158 Change-Id: Idaecbaa53686b81428a3d63ea95481f5b6eff23d Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com> Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Make CAF mode APIs consistentTyler Luu2011-10-194-19/+55
| | | | | | | | | | | | | Make FOCUS_MODE_CONTINUOUS_VIDEO and FOCUS_MODE_CONTINUOUS_PICTURE consistent to the user. For us, this means we need to make some decision on which capture mode to select based on which CAF mode is selected by the application. b/5441086 Change-Id: I39e51ea916e1baa263b6dcc88f76a4940809ecb9 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: protect mParameters3A from simultaneous read/write.Raji Reddy Kandi2011-10-192-0/+10
| | | | | | | | | | | | | Fix for Issue: Idle -> remove from the latest launched apps -> Launch Camera -> Settings -> Restore defaults -> ok -> Flash mode On -> White balance Cloudy -> Exposure -3 -> Scene mode Party -> Shooting -> Camcoder mode -> Settings -> Restore defaults -> ok ==> video preview is red even after we restored the settings. Change-Id: If4b3672693a092f1956708742a6cc5f2c2c284fb Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
* CameraHAL: Apply 3A settings offset for default valuesMilen Mitkov2011-10-191-3/+3
| | | | | | | | Contrast, Sharpness and Saturation were configured with different values because of the required offsets. Change-Id: Ib84ef078b4d7fe671df116b56d29ea1c51dcd24c Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
* CameraHAL: Always reset focus mode after captureMilen Mitkov2011-10-191-0/+5
| | | | | | | | Workaround when doing many consecutive shots, CAF wasn't getting restarted. Change-Id: Ibef033535360dc534de2b761861f7e9c5e79aec2 Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
* CameraHAL: Focus mode may override scene settingsMilen Mitkov2011-10-191-1/+2
| | | | | | | | This is required since CAF and Touch focus are needed even in scenes different from manual. Change-Id: I8f3ecfd7474e988757a0a4c85b37459e2d1a671b Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
* CameraHAL: Set face prio when starting face detectionMilen Mitkov2011-10-192-28/+10
| | | | | | | | | | | We don't need to set the exposure mode when starting face detection, just enable face priority. Previously, this caused the exposure mode for a given scene to be overwritten. Change-Id: I4bad4c9846b7d225f8f1bf346fdc3dac1b16ca1b Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
* CameraHal: Only feedback supported paramsTyler Luu2011-10-181-3/+11
| | | | | | | | | | Check to see if the updated param from scene mode selection is supported before reporting it back to application in getParameters. Work-around for Ducati not always reporting supported 3A parameters for a particular scene mode. Change-Id: Idc05f150df081b1a2b6c841730da08713b64fd47 Signed-off-by: Tyler Luu <tluu@ti.com>
* Flash and WB are not restored in video mode when camera comes to foregroundHeechan Park2011-10-181-6/+8
| | | | | | | | | | | | | | Fixes b/5475271 1) Switch to video mode, enable Flash to ON 2) Press Power key, Flash is switched oFF 3) Press power key and open camera, Flash is Not switched ON. Fix: Updating the WB, Flash and Focus values only when Scenemode is active. Change-Id: I35f852c2611644e0115bbf12f5110d92374e6c90 Signed-off-by: Braganza Sam Roberts <sam.braganza@samsung.com> Signed-off-by: Heechan Park <heech.park@samsung.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHal: Re-apply CAF after canceling auto focusTyler Luu2011-10-181-0/+3
| | | | | | | | | | Sometimes CAF is not restarted after canceling AF, go ahead and re-apply CAF for this case. b/5475271 Change-Id: I425bd94401aa6b9dcd5eed5c7294d7d88ddddfc0 Signed-off-by: Tyler Luu <tluu@ti.com>
* Camera HAL Optimizations for cold startup timeSundar Raman2011-10-181-10/+12
| | | | | | | | 1. Removes 100mS latency introduced in OMX_GetHandle 2. Calls apply3ASettings and advanceZoom after sending the callback to display (saves ~30mS) Change-Id: I58a1f81ede4439cd19587c8390681062792fb5a8 Signed-off-by: Sundar Raman <sunds@ti.com>
* CameraHal: Add 960x720 preview resolutionTyler Luu2011-10-181-0/+1
| | | | | | | b/5469299 Change-Id: I5e5e9aac09a162708896376bb78697c9f48c075d Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHal: Share a lock for exec and loaded switchTyler Luu2011-10-182-8/+10
| | | | | | | | | | Share a lock between switchToLoaded function and doSwitchToExecuting, so the two don't try to switch state at the same time. b/5472446 Change-Id: I425943b97b7f08d1f7812214e4a305eb86af1ff9 Signed-off-by: Tyler Luu <tluu@ti.com>
* fix buildMathias Agopian2011-10-161-1/+3
| | | | Change-Id: Ic73a853116d3c92cb53f53c091852d1b4b24e7f2
* check sensor manager initialization succeededMathias Agopian2011-10-161-0/+5
| | | | | Bug: 5445240 Change-Id: Ic4bc7b7daecd49dcc254693afd6870d886ee6506
* CameraHal: Handle dynamic switch in setParametersTyler Luu2011-10-151-20/+13
| | | | | | | | | | | | | | | | | Instead of stopping preview in start preview for a dynamic switch. Go ahead and stop preview in setParameters. Need to force stop preview so all the buffers will be unlocked in case application captures an image and switches to camcorder mode before it restarts preview. Otherwise, camera service will disconnect the window while we are still holding locks for the buffers. Error log: "gralloc_unregister_buffer: Cannot unregister a locked buffer" Change-Id: Ic252609e5fbcfde569e1dbd8614572df6392bade Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHal: Fixes for #testVideoSnapshotTyler Luu2011-10-157-70/+131
| | | | | | | | | | | | | 1. Add raw notify callback for video snapshot 2. Add new state for video capture + AF 3. We were not populating focal length correctly for jhead. Need to send focal length as a rational in this format "xx/yy" 4. Need to send GPSProcessingMethod as an UNDEFINED ASCII to jhead b/5448171 Change-Id: Ie6be9ad821d1fa106d9c857681f2fa6427d4f283 Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHal: Remove some unused code from SensorListnerTyler Luu2011-10-151-6/+0
| | | | | Change-Id: I37e332efb9e8de99e1eac5be6fc8c7c9c376c7fa Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: Re-enable Face prioritized AE in startFaceDetectionSundar Raman2011-10-151-4/+1
| | | | | Change-Id: Id3639656e4856019221a35d2fc308626e45cb405 Signed-off-by: Sundar Raman <sunds@ti.com>
* CameraHal: Allow EV compensation w/ preset sceneTyler Luu2011-10-152-12/+16
| | | | | | | | CameraHal was previously ignoring EV compensation when a scene mode was set. Change-Id: I15023a5c6019ca333a4ce40f178a8e4ef53be387 Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHal: Enable 3A feedback for scene modesTyler Luu2011-10-154-139/+275
| | | | | | | | | When a scene mode is set by the application, some 3A parameters will be updated by Ducati. Feed these parameters back to the application. Change-Id: I07afec0315d2807470037388572d0bc7ee8c3ad8 Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHal: Adapt to new framework vstab paramTyler Luu2011-10-1410-77/+69
| | | | | | | | change to use the new KEY_VIDEO_STABILIZATION parameter from the framework instead of using TICameraParameter definition. Change-Id: Ifed4c147e6ad3c02b35772343d9d339ab1402eac Signed-off-by: Tyler Luu <tluu@ti.com>
* omap4xxx: camera: not an error when callback threads are already runningIliyan Malchev2011-10-131-1/+5
| | | | | | | | | | | | Potential fix for b/5431225 (if not, it will point in the right direction) -- When CallbackThread or OMXCallbackThread is already running during initialization(), do not treat this as an error. -- Print an error on logcat when the OMX component state is not as expected during intialization Change-Id: Icf7312e609a7a17ccaf412d3c3fe6a5075de00f7 Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Switch default focus mode back to autoSundar Raman2011-10-121-1/+1
| | | | | | | | | | | Since Barcode scanner app doesnt support continuous auto focus and the locking semantics around autoFocus api. Fixes b/5434919 Change-Id: Ie45f1553e468f2d25fee256dab2492713add2744 Signed-off-by: Sundar Raman <sunds@ti.com>
* CameraHAL: Restore zoom stages back to 60Sundar Raman2011-10-123-16/+46
| | | | | | | | | | This provides for a smooth zoom experience with immediate zoom This reverts commit a38ea5631d139c3d5ffd4e181df2216dbce1b10c. Fixes b/5251916 Change-Id: If1724ec2ad5d3106e10ee5c2e691f99c19675eaf
* CameraHAL: Pass zoom values smoothlySundar Raman2011-10-123-10/+29
| | | | | | | | | | | | | Update the zoom values to the ducati only in the fillBufferDone callback if another zoom request is already in progress. However, overwrite the zoom value with the latest value requested by the application Fixes b/5251916 Change-Id: I419baadb2ddd094277f003ddf25f63dca5d078f8 Signed-off-by: Sundar Raman <sunds@ti.com>